changed: rename externalSetupTime

external is (or will be) implied

ebos/eclgenericvanguard.cc

@@ -53,7 +53,7 @@
 
 namespace Opm {
 
-double EclGenericVanguard::externalSetupTime_ = 0.0;
+double EclGenericVanguard::setupTime_ = 0.0;
 std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_;
 std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_;
 std::shared_ptr<Deck> EclGenericVanguard::externalDeck_;

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)
+    static void setSetupTime(double t)
-    { externalSetupTime_ = t; }
+    { setupTime_ = t; }
 
     /*!
      * \brief Returns the wall time required to set up the simulator before it was born.
      */
-    static double externalSetupTime()
+    static double setupTime()
-    { return externalSetupTime_; }
+    { 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<ParseContext> externalParseContext_;
     static std::unique_ptr<ErrorGuard> externalErrorGuard_;
 

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()

flow/flow_ebos_blackoil.cpp

@@ -35,7 +35,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_brine.cpp

@@ -45,7 +45,7 @@ void flowEbosBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowBrineProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_brine_precsalt_vapwat.cpp

@@ -55,7 +55,7 @@ void flowEbosBrinePrecsaltVapwatSetDeck(double setupTime, std::shared_ptr<Deck>
     using TypeTag = Properties::TTag::EclFlowBrinePrecsaltVapwatProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_brine_saltprecipitation.cpp

@@ -50,7 +50,7 @@ void flowEbosBrineSaltPrecipitationSetDeck(double setupTime, std::shared_ptr<Dec
     using TypeTag = Properties::TTag::EclFlowBrineSaltPrecipitationProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_energy.cpp

@@ -45,7 +45,7 @@ void flowEbosEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowEnergyProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_extbo.cpp

@@ -45,7 +45,7 @@ void flowEbosExtboSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowExtboProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_foam.cpp

@@ -45,7 +45,7 @@ void flowEbosFoamSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowFoamProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_gasoil.cpp

@@ -66,7 +66,7 @@ void flowEbosGasOilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowGasOilProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_gasoil_energy.cpp

@@ -70,7 +70,7 @@ void flowEbosGasOilEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowGasOilEnergyProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_gaswater.cpp

@@ -69,7 +69,7 @@ void flowEbosGasWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowGasWaterProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_gaswater_brine.cpp

@@ -69,7 +69,7 @@ void flowEbosGasWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowGasWaterBrineProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_gaswater_saltprec_vapwat.cpp

@@ -80,7 +80,7 @@ void flowEbosGasWaterSaltprecVapwatSetDeck(double setupTime, std::shared_ptr<Dec
     using TypeTag = Properties::TTag::EclFlowGasWaterSaltprecVapwatProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_micp.cpp

@@ -69,7 +69,7 @@ void flowEbosMICPSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowMICPProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_oilwater.cpp

@@ -66,7 +66,7 @@ void flowEbosOilWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowOilWaterProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_oilwater_brine.cpp

@@ -69,7 +69,7 @@ void flowEbosOilWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowOilWaterBrineProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_oilwater_polymer.cpp

@@ -69,7 +69,7 @@ void flowEbosOilWaterPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck
     using TypeTag = Properties::TTag::EclFlowOilWaterPolymerProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_onephase.cpp

@@ -65,7 +65,7 @@ void flowEbosWaterOnlySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowProblemWaterOnly;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_onephase_energy.cpp

@@ -72,7 +72,7 @@ void flowEbosWaterOnlyEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck
     using TypeTag = Properties::TTag::EclFlowProblemWaterOnlyEnergy;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_polymer.cpp

@@ -45,7 +45,7 @@ void flowEbosPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowPolymerProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));

flow/flow_ebos_solvent.cpp

@@ -45,7 +45,7 @@ void flowEbosSolventSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     using TypeTag = Properties::TTag::EclFlowSolventProblem;
     using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
 
-    Vanguard::setExternalSetupTime(setupTime);
+    Vanguard::setSetupTime(setupTime);
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));