diff --git a/opm/simulators/flow/FlowBaseVanguard.hpp b/opm/simulators/flow/FlowBaseVanguard.hpp index fc0200d36..32a88a7f2 100644 --- a/opm/simulators/flow/FlowBaseVanguard.hpp +++ b/opm/simulators/flow/FlowBaseVanguard.hpp @@ -117,34 +117,12 @@ public: FlowBaseVanguard(Simulator& simulator) : ParentType(simulator) { - fileName_ = Parameters::Get(); - edgeWeightsMethod_ = Dune::EdgeWeightMethod(Parameters::Get()); - -#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA - numJacobiBlocks_ = Parameters::Get(); -#endif - - ownersFirst_ = Parameters::Get(); #if HAVE_MPI - partitionMethod_ = Dune::PartitionMethod(Parameters::Get()); - serialPartitioning_ = Parameters::Get(); imbalanceTol_ = Parameters::Get>(); zoltanImbalanceTolSet_ = Parameters::IsSet>(); zoltanImbalanceTol_ = Parameters::Get>(); - zoltanParams_ = Parameters::Get(); - - metisParams_ = Parameters::Get(); - - externalPartitionFile_ = Parameters::Get(); #endif - enableDistributedWells_ = Parameters::Get(); - allow_splitting_inactive_wells_ = Parameters::Get(); - ignoredKeywords_ = Parameters::Get(); - int output_param = Parameters::Get(); - if (output_param >= 0) - outputInterval_ = output_param; - useMultisegmentWell_ = Parameters::Get(); enableExperiments_ = enableExperiments; init(); diff --git a/opm/simulators/flow/FlowGenericVanguard.cpp b/opm/simulators/flow/FlowGenericVanguard.cpp index 2885b2c66..42aee1fad 100644 --- a/opm/simulators/flow/FlowGenericVanguard.cpp +++ b/opm/simulators/flow/FlowGenericVanguard.cpp @@ -107,6 +107,32 @@ FlowGenericVanguard::FlowGenericVanguard(SimulationModelParams&& params) : python(std::make_shared()) { defineSimulationModel(std::move(params)); + + fileName_ = Parameters::Get(); + edgeWeightsMethod_ = Dune::EdgeWeightMethod(Parameters::Get()); + +#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA + numJacobiBlocks_ = Parameters::Get(); +#endif + + ownersFirst_ = Parameters::Get(); +#if HAVE_MPI + partitionMethod_ = Dune::PartitionMethod(Parameters::Get()); + serialPartitioning_ = Parameters::Get(); + zoltanParams_ = Parameters::Get(); + + metisParams_ = Parameters::Get(); + + externalPartitionFile_ = Parameters::Get(); +#endif + enableDistributedWells_ = Parameters::Get(); + allow_splitting_inactive_wells_ = Parameters::Get(); + ignoredKeywords_ = Parameters::Get(); + int output_param = Parameters::Get(); + if (output_param >= 0) { + outputInterval_ = output_param; + } + useMultisegmentWell_ = Parameters::Get(); } FlowGenericVanguard::SimulationModelParams