OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

adjust to EWOMS_HIDE_PARAM macro removal

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-03-22 12:16:26 +01:00
parent 3334726871
commit 21bc4c7f0d
5 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/flow/BlackoilModelParameters.hpp
View File

@ -737,7 +737,7 @@ namespace Opm
EWOMS_REGISTER_PARAM(TypeTag, bool, DebugEmitCellPartition, "Whether or not to emit cell partitions as a debugging aid."); EWOMS_REGISTER_PARAM(TypeTag, bool, DebugEmitCellPartition, "Whether or not to emit cell partitions as a debugging aid.");
EWOMS_HIDE_PARAM(TypeTag, DebugEmitCellPartition); Parameters::hideParam<TypeTag>("DebugEmitCellPartition");
} }
}; };
} // namespace Opm } // namespace Opm

4
opm/simulators/flow/FlowBaseVanguard.hpp
View File

@ -275,13 +275,13 @@ public:
"from a JSON file by giving the filename here, ending with '.json.' " "from a JSON file by giving the filename here, ending with '.json.' "
"See https://sandialabs.github.io/Zoltan/ug_html/ug.html " "See https://sandialabs.github.io/Zoltan/ug_html/ug.html "
"for available Zoltan options."); "for available Zoltan options.");
EWOMS_HIDE_PARAM(TypeTag, ZoltanParams); Parameters::hideParam<TypeTag>("ZoltanParams");
EWOMS_REGISTER_PARAM(TypeTag, std::string, ExternalPartition, EWOMS_REGISTER_PARAM(TypeTag, std::string, ExternalPartition,
"Name of file from which to load an externally generated " "Name of file from which to load an externally generated "
"partitioning of the model's active cells for MPI " "partitioning of the model's active cells for MPI "
"distribution purposes. If empty, the built-in partitioning " "distribution purposes. If empty, the built-in partitioning "
"method will be employed."); "method will be employed.");
EWOMS_HIDE_PARAM(TypeTag, ExternalPartition); Parameters::hideParam<TypeTag>("ExternalPartition");
#endif #endif
EWOMS_REGISTER_PARAM(TypeTag, bool, AllowDistributedWells, EWOMS_REGISTER_PARAM(TypeTag, bool, AllowDistributedWells,
"Allow the perforations of a well to be distributed to interior of multiple processes"); "Allow the perforations of a well to be distributed to interior of multiple processes");

114
opm/simulators/flow/FlowMain.hpp
View File

@ -127,83 +127,83 @@ namespace Opm {
registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false); registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false);
// hide the parameters unused by flow. TODO: this is a pain to maintain // hide the parameters unused by flow. TODO: this is a pain to maintain
EWOMS_HIDE_PARAM(TypeTag, EnableGravity); Parameters::hideParam<TypeTag>("EnableGravity");
EWOMS_HIDE_PARAM(TypeTag, EnableGridAdaptation); Parameters::hideParam<TypeTag>("EnableGridAdaptation");
// this parameter is actually used in eWoms, but the flow well model // this parameter is actually used in eWoms, but the flow well model
// hard-codes the assumption that the intensive quantities cache is enabled, // hard-codes the assumption that the intensive quantities cache is enabled,
// so flow crashes. Let's hide the parameter for that reason. // so flow crashes. Let's hide the parameter for that reason.
EWOMS_HIDE_PARAM(TypeTag, EnableIntensiveQuantityCache); Parameters::hideParam<TypeTag>("EnableIntensiveQuantityCache");
// thermodynamic hints are not implemented/required by the eWoms blackoil // thermodynamic hints are not implemented/required by the eWoms blackoil
// model // model
EWOMS_HIDE_PARAM(TypeTag, EnableThermodynamicHints); Parameters::hideParam<TypeTag>("EnableThermodynamicHints");
// in flow only the deck file determines the end time of the simulation // in flow only the deck file determines the end time of the simulation
EWOMS_HIDE_PARAM(TypeTag, EndTime); Parameters::hideParam<TypeTag>("EndTime");
// time stepping is not done by the eWoms code in flow // time stepping is not done by the eWoms code in flow
EWOMS_HIDE_PARAM(TypeTag, InitialTimeStepSize); Parameters::hideParam<TypeTag>("InitialTimeStepSize");
EWOMS_HIDE_PARAM(TypeTag, MaxTimeStepDivisions); Parameters::hideParam<TypeTag>("MaxTimeStepDivisions");
EWOMS_HIDE_PARAM(TypeTag, MaxTimeStepSize); Parameters::hideParam<TypeTag>("MaxTimeStepSize");
EWOMS_HIDE_PARAM(TypeTag, MinTimeStepSize); Parameters::hideParam<TypeTag>("MinTimeStepSize");
EWOMS_HIDE_PARAM(TypeTag, PredeterminedTimeStepsFile); Parameters::hideParam<TypeTag>("PredeterminedTimeStepsFile");
// flow also does not use the eWoms Newton method // flow also does not use the eWoms Newton method
EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError); Parameters::hideParam<TypeTag>("NewtonMaxError");
EWOMS_HIDE_PARAM(TypeTag, NewtonTolerance); Parameters::hideParam<TypeTag>("NewtonTolerance");
EWOMS_HIDE_PARAM(TypeTag, NewtonTargetIterations); Parameters::hideParam<TypeTag>("NewtonTargetIterations");
EWOMS_HIDE_PARAM(TypeTag, NewtonVerbose); Parameters::hideParam<TypeTag>("NewtonVerbose");
EWOMS_HIDE_PARAM(TypeTag, NewtonWriteConvergence); Parameters::hideParam<TypeTag>("NewtonWriteConvergence");
// the default eWoms checkpoint/restart mechanism does not work with flow // the default eWoms checkpoint/restart mechanism does not work with flow
EWOMS_HIDE_PARAM(TypeTag, RestartTime); Parameters::hideParam<TypeTag>("RestartTime");
EWOMS_HIDE_PARAM(TypeTag, RestartWritingInterval); Parameters::hideParam<TypeTag>("RestartWritingInterval");
// hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used // 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))){ //if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableVtkOutput))){
EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilFormationVolumeFactor); Parameters::hideParam<TypeTag>("VtkWriteOilFormationVolumeFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilSaturationPressure); Parameters::hideParam<TypeTag>("VtkWriteOilSaturationPressure");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilVaporizationFactor); Parameters::hideParam<TypeTag>("VtkWriteOilVaporizationFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWritePorosity); Parameters::hideParam<TypeTag>("VtkWritePorosity");
EWOMS_HIDE_PARAM(TypeTag, VtkWritePotentialGradients); Parameters::hideParam<TypeTag>("VtkWritePotentialGradients");
EWOMS_HIDE_PARAM(TypeTag, VtkWritePressures); Parameters::hideParam<TypeTag>("VtkWritePressures");
EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVars); Parameters::hideParam<TypeTag>("VtkWritePrimaryVars");
EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVarsMeaning); Parameters::hideParam<TypeTag>("VtkWritePrimaryVarsMeaning");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteProcessRank); Parameters::hideParam<TypeTag>("VtkWriteProcessRank");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteRelativePermeabilities); Parameters::hideParam<TypeTag>("VtkWriteRelativePermeabilities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedGasOilVaporizationFactor); Parameters::hideParam<TypeTag>("VtkWriteSaturatedGasOilVaporizationFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedOilGasDissolutionFactor); Parameters::hideParam<TypeTag>("VtkWriteSaturatedOilGasDissolutionFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturationRatios); Parameters::hideParam<TypeTag>("VtkWriteSaturationRatios");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturations); Parameters::hideParam<TypeTag>("VtkWriteSaturations");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteTemperature); Parameters::hideParam<TypeTag>("VtkWriteTemperature");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteViscosities); Parameters::hideParam<TypeTag>("VtkWriteViscosities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteWaterFormationVolumeFactor); Parameters::hideParam<TypeTag>("VtkWriteWaterFormationVolumeFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasDissolutionFactor); Parameters::hideParam<TypeTag>("VtkWriteGasDissolutionFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); Parameters::hideParam<TypeTag>("VtkWriteGasFormationVolumeFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); Parameters::hideParam<TypeTag>("VtkWriteGasSaturationPressure");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); Parameters::hideParam<TypeTag>("VtkWriteIntrinsicPermeabilities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteTracerConcentration); Parameters::hideParam<TypeTag>("VtkWriteTracerConcentration");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); Parameters::hideParam<TypeTag>("VtkWriteExtrusionFactor");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); Parameters::hideParam<TypeTag>("VtkWriteFilterVelocities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); Parameters::hideParam<TypeTag>("VtkWriteDensities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteDofIndex); Parameters::hideParam<TypeTag>("VtkWriteDofIndex");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteMobilities); Parameters::hideParam<TypeTag>("VtkWriteMobilities");
//} //}
EWOMS_HIDE_PARAM(TypeTag, VtkWriteAverageMolarMasses); Parameters::hideParam<TypeTag>("VtkWriteAverageMolarMasses");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacities); Parameters::hideParam<TypeTag>("VtkWriteFugacities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacityCoeffs); Parameters::hideParam<TypeTag>("VtkWriteFugacityCoeffs");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteMassFractions); Parameters::hideParam<TypeTag>("VtkWriteMassFractions");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteMolarities); Parameters::hideParam<TypeTag>("VtkWriteMolarities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteMoleFractions); Parameters::hideParam<TypeTag>("VtkWriteMoleFractions");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMassFractions); Parameters::hideParam<TypeTag>("VtkWriteTotalMassFractions");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMoleFractions); Parameters::hideParam<TypeTag>("VtkWriteTotalMoleFractions");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteTortuosities); Parameters::hideParam<TypeTag>("VtkWriteTortuosities");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteDiffusionCoefficients); Parameters::hideParam<TypeTag>("VtkWriteDiffusionCoefficients");
EWOMS_HIDE_PARAM(TypeTag, VtkWriteEffectiveDiffusionCoefficients); Parameters::hideParam<TypeTag>("VtkWriteEffectiveDiffusionCoefficients");
// hide average density option // hide average density option
EWOMS_HIDE_PARAM(TypeTag, UseAverageDensityMsWells); Parameters::hideParam<TypeTag>("UseAverageDensityMsWells");
Parameters::endParamRegistration<TypeTag>(); Parameters::endParamRegistration<TypeTag>();

5
opm/simulators/flow/FlowProblem.hpp
View File

@ -236,11 +236,10 @@ public:
"Specify which messages are going to be printed. Valid values are: none, log, all (default)"); "Specify which messages are going to be printed. Valid values are: none, log, all (default)");
EWOMS_REGISTER_PARAM(TypeTag, int, NumPressurePointsEquil, EWOMS_REGISTER_PARAM(TypeTag, int, NumPressurePointsEquil,
"Number of pressure points (in each direction) in tables used for equilibration"); "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<TypeTag>("NumPressurePointsEquil"); // Users will typically not need to modify this parameter..
EWOMS_REGISTER_PARAM(TypeTag, bool, ExplicitRockCompaction, EWOMS_REGISTER_PARAM(TypeTag, bool, ExplicitRockCompaction,
"Use pressure from end of the last time step when evaluating rock compaction"); "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<TypeTag>("ExplicitRockCompaction"); // Users will typically not need to modify this parameter..
} }

4
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
View File

@ -246,11 +246,11 @@ public:
EWOMS_REGISTER_PARAM(TypeTag, std::string, SaveFile, EWOMS_REGISTER_PARAM(TypeTag, std::string, SaveFile,
"FileName for .OPMRST file used for saving serialized state. " "FileName for .OPMRST file used for saving serialized state. "
"If empty, CASENAME.OPMRST is used."); "If empty, CASENAME.OPMRST is used.");
EWOMS_HIDE_PARAM(TypeTag, SaveFile); Parameters::hideParam<TypeTag>("SaveFile");
EWOMS_REGISTER_PARAM(TypeTag, std::string, LoadFile, EWOMS_REGISTER_PARAM(TypeTag, std::string, LoadFile,
"FileName for .OPMRST file used to load serialized state. " "FileName for .OPMRST file used to load serialized state. "
"If empty, CASENAME.OPMRST is used."); "If empty, CASENAME.OPMRST is used.");
EWOMS_HIDE_PARAM(TypeTag, LoadFile); Parameters::hideParam<TypeTag>("LoadFile");
} }
/// Run the simulation. /// Run the simulation.