diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc index 039698a2a..04746a52c 100644 --- a/ebos/eclgenericvanguard.cc +++ b/ebos/eclgenericvanguard.cc @@ -53,7 +53,7 @@ namespace Opm { -double EclGenericVanguard::externalSetupTime_ = 0.0; +double EclGenericVanguard::setupTime_ = 0.0; std::unique_ptr EclGenericVanguard::externalParseContext_; std::unique_ptr EclGenericVanguard::externalErrorGuard_; std::shared_ptr EclGenericVanguard::externalDeck_; diff --git a/ebos/eclgenericvanguard.hh b/ebos/eclgenericvanguard.hh index fb727a4c1..abccb968e 100644 --- a/ebos/eclgenericvanguard.hh +++ b/ebos/eclgenericvanguard.hh @@ -96,16 +96,16 @@ public: /*! * \brief Set the wall time which was spend externally to set up the external data structures * - * i.e., the objects specified via the other setExternal*() methods. + * i.e., the objects specified via the other set*() methods. */ - static void setExternalSetupTime(double t) - { externalSetupTime_ = t; } + static void setSetupTime(double t) + { setupTime_ = t; } /*! * \brief Returns the wall time required to set up the simulator before it was born. */ - static double externalSetupTime() - { return externalSetupTime_; } + static double setupTime() + { return setupTime_; } /*! * \brief Set the Opm::ParseContext object which ought to be used for parsing the deck and creating the Opm::EclipseState object. @@ -316,7 +316,7 @@ protected: void init(); - static double externalSetupTime_; + static double setupTime_; static std::unique_ptr externalParseContext_; static std::unique_ptr externalErrorGuard_; diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh index 718989369..fe24ce94d 100644 --- a/ebos/eclwriter.hh +++ b/ebos/eclwriter.hh @@ -177,7 +177,7 @@ public: const Scalar totalCpuTime = simulator_.executionTimer().realTimeElapsed() + simulator_.setupTimer().realTimeElapsed() + - simulator_.vanguard().externalSetupTime(); + simulator_.vanguard().setupTime(); const auto localWellData = simulator_.problem().wellModel().wellData(); const auto localGroupAndNetworkData = simulator_.problem().wellModel() diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp index a76c16cd7..7754f1fb7 100644 --- a/flow/flow_ebos_blackoil.cpp +++ b/flow/flow_ebos_blackoil.cpp @@ -35,7 +35,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_brine.cpp b/flow/flow_ebos_brine.cpp index 00f691d31..eed6c6a20 100644 --- a/flow/flow_ebos_brine.cpp +++ b/flow/flow_ebos_brine.cpp @@ -45,7 +45,7 @@ void flowEbosBrineSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowBrineProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_brine_precsalt_vapwat.cpp b/flow/flow_ebos_brine_precsalt_vapwat.cpp index 93074a3b3..230301ae9 100644 --- a/flow/flow_ebos_brine_precsalt_vapwat.cpp +++ b/flow/flow_ebos_brine_precsalt_vapwat.cpp @@ -55,7 +55,7 @@ void flowEbosBrinePrecsaltVapwatSetDeck(double setupTime, std::shared_ptr using TypeTag = Properties::TTag::EclFlowBrinePrecsaltVapwatProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_brine_saltprecipitation.cpp b/flow/flow_ebos_brine_saltprecipitation.cpp index 18d27a607..456908617 100644 --- a/flow/flow_ebos_brine_saltprecipitation.cpp +++ b/flow/flow_ebos_brine_saltprecipitation.cpp @@ -50,7 +50,7 @@ void flowEbosBrineSaltPrecipitationSetDeck(double setupTime, std::shared_ptr; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_ebos_energy.cpp index 0ba15feb5..249793399 100644 --- a/flow/flow_ebos_energy.cpp +++ b/flow/flow_ebos_energy.cpp @@ -45,7 +45,7 @@ void flowEbosEnergySetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowEnergyProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_extbo.cpp b/flow/flow_ebos_extbo.cpp index 88a557401..40fe46357 100644 --- a/flow/flow_ebos_extbo.cpp +++ b/flow/flow_ebos_extbo.cpp @@ -45,7 +45,7 @@ void flowEbosExtboSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowExtboProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_foam.cpp b/flow/flow_ebos_foam.cpp index 46e3161eb..37a7b3d70 100644 --- a/flow/flow_ebos_foam.cpp +++ b/flow/flow_ebos_foam.cpp @@ -45,7 +45,7 @@ void flowEbosFoamSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowFoamProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_ebos_gasoil.cpp index 45465a067..ce6cfa934 100644 --- a/flow/flow_ebos_gasoil.cpp +++ b/flow/flow_ebos_gasoil.cpp @@ -66,7 +66,7 @@ void flowEbosGasOilSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowGasOilProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_gasoil_energy.cpp b/flow/flow_ebos_gasoil_energy.cpp index d83f2cf6e..8f3404341 100644 --- a/flow/flow_ebos_gasoil_energy.cpp +++ b/flow/flow_ebos_gasoil_energy.cpp @@ -70,7 +70,7 @@ void flowEbosGasOilEnergySetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowGasOilEnergyProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_gaswater.cpp b/flow/flow_ebos_gaswater.cpp index 8f5d0ee2e..601b2d477 100644 --- a/flow/flow_ebos_gaswater.cpp +++ b/flow/flow_ebos_gaswater.cpp @@ -69,7 +69,7 @@ void flowEbosGasWaterSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowGasWaterProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_gaswater_brine.cpp b/flow/flow_ebos_gaswater_brine.cpp index 8ffd9e2ed..9f42174e9 100644 --- a/flow/flow_ebos_gaswater_brine.cpp +++ b/flow/flow_ebos_gaswater_brine.cpp @@ -69,7 +69,7 @@ void flowEbosGasWaterBrineSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowGasWaterBrineProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp index f5f6553ef..34b5baade 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp +++ b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp @@ -80,7 +80,7 @@ void flowEbosGasWaterSaltprecVapwatSetDeck(double setupTime, std::shared_ptr; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_micp.cpp b/flow/flow_ebos_micp.cpp index a03b6d6e7..a20d8a7ee 100644 --- a/flow/flow_ebos_micp.cpp +++ b/flow/flow_ebos_micp.cpp @@ -69,7 +69,7 @@ void flowEbosMICPSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowMICPProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_ebos_oilwater.cpp index 82c0fd24d..2336b5cf2 100644 --- a/flow/flow_ebos_oilwater.cpp +++ b/flow/flow_ebos_oilwater.cpp @@ -66,7 +66,7 @@ void flowEbosOilWaterSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowOilWaterProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_oilwater_brine.cpp b/flow/flow_ebos_oilwater_brine.cpp index b1fbb1e82..064c40aa7 100644 --- a/flow/flow_ebos_oilwater_brine.cpp +++ b/flow/flow_ebos_oilwater_brine.cpp @@ -69,7 +69,7 @@ void flowEbosOilWaterBrineSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp index 8c0eb06d9..169ddb7a0 100644 --- a/flow/flow_ebos_oilwater_polymer.cpp +++ b/flow/flow_ebos_oilwater_polymer.cpp @@ -69,7 +69,7 @@ void flowEbosOilWaterPolymerSetDeck(double setupTime, std::shared_ptr deck using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_onephase.cpp b/flow/flow_ebos_onephase.cpp index f777f0af4..707b6030c 100644 --- a/flow/flow_ebos_onephase.cpp +++ b/flow/flow_ebos_onephase.cpp @@ -65,7 +65,7 @@ void flowEbosWaterOnlySetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowProblemWaterOnly; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_onephase_energy.cpp b/flow/flow_ebos_onephase_energy.cpp index 19ce0df67..1ebc62329 100644 --- a/flow/flow_ebos_onephase_energy.cpp +++ b/flow/flow_ebos_onephase_energy.cpp @@ -72,7 +72,7 @@ void flowEbosWaterOnlyEnergySetDeck(double setupTime, std::shared_ptr deck using TypeTag = Properties::TTag::EclFlowProblemWaterOnlyEnergy; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_ebos_polymer.cpp index 22a312d16..4d57544d1 100644 --- a/flow/flow_ebos_polymer.cpp +++ b/flow/flow_ebos_polymer.cpp @@ -45,7 +45,7 @@ void flowEbosPolymerSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowPolymerProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule)); diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_ebos_solvent.cpp index 074b66ee6..f4afad899 100644 --- a/flow/flow_ebos_solvent.cpp +++ b/flow/flow_ebos_solvent.cpp @@ -45,7 +45,7 @@ void flowEbosSolventSetDeck(double setupTime, std::shared_ptr deck, using TypeTag = Properties::TTag::EclFlowSolventProblem; using Vanguard = GetPropType; - Vanguard::setExternalSetupTime(setupTime); + Vanguard::setSetupTime(setupTime); Vanguard::setExternalDeck(std::move(deck)); Vanguard::setExternalEclState(std::move(eclState)); Vanguard::setExternalSchedule(std::move(schedule));