From 7fc81ae22844394b36f54996ebe2a67282c3d121 Mon Sep 17 00:00:00 2001 From: Kai Bao Date: Fri, 20 Dec 2019 15:10:36 +0100 Subject: [PATCH] using range for a few occasions in BlackoilAquiferModel_impl.hpp --- .../aquifers/BlackoilAquiferModel_impl.hpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp index 0f1513b05..0c4b3ac4f 100644 --- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp +++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp @@ -14,13 +14,13 @@ void BlackoilAquiferModel::initialSolutionApplied() { if (aquiferCarterTracyActive()) { - for (auto aquifer = aquifers_CarterTracy.begin(); aquifer != aquifers_CarterTracy.end(); ++aquifer) { - aquifer->initialSolutionApplied(); + for (auto& aquifer : aquifers_CarterTracy) { + aquifer.initialSolutionApplied(); } } if (aquiferFetkovichActive()) { - for (auto aquifer = aquifers_Fetkovich.begin(); aquifer != aquifers_Fetkovich.end(); ++aquifer) { - aquifer->initialSolutionApplied(); + for (auto& aquifer : aquifers_Fetkovich) { + aquifer.initialSolutionApplied(); } } } @@ -58,13 +58,13 @@ void BlackoilAquiferModel::beginTimeStep() { if (aquiferCarterTracyActive()) { - for (auto aquifer = aquifers_CarterTracy.begin(); aquifer != aquifers_CarterTracy.end(); ++aquifer) { - aquifer->beginTimeStep(); + for (auto& aquifer : aquifers_CarterTracy) { + aquifer.beginTimeStep(); } } if (aquiferFetkovichActive()) { - for (auto aquifer = aquifers_Fetkovich.begin(); aquifer != aquifers_Fetkovich.end(); ++aquifer) { - aquifer->beginTimeStep(); + for (auto& aquifer : aquifers_Fetkovich) { + aquifer.beginTimeStep(); } } } @@ -100,13 +100,13 @@ void BlackoilAquiferModel::endTimeStep() { if (aquiferCarterTracyActive()) { - for (auto aquifer = aquifers_CarterTracy.begin(); aquifer != aquifers_CarterTracy.end(); ++aquifer) { - aquifer->endTimeStep(); + for (auto& aquifer : aquifers_CarterTracy) { + aquifer.endTimeStep(); } } if (aquiferFetkovichActive()) { - for (auto aquifer = aquifers_Fetkovich.begin(); aquifer != aquifers_Fetkovich.end(); ++aquifer) { - aquifer->endTimeStep(); + for (auto& aquifer : aquifers_Fetkovich) { + aquifer.endTimeStep(); } } }