From be7f94b731c3f9cf5c372cc3853216a0f8eff44b Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no> Date: Fri, 23 Dec 2022 13:31:29 +0100 Subject: [PATCH 1/2] include Math.hpp where required --- opm/simulators/wells/MSWellHelpers.cpp | 1 + opm/simulators/wells/VFPHelpers.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/opm/simulators/wells/MSWellHelpers.cpp b/opm/simulators/wells/MSWellHelpers.cpp index 83e4ed749..2aef8652e 100644 --- a/opm/simulators/wells/MSWellHelpers.cpp +++ b/opm/simulators/wells/MSWellHelpers.cpp @@ -29,6 +29,7 @@ #include <opm/input/eclipse/Schedule/MSW/SICD.hpp> #include <opm/material/densead/Evaluation.hpp> +#include <opm/material/densead/Math.hpp> #include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> diff --git a/opm/simulators/wells/VFPHelpers.cpp b/opm/simulators/wells/VFPHelpers.cpp index f2902d777..a1f5b476b 100644 --- a/opm/simulators/wells/VFPHelpers.cpp +++ b/opm/simulators/wells/VFPHelpers.cpp @@ -23,6 +23,7 @@ #include <opm/common/ErrorMacros.hpp> #include <opm/material/densead/Evaluation.hpp> +#include <opm/material/densead/Math.hpp> #include <opm/input/eclipse/Schedule/VFPInjTable.hpp> #include <opm/input/eclipse/Schedule/VFPProdTable.hpp> From 1c2e1860175e9bf6308f4582a4988d0eb4361f02 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no> Date: Fri, 23 Dec 2022 13:31:41 +0100 Subject: [PATCH 2/2] always include Evaluation.hpp even if we are using the dynamic specialization --- opm/simulators/wells/StandardWell.hpp | 2 +- opm/simulators/wells/StandardWellAssemble.cpp | 2 +- opm/simulators/wells/StandardWellEval.cpp | 1 - opm/simulators/wells/StandardWellEval.hpp | 2 +- opm/simulators/wells/StandardWellPrimaryVariables.hpp | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/opm/simulators/wells/StandardWell.hpp b/opm/simulators/wells/StandardWell.hpp index 97b9b1557..ceef4ab30 100644 --- a/opm/simulators/wells/StandardWell.hpp +++ b/opm/simulators/wells/StandardWell.hpp @@ -38,7 +38,7 @@ #include <opm/models/blackoil/blackoilbrinemodules.hh> #include <opm/models/blackoil/blackoilmicpmodules.hh> -#include <opm/material/densead/DynamicEvaluation.hpp> +#include <opm/material/densead/Evaluation.hpp> #include <opm/input/eclipse/EclipseState/Runspec.hpp> #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp> diff --git a/opm/simulators/wells/StandardWellAssemble.cpp b/opm/simulators/wells/StandardWellAssemble.cpp index 8c248c62f..2454e1e88 100644 --- a/opm/simulators/wells/StandardWellAssemble.cpp +++ b/opm/simulators/wells/StandardWellAssemble.cpp @@ -24,7 +24,7 @@ #include <opm/core/props/BlackoilPhases.hpp> -#include <opm/material/densead/DynamicEvaluation.hpp> +#include <opm/material/densead/Evaluation.hpp> #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp> #include <opm/models/blackoil/blackoilindices.hh> diff --git a/opm/simulators/wells/StandardWellEval.cpp b/opm/simulators/wells/StandardWellEval.cpp index 7a09c4441..e6a92a165 100644 --- a/opm/simulators/wells/StandardWellEval.cpp +++ b/opm/simulators/wells/StandardWellEval.cpp @@ -22,7 +22,6 @@ #include <config.h> #include <opm/simulators/wells/StandardWellEval.hpp> -#include <opm/material/densead/DynamicEvaluation.hpp> #include <opm/material/fluidsystems/BlackOilFluidSystem.hpp> #include <opm/models/blackoil/blackoilindices.hh> diff --git a/opm/simulators/wells/StandardWellEval.hpp b/opm/simulators/wells/StandardWellEval.hpp index 9b7309c8c..adc39275b 100644 --- a/opm/simulators/wells/StandardWellEval.hpp +++ b/opm/simulators/wells/StandardWellEval.hpp @@ -27,7 +27,7 @@ #include <opm/simulators/wells/StandardWellEquations.hpp> #include <opm/simulators/wells/StandardWellPrimaryVariables.hpp> -#include <opm/material/densead/DynamicEvaluation.hpp> +#include <opm/material/densead/Evaluation.hpp> #include <optional> #include <vector> diff --git a/opm/simulators/wells/StandardWellPrimaryVariables.hpp b/opm/simulators/wells/StandardWellPrimaryVariables.hpp index a105ea4b0..4c301e4e1 100644 --- a/opm/simulators/wells/StandardWellPrimaryVariables.hpp +++ b/opm/simulators/wells/StandardWellPrimaryVariables.hpp @@ -23,7 +23,7 @@ #ifndef OPM_STANDARDWELL_PRIMARY_VARIABLES_HEADER_INCLUDED #define OPM_STANDARDWELL_PRIMARY_VARIABLES_HEADER_INCLUDED -#include <opm/material/densead/DynamicEvaluation.hpp> +#include <opm/material/densead/Evaluation.hpp> #include <opm/simulators/wells/StandardWellEquations.hpp>