diff --git a/opm/simulators/flow/BlackoilModelParameters.hpp b/opm/simulators/flow/BlackoilModelParameters.hpp index db74ec146..8504214b8 100644 --- a/opm/simulators/flow/BlackoilModelParameters.hpp +++ b/opm/simulators/flow/BlackoilModelParameters.hpp @@ -737,7 +737,7 @@ namespace Opm EWOMS_REGISTER_PARAM(TypeTag, bool, DebugEmitCellPartition, "Whether or not to emit cell partitions as a debugging aid."); - EWOMS_HIDE_PARAM(TypeTag, DebugEmitCellPartition); + Parameters::hideParam("DebugEmitCellPartition"); } }; } // namespace Opm diff --git a/opm/simulators/flow/FlowBaseVanguard.hpp b/opm/simulators/flow/FlowBaseVanguard.hpp index 10b272e97..9d4c0326e 100644 --- a/opm/simulators/flow/FlowBaseVanguard.hpp +++ b/opm/simulators/flow/FlowBaseVanguard.hpp @@ -275,13 +275,13 @@ public: "from a JSON file by giving the filename here, ending with '.json.' " "See https://sandialabs.github.io/Zoltan/ug_html/ug.html " "for available Zoltan options."); - EWOMS_HIDE_PARAM(TypeTag, ZoltanParams); + Parameters::hideParam("ZoltanParams"); EWOMS_REGISTER_PARAM(TypeTag, std::string, ExternalPartition, "Name of file from which to load an externally generated " "partitioning of the model's active cells for MPI " "distribution purposes. If empty, the built-in partitioning " "method will be employed."); - EWOMS_HIDE_PARAM(TypeTag, ExternalPartition); + Parameters::hideParam("ExternalPartition"); #endif EWOMS_REGISTER_PARAM(TypeTag, bool, AllowDistributedWells, "Allow the perforations of a well to be distributed to interior of multiple processes"); diff --git a/opm/simulators/flow/FlowMain.hpp b/opm/simulators/flow/FlowMain.hpp index dedb1d04b..00a80d055 100644 --- a/opm/simulators/flow/FlowMain.hpp +++ b/opm/simulators/flow/FlowMain.hpp @@ -127,83 +127,83 @@ namespace Opm { registerAllParameters_(/*finalizeRegistration=*/false); // hide the parameters unused by flow. TODO: this is a pain to maintain - EWOMS_HIDE_PARAM(TypeTag, EnableGravity); - EWOMS_HIDE_PARAM(TypeTag, EnableGridAdaptation); + Parameters::hideParam("EnableGravity"); + Parameters::hideParam("EnableGridAdaptation"); // this parameter is actually used in eWoms, but the flow well model // hard-codes the assumption that the intensive quantities cache is enabled, // so flow crashes. Let's hide the parameter for that reason. - EWOMS_HIDE_PARAM(TypeTag, EnableIntensiveQuantityCache); + Parameters::hideParam("EnableIntensiveQuantityCache"); // thermodynamic hints are not implemented/required by the eWoms blackoil // model - EWOMS_HIDE_PARAM(TypeTag, EnableThermodynamicHints); + Parameters::hideParam("EnableThermodynamicHints"); // in flow only the deck file determines the end time of the simulation - EWOMS_HIDE_PARAM(TypeTag, EndTime); + Parameters::hideParam("EndTime"); // time stepping is not done by the eWoms code in flow - EWOMS_HIDE_PARAM(TypeTag, InitialTimeStepSize); - EWOMS_HIDE_PARAM(TypeTag, MaxTimeStepDivisions); - EWOMS_HIDE_PARAM(TypeTag, MaxTimeStepSize); - EWOMS_HIDE_PARAM(TypeTag, MinTimeStepSize); - EWOMS_HIDE_PARAM(TypeTag, PredeterminedTimeStepsFile); + Parameters::hideParam("InitialTimeStepSize"); + Parameters::hideParam("MaxTimeStepDivisions"); + Parameters::hideParam("MaxTimeStepSize"); + Parameters::hideParam("MinTimeStepSize"); + Parameters::hideParam("PredeterminedTimeStepsFile"); // flow also does not use the eWoms Newton method - EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError); - EWOMS_HIDE_PARAM(TypeTag, NewtonTolerance); - EWOMS_HIDE_PARAM(TypeTag, NewtonTargetIterations); - EWOMS_HIDE_PARAM(TypeTag, NewtonVerbose); - EWOMS_HIDE_PARAM(TypeTag, NewtonWriteConvergence); + Parameters::hideParam("NewtonMaxError"); + Parameters::hideParam("NewtonTolerance"); + Parameters::hideParam("NewtonTargetIterations"); + Parameters::hideParam("NewtonVerbose"); + Parameters::hideParam("NewtonWriteConvergence"); // the default eWoms checkpoint/restart mechanism does not work with flow - EWOMS_HIDE_PARAM(TypeTag, RestartTime); - EWOMS_HIDE_PARAM(TypeTag, RestartWritingInterval); + Parameters::hideParam("RestartTime"); + Parameters::hideParam("RestartWritingInterval"); // hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used //if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableVtkOutput))){ - EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilFormationVolumeFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilSaturationPressure); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilVaporizationFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWritePorosity); - EWOMS_HIDE_PARAM(TypeTag, VtkWritePotentialGradients); - EWOMS_HIDE_PARAM(TypeTag, VtkWritePressures); - EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVars); - EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVarsMeaning); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteProcessRank); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteRelativePermeabilities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedGasOilVaporizationFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedOilGasDissolutionFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturationRatios); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturations); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTemperature); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteViscosities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteWaterFormationVolumeFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasDissolutionFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTracerConcentration); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteDofIndex); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMobilities); + Parameters::hideParam("VtkWriteOilFormationVolumeFactor"); + Parameters::hideParam("VtkWriteOilSaturationPressure"); + Parameters::hideParam("VtkWriteOilVaporizationFactor"); + Parameters::hideParam("VtkWritePorosity"); + Parameters::hideParam("VtkWritePotentialGradients"); + Parameters::hideParam("VtkWritePressures"); + Parameters::hideParam("VtkWritePrimaryVars"); + Parameters::hideParam("VtkWritePrimaryVarsMeaning"); + Parameters::hideParam("VtkWriteProcessRank"); + Parameters::hideParam("VtkWriteRelativePermeabilities"); + Parameters::hideParam("VtkWriteSaturatedGasOilVaporizationFactor"); + Parameters::hideParam("VtkWriteSaturatedOilGasDissolutionFactor"); + Parameters::hideParam("VtkWriteSaturationRatios"); + Parameters::hideParam("VtkWriteSaturations"); + Parameters::hideParam("VtkWriteTemperature"); + Parameters::hideParam("VtkWriteViscosities"); + Parameters::hideParam("VtkWriteWaterFormationVolumeFactor"); + Parameters::hideParam("VtkWriteGasDissolutionFactor"); + Parameters::hideParam("VtkWriteGasFormationVolumeFactor"); + Parameters::hideParam("VtkWriteGasSaturationPressure"); + Parameters::hideParam("VtkWriteIntrinsicPermeabilities"); + Parameters::hideParam("VtkWriteTracerConcentration"); + Parameters::hideParam("VtkWriteExtrusionFactor"); + Parameters::hideParam("VtkWriteFilterVelocities"); + Parameters::hideParam("VtkWriteDensities"); + Parameters::hideParam("VtkWriteDofIndex"); + Parameters::hideParam("VtkWriteMobilities"); //} - EWOMS_HIDE_PARAM(TypeTag, VtkWriteAverageMolarMasses); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacityCoeffs); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMassFractions); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMolarities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMoleFractions); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMassFractions); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMoleFractions); + Parameters::hideParam("VtkWriteAverageMolarMasses"); + Parameters::hideParam("VtkWriteFugacities"); + Parameters::hideParam("VtkWriteFugacityCoeffs"); + Parameters::hideParam("VtkWriteMassFractions"); + Parameters::hideParam("VtkWriteMolarities"); + Parameters::hideParam("VtkWriteMoleFractions"); + Parameters::hideParam("VtkWriteTotalMassFractions"); + Parameters::hideParam("VtkWriteTotalMoleFractions"); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTortuosities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteDiffusionCoefficients); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteEffectiveDiffusionCoefficients); + Parameters::hideParam("VtkWriteTortuosities"); + Parameters::hideParam("VtkWriteDiffusionCoefficients"); + Parameters::hideParam("VtkWriteEffectiveDiffusionCoefficients"); - // hide average density option - EWOMS_HIDE_PARAM(TypeTag, UseAverageDensityMsWells); + // hide average density option + Parameters::hideParam("UseAverageDensityMsWells"); Parameters::endParamRegistration(); diff --git a/opm/simulators/flow/FlowProblem.hpp b/opm/simulators/flow/FlowProblem.hpp index 089aaa973..d951f1254 100644 --- a/opm/simulators/flow/FlowProblem.hpp +++ b/opm/simulators/flow/FlowProblem.hpp @@ -236,11 +236,10 @@ public: "Specify which messages are going to be printed. Valid values are: none, log, all (default)"); EWOMS_REGISTER_PARAM(TypeTag, int, NumPressurePointsEquil, "Number of pressure points (in each direction) in tables used for equilibration"); - EWOMS_HIDE_PARAM(TypeTag, NumPressurePointsEquil); // Users will typically not need to modify this parameter.. + Parameters::hideParam("NumPressurePointsEquil"); // Users will typically not need to modify this parameter.. EWOMS_REGISTER_PARAM(TypeTag, bool, ExplicitRockCompaction, "Use pressure from end of the last time step when evaluating rock compaction"); - EWOMS_HIDE_PARAM(TypeTag, ExplicitRockCompaction); // Users will typically not need to modify this parameter.. - + Parameters::hideParam("ExplicitRockCompaction"); // Users will typically not need to modify this parameter.. } diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp index 1c85be776..5c7cc2736 100644 --- a/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp +++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp @@ -246,11 +246,11 @@ public: EWOMS_REGISTER_PARAM(TypeTag, std::string, SaveFile, "FileName for .OPMRST file used for saving serialized state. " "If empty, CASENAME.OPMRST is used."); - EWOMS_HIDE_PARAM(TypeTag, SaveFile); + Parameters::hideParam("SaveFile"); EWOMS_REGISTER_PARAM(TypeTag, std::string, LoadFile, "FileName for .OPMRST file used to load serialized state. " "If empty, CASENAME.OPMRST is used."); - EWOMS_HIDE_PARAM(TypeTag, LoadFile); + Parameters::hideParam("LoadFile"); } /// Run the simulation.