From b29f24c9be209ee83f6652ed3632fcaeb12f7e2c Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 13:21:36 +0100 Subject: [PATCH 1/7] BlackoilModelEbos: use Parallel::Communication type alias --- opm/simulators/flow/BlackoilModelEbos.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index a53bb07d0f8..2799c585b0b 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -52,13 +52,12 @@ #include #include #include +#include #include #include #include -#include #include -#include #include @@ -1171,8 +1170,7 @@ namespace Opm { return terminal_output_; } - template - std::tuple convergenceReduction(const CollectiveCommunication& comm, + std::tuple convergenceReduction(Parallel::Communication comm, const double pvSumLocal, const double numAquiferPvSumLocal, std::vector< Scalar >& R_sum, From 5874377937689839a1329299a5333c5fd8cfc3af Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 13:25:46 +0100 Subject: [PATCH 2/7] BlackoilModelEbos: prefer using --- opm/simulators/flow/BlackoilModelEbos.hpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index 2799c585b0b..c5c8b252453 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -160,7 +160,7 @@ namespace Opm { { public: // --------- Types and enums --------- - typedef BlackoilModelParametersEbos ModelParameters; + using ModelParameters = BlackoilModelParametersEbos; using Simulator = GetPropType; using Grid = GetPropType; @@ -172,8 +172,8 @@ namespace Opm { using Indices = GetPropType; using MaterialLaw = GetPropType; using MaterialLawParams = GetPropType; + using Scalar = GetPropType; - typedef double Scalar; static const int numEq = Indices::numEq; static const int contiSolventEqIdx = Indices::contiSolventEqIdx; static const int contiZfracEqIdx = Indices::contiZfracEqIdx; @@ -200,14 +200,14 @@ namespace Opm { static const int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx; static const int calciteConcentrationIdx = Indices::calciteConcentrationIdx; - typedef Dune::FieldVector VectorBlockType; - typedef typename SparseMatrixAdapter::MatrixBlock MatrixBlockType; - typedef typename SparseMatrixAdapter::IstlMatrix Mat; - typedef Dune::BlockVector BVector; + using VectorBlockType = Dune::FieldVector; + using MatrixBlockType = typename SparseMatrixAdapter::MatrixBlock; + using Mat = typename SparseMatrixAdapter::IstlMatrix; + using BVector = Dune::BlockVector; using Domain = SubDomain; - typedef ISTLSolverEbos ISTLSolverType; + using ISTLSolverType = ISTLSolverEbos; class ComponentName { @@ -272,8 +272,6 @@ namespace Opm { std::vector names_{}; }; - //typedef typename SolutionVector :: value_type PrimaryVariables ; - // --------- Public methods --------- /// Construct the model. It will retain references to the @@ -1709,7 +1707,7 @@ namespace Opm { std::vector& residual_norms) { OPM_TIMEBLOCK(getReservoirConvergence); - typedef std::vector< Scalar > Vector; + using Vector = std::vector; const int numComp = numEq; Vector R_sum(numComp, 0.0 ); From 0a670f369466ff40aeb0e5d1cc139ea0d178ef7d Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 13:28:55 +0100 Subject: [PATCH 3/7] BlackoilModelEbos: use constexpr where appropriate --- opm/simulators/flow/BlackoilModelEbos.hpp | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index c5c8b252453..9fc9ad5c73c 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -174,31 +174,31 @@ namespace Opm { using MaterialLawParams = GetPropType; using Scalar = GetPropType; - static const int numEq = Indices::numEq; - static const int contiSolventEqIdx = Indices::contiSolventEqIdx; - static const int contiZfracEqIdx = Indices::contiZfracEqIdx; - static const int contiPolymerEqIdx = Indices::contiPolymerEqIdx; - static const int contiEnergyEqIdx = Indices::contiEnergyEqIdx; - static const int contiPolymerMWEqIdx = Indices::contiPolymerMWEqIdx; - static const int contiFoamEqIdx = Indices::contiFoamEqIdx; - static const int contiBrineEqIdx = Indices::contiBrineEqIdx; - static const int contiMicrobialEqIdx = Indices::contiMicrobialEqIdx; - static const int contiOxygenEqIdx = Indices::contiOxygenEqIdx; - static const int contiUreaEqIdx = Indices::contiUreaEqIdx; - static const int contiBiofilmEqIdx = Indices::contiBiofilmEqIdx; - static const int contiCalciteEqIdx = Indices::contiCalciteEqIdx; - static const int solventSaturationIdx = Indices::solventSaturationIdx; - static const int zFractionIdx = Indices::zFractionIdx; - static const int polymerConcentrationIdx = Indices::polymerConcentrationIdx; - static const int polymerMoleWeightIdx = Indices::polymerMoleWeightIdx; - static const int temperatureIdx = Indices::temperatureIdx; - static const int foamConcentrationIdx = Indices::foamConcentrationIdx; - static const int saltConcentrationIdx = Indices::saltConcentrationIdx; - static const int microbialConcentrationIdx = Indices::microbialConcentrationIdx; - static const int oxygenConcentrationIdx = Indices::oxygenConcentrationIdx; - static const int ureaConcentrationIdx = Indices::ureaConcentrationIdx; - static const int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx; - static const int calciteConcentrationIdx = Indices::calciteConcentrationIdx; + static constexpr int numEq = Indices::numEq; + static constexpr int contiSolventEqIdx = Indices::contiSolventEqIdx; + static constexpr int contiZfracEqIdx = Indices::contiZfracEqIdx; + static constexpr int contiPolymerEqIdx = Indices::contiPolymerEqIdx; + static constexpr int contiEnergyEqIdx = Indices::contiEnergyEqIdx; + static constexpr int contiPolymerMWEqIdx = Indices::contiPolymerMWEqIdx; + static constexpr int contiFoamEqIdx = Indices::contiFoamEqIdx; + static constexpr int contiBrineEqIdx = Indices::contiBrineEqIdx; + static constexpr int contiMicrobialEqIdx = Indices::contiMicrobialEqIdx; + static constexpr int contiOxygenEqIdx = Indices::contiOxygenEqIdx; + static constexpr int contiUreaEqIdx = Indices::contiUreaEqIdx; + static constexpr int contiBiofilmEqIdx = Indices::contiBiofilmEqIdx; + static constexpr int contiCalciteEqIdx = Indices::contiCalciteEqIdx; + static constexpr int solventSaturationIdx = Indices::solventSaturationIdx; + static constexpr int zFractionIdx = Indices::zFractionIdx; + static constexpr int polymerConcentrationIdx = Indices::polymerConcentrationIdx; + static constexpr int polymerMoleWeightIdx = Indices::polymerMoleWeightIdx; + static constexpr int temperatureIdx = Indices::temperatureIdx; + static constexpr int foamConcentrationIdx = Indices::foamConcentrationIdx; + static constexpr int saltConcentrationIdx = Indices::saltConcentrationIdx; + static constexpr int microbialConcentrationIdx = Indices::microbialConcentrationIdx; + static constexpr int oxygenConcentrationIdx = Indices::oxygenConcentrationIdx; + static constexpr int ureaConcentrationIdx = Indices::ureaConcentrationIdx; + static constexpr int biofilmConcentrationIdx = Indices::biofilmConcentrationIdx; + static constexpr int calciteConcentrationIdx = Indices::calciteConcentrationIdx; using VectorBlockType = Dune::FieldVector; using MatrixBlockType = typename SparseMatrixAdapter::MatrixBlock; From e88c44eaafbdc5937c2f83abcc6efc643bcb9e55 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 13:31:42 +0100 Subject: [PATCH 4/7] BlackoilModelEbos: remove unused member function --- opm/simulators/flow/BlackoilModelEbos.hpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index 9fc9ad5c73c..7f369fc3562 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -931,15 +931,6 @@ namespace Opm { - void printIf(int c, double x, double y, double eps, std::string type) { - if (std::abs(x-y) > eps) { - std::cout << type << " " < Date: Fri, 3 Mar 2023 13:45:36 +0100 Subject: [PATCH 5/7] BlackoilModelEbos: output error message using OpmLog --- opm/simulators/flow/BlackoilModelEbos.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index 7f369fc3562..6adecc46b30 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -434,7 +433,7 @@ namespace Opm { std::fill(wasSwitched_.begin(), wasSwitched_.end(), false); if (param_.update_equations_scaling_) { - std::cout << "equation scaling not supported yet" << std::endl; + OpmLog::error("Equation scaling not supported"); //updateEquationsScaling(); } From 034f20c37e849e1896e634b86c1176cab1a368ac Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 13:49:51 +0100 Subject: [PATCH 6/7] BlackoilModelEbos: include tuple --- opm/simulators/flow/BlackoilModelEbos.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index 6adecc46b30..d183224ec73 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -67,6 +67,7 @@ #include #include #include +#include #include #include From 4201d94241028d1b6657f809e2b528436d958b82 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 3 Mar 2023 14:01:17 +0100 Subject: [PATCH 7/7] BlackoilModelEbos: remove unused includes --- ebos/eclbaseaquifermodel.hh | 6 ++++-- opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp | 2 ++ opm/simulators/flow/BlackoilModelEbos.hpp | 2 -- opm/simulators/flow/FlowMainEbos.hpp | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ebos/eclbaseaquifermodel.hh b/ebos/eclbaseaquifermodel.hh index de5f80638b1..51f1aff7844 100644 --- a/ebos/eclbaseaquifermodel.hh +++ b/ebos/eclbaseaquifermodel.hh @@ -27,10 +27,12 @@ #ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH #define EWOMS_ECL_BASE_AQUIFER_MODEL_HH -#include - +#include +#include #include +#include + #include #include #include diff --git a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp index 98713b27b0b..fbab07de6a1 100644 --- a/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp +++ b/opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp @@ -22,6 +22,8 @@ #include +#include + #include #include #include diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index d183224ec73..cc90cf423f6 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -25,7 +25,6 @@ #define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED #include -#include #include #include @@ -56,7 +55,6 @@ #include #include -#include #include #include diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index 601844b7e63..2599a4e4ae9 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -29,6 +29,8 @@ #include #include +#include + #if HAVE_DUNE_FEM #include #else