From 48fa0f3c59c857256ce4b64a40afb377decd02b7 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 4 Apr 2024 12:49:01 +0200 Subject: [PATCH] drop macro EWOMS_REGISTER_PARAM --- examples/problems/co2injectionproblem.hh | 45 +++++-------- examples/problems/co2ptflashproblem.hh | 19 +++--- examples/problems/fingerproblem.hh | 5 +- examples/problems/groundwaterproblem.hh | 39 +++++------ examples/problems/lensproblem.hh | 30 ++++----- examples/problems/reservoirproblem.hh | 14 ++-- opm/models/blackoil/blackoilnewtonmethod.hh | 35 ++++++---- .../blackoil/blackoilprimaryvariables.hh | 3 +- opm/models/common/multiphasebaseproblem.hh | 4 +- .../common/fvbasediscretization.hh | 18 +++-- .../common/fvbasefdlocallinearizer.hh | 6 +- .../discretization/common/fvbaseproblem.hh | 26 ++++---- .../discretization/common/tpfalinearizer.hh | 4 +- opm/models/flash/flashmodel.hh | 6 +- opm/models/io/cubegridvanguard.hh | 30 ++++----- opm/models/io/dgfvanguard.hh | 10 +-- opm/models/io/structuredgridvanguard.hh | 30 ++++----- opm/models/io/vtkblackoilenergymodule.hh | 22 +++---- opm/models/io/vtkblackoilmicpmodule.hh | 28 ++++---- opm/models/io/vtkblackoilmodule.hh | 65 +++++++++---------- opm/models/io/vtkblackoilpolymermodule.hh | 36 +++++----- opm/models/io/vtkblackoilsolventmodule.hh | 30 ++++----- opm/models/io/vtkcompositionmodule.hh | 28 ++++---- opm/models/io/vtkdiffusionmodule.hh | 18 +++-- opm/models/io/vtkdiscretefracturemodule.hh | 33 +++++----- opm/models/io/vtkenergymodule.hh | 24 +++---- opm/models/io/vtkmultiphasemodule.hh | 48 +++++++------- opm/models/io/vtkphasepresencemodule.hh | 6 +- opm/models/io/vtkprimaryvarsmodule.hh | 12 ++-- opm/models/io/vtkptflashmodule.hh | 8 +-- opm/models/io/vtktemperaturemodule.hh | 4 +- opm/models/nonlinear/newtonmethod.hh | 35 +++++----- opm/models/parallel/threadmanager.hh | 7 +- opm/models/ptflash/flashmodel.hh | 16 ++--- opm/models/pvs/pvsmodel.hh | 6 +- opm/models/utils/parametersystem.hh | 36 +++++----- opm/models/utils/simulator.hh | 18 ++--- opm/models/utils/start.hh | 17 +++-- .../linalg/istlpreconditionerwrappers.hh | 18 +++-- opm/simulators/linalg/istlsolverwrappers.hh | 4 +- opm/simulators/linalg/parallelamgbackend.hh | 12 ++-- opm/simulators/linalg/parallelbasebackend.hh | 20 +++--- .../linalg/parallelbicgstabbackend.hh | 6 +- 43 files changed, 428 insertions(+), 453 deletions(-) diff --git a/examples/problems/co2injectionproblem.hh b/examples/problems/co2injectionproblem.hh index 186e94958..9525c74e0 100644 --- a/examples/problems/co2injectionproblem.hh +++ b/examples/problems/co2injectionproblem.hh @@ -373,33 +373,24 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FluidSystemTemperatureLow, - "The lower temperature [K] for tabulation of the " - "fluid system"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FluidSystemTemperatureHigh, - "The upper temperature [K] for tabulation of the " - "fluid system"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, FluidSystemNumTemperature, - "The number of intervals between the lower and " - "upper temperature"); - - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FluidSystemPressureLow, - "The lower pressure [Pa] for tabulation of the " - "fluid system"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FluidSystemPressureHigh, - "The upper pressure [Pa] for tabulation of the " - "fluid system"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, FluidSystemNumPressure, - "The number of intervals between the lower and " - "upper pressure"); - - EWOMS_REGISTER_PARAM(TypeTag, Scalar, Temperature, - "The temperature [K] in the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MaxDepth, - "The maximum depth [m] of the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, std::string, SimulationName, - "The name of the simulation used for the output " - "files"); + Parameters::registerParam + ("The lower temperature [K] for tabulation of the fluid system"); + Parameters::registerParam + ("The upper temperature [K] for tabulation of the fluid system"); + Parameters::registerParam + ("The number of intervals between the lower and upper temperature"); + Parameters::registerParam + ("The lower pressure [Pa] for tabulation of the fluid system"); + Parameters::registerParam + ("The upper pressure [Pa] for tabulation of the fluid system"); + Parameters::registerParam + ("The number of intervals between the lower and upper pressure"); + Parameters::registerParam + ("The temperature [K] in the reservoir"); + Parameters::registerParam + ("The maximum depth [m] of the reservoir"); + Parameters::registerParam + ("The name of the simulation used for the output files"); } /*! diff --git a/examples/problems/co2ptflashproblem.hh b/examples/problems/co2ptflashproblem.hh index 204115c35..b71f921ee 100644 --- a/examples/problems/co2ptflashproblem.hh +++ b/examples/problems/co2ptflashproblem.hh @@ -407,17 +407,14 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, Temperature, - "The temperature [K] in the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, Initialpressure, - "The initial pressure [Pa s] in the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, - std::string, - SimulationName, - "The name of the simulation used for the output " - "files"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, EpisodeLength, - "Time interval [s] for episode length"); + Parameters::registerParam + ("The temperature [K] in the reservoir"); + Parameters::registerParam + ("The initial pressure [Pa s] in the reservoir"); + Parameters::registerParam + ("The name of the simulation used for the output files"); + Parameters::registerParam + ("Time interval [s] for episode length"); } /*! diff --git a/examples/problems/fingerproblem.hh b/examples/problems/fingerproblem.hh index f9aedaa09..bc61d39d1 100644 --- a/examples/problems/fingerproblem.hh +++ b/examples/problems/fingerproblem.hh @@ -305,9 +305,8 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, InitialWaterSaturation, - "The initial saturation in the domain [] of the " - "wetting phase"); + Parameters::registerParam + ("The initial saturation in the domain [] of the wetting phase"); } /*! diff --git a/examples/problems/groundwaterproblem.hh b/examples/problems/groundwaterproblem.hh index b4214d638..5a5797ce1 100644 --- a/examples/problems/groundwaterproblem.hh +++ b/examples/problems/groundwaterproblem.hh @@ -263,36 +263,29 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftX, - "The x-coordinate of the lens' lower-left corner " - "[m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightX, - "The x-coordinate of the lens' upper-right corner " - "[m]."); + Parameters::registerParam + ("The x-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The x-coordinate of the lens' upper-right corner [m]."); if (dimWorld > 1) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftY, - "The y-coordinate of the lens' lower-left " - "corner [m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightY, - "The y-coordinate of the lens' upper-right " - "corner [m]."); + Parameters::registerParam + ("The y-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The y-coordinate of the lens' upper-right corner [m]."); } if (dimWorld > 2) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftZ, - "The z-coordinate of the lens' lower-left " - "corner [m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightZ, - "The z-coordinate of the lens' upper-right " - "corner [m]."); + Parameters::registerParam + ("The z-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The z-coordinate of the lens' upper-right corner [m]."); } - EWOMS_REGISTER_PARAM(TypeTag, Scalar, Permeability, - "The intrinsic permeability [m^2] of the ambient " - "material."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PermeabilityLens, - "The intrinsic permeability [m^2] of the lens."); + Parameters::registerParam + ("The intrinsic permeability [m^2] of the ambient material."); + Parameters::registerParam + ("The intrinsic permeability [m^2] of the lens."); } /*! diff --git a/examples/problems/lensproblem.hh b/examples/problems/lensproblem.hh index 61f66e696..1a9347fce 100644 --- a/examples/problems/lensproblem.hh +++ b/examples/problems/lensproblem.hh @@ -362,26 +362,20 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftX, - "The x-coordinate of the lens' lower-left corner " - "[m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftY, - "The y-coordinate of the lens' lower-left corner " - "[m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightX, - "The x-coordinate of the lens' upper-right corner " - "[m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightY, - "The y-coordinate of the lens' upper-right corner " - "[m]."); + Parameters::registerParam + ("The x-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The y-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The x-coordinate of the lens' upper-right corner [m]."); + Parameters::registerParam + ("The y-coordinate of the lens' upper-right corner [m]."); if (dimWorld == 3) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensLowerLeftZ, - "The z-coordinate of the lens' lower-left " - "corner [m]."); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LensUpperRightZ, - "The z-coordinate of the lens' upper-right " - "corner [m]."); + Parameters::registerParam + ("The z-coordinate of the lens' lower-left corner [m]."); + Parameters::registerParam + ("The z-coordinate of the lens' upper-right corner [m]."); } } diff --git a/examples/problems/reservoirproblem.hh b/examples/problems/reservoirproblem.hh index bccdd92ae..decc0757d 100644 --- a/examples/problems/reservoirproblem.hh +++ b/examples/problems/reservoirproblem.hh @@ -426,13 +426,13 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, Temperature, - "The temperature [K] in the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MaxDepth, - "The maximum depth [m] of the reservoir"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, WellWidth, - "The width of producer/injector wells as a fraction of the width" - " of the spatial domain"); + Parameters::registerParam + ("The temperature [K] in the reservoir"); + Parameters::registerParam + ("The maximum depth [m] of the reservoir"); + Parameters::registerParam + ("The width of producer/injector wells as a fraction of the width" + " of the spatial domain"); } /*! diff --git a/opm/models/blackoil/blackoilnewtonmethod.hh b/opm/models/blackoil/blackoilnewtonmethod.hh index 0047120b4..452dfd942 100644 --- a/opm/models/blackoil/blackoilnewtonmethod.hh +++ b/opm/models/blackoil/blackoilnewtonmethod.hh @@ -186,18 +186,29 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DpMaxRel, "Maximum relative change of pressure in a single iteration"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DsMax, "Maximum absolute change of any saturation in a single iteration"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PriVarOscilationThreshold, - "The threshold value for the primary variable switching conditions after its meaning has switched to hinder oscilations"); - EWOMS_REGISTER_PARAM(TypeTag,bool, ProjectSaturations, "Option for doing saturation projection"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MaxTemperatureChange, "Maximum absolute change of temperature in a single iteration"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, TemperatureMax, "Maximum absolute temperature"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, TemperatureMin, "Minimum absolute temperature"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PressureMax, "Maximum absolute pressure"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PressureMin, "Minimum absolute pressure"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MaximumWaterSaturation, "Maximum water saturation"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, WaterOnlyThreshold, "Cells with water saturation above or equal is considered one-phase water only"); + Parameters::registerParam + ("Maximum relative change of pressure in a single iteration"); + Parameters::registerParam + ("Maximum absolute change of any saturation in a single iteration"); + Parameters::registerParam + ("The threshold value for the primary variable switching conditions " + "after its meaning has switched to hinder oscilations"); + Parameters::registerParam + ("Option for doing saturation projection"); + Parameters::registerParam + ("Maximum absolute change of temperature in a single iteration"); + Parameters::registerParam + ("Maximum absolute temperature"); + Parameters::registerParam + ("Minimum absolute temperature"); + Parameters::registerParam + ("Maximum absolute pressure"); + Parameters::registerParam + ("Minimum absolute pressure"); + Parameters::registerParam + ("Maximum water saturation"); + Parameters::registerParam + ("Cells with water saturation above or equal is considered one-phase water only"); } /*! diff --git a/opm/models/blackoil/blackoilprimaryvariables.hh b/opm/models/blackoil/blackoilprimaryvariables.hh index acd56d592..e46e2978b 100644 --- a/opm/models/blackoil/blackoilprimaryvariables.hh +++ b/opm/models/blackoil/blackoilprimaryvariables.hh @@ -217,7 +217,8 @@ public: static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, double, PressureScale, "Scaling of pressure primary variable"); + Parameters::registerParam + ("Scaling of pressure primary variable"); } void setPressureScale(Scalar val) diff --git a/opm/models/common/multiphasebaseproblem.hh b/opm/models/common/multiphasebaseproblem.hh index 12d41837d..dd8888d92 100644 --- a/opm/models/common/multiphasebaseproblem.hh +++ b/opm/models/common/multiphasebaseproblem.hh @@ -90,8 +90,8 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableGravity, - "Use the gravity correction for the pressure gradients."); + Parameters::registerParam + ("Use the gravity correction for the pressure gradients."); } /*! diff --git a/opm/models/discretization/common/fvbasediscretization.hh b/opm/models/discretization/common/fvbasediscretization.hh index 6a67aa2c4..da86a1c8a 100644 --- a/opm/models/discretization/common/fvbasediscretization.hh +++ b/opm/models/discretization/common/fvbasediscretization.hh @@ -510,12 +510,18 @@ public: // register runtime parameters of the output modules VtkPrimaryVarsModule::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableGridAdaptation, "Enable adaptive grid refinement/coarsening"); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableVtkOutput, "Global switch for turning on writing VTK files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableThermodynamicHints, "Enable thermodynamic hints"); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableIntensiveQuantityCache, "Turn on caching of intensive quantities"); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableStorageCache, "Store previous storage terms and avoid re-calculating them."); - EWOMS_REGISTER_PARAM(TypeTag, std::string, OutputDir, "The directory to which result files are written"); + Parameters::registerParam + ("Enable adaptive grid refinement/coarsening"); + Parameters::registerParam + ("Global switch for turning on writing VTK files"); + Parameters::registerParam + ("Enable thermodynamic hints"); + Parameters::registerParam + ("Turn on caching of intensive quantities"); + Parameters::registerParam + ("Store previous storage terms and avoid re-calculating them."); + Parameters::registerParam + ("The directory to which result files are written"); } /*! diff --git a/opm/models/discretization/common/fvbasefdlocallinearizer.hh b/opm/models/discretization/common/fvbasefdlocallinearizer.hh index 27082d7e7..8ea54b492 100644 --- a/opm/models/discretization/common/fvbasefdlocallinearizer.hh +++ b/opm/models/discretization/common/fvbasefdlocallinearizer.hh @@ -182,9 +182,9 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, int, NumericDifferenceMethod, - "The method used for numeric differentiation (-1: backward " - "differences, 0: central differences, 1: forward differences)"); + Parameters::registerParam + ("The method used for numeric differentiation (-1: backward " + "differences, 0: central differences, 1: forward differences)"); } /*! diff --git a/opm/models/discretization/common/fvbaseproblem.hh b/opm/models/discretization/common/fvbaseproblem.hh index b93902b09..6d77eb7d5 100644 --- a/opm/models/discretization/common/fvbaseproblem.hh +++ b/opm/models/discretization/common/fvbaseproblem.hh @@ -168,19 +168,19 @@ public: static void registerParameters() { Model::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MaxTimeStepSize, - "The maximum size to which all time steps are limited to [s]"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, MinTimeStepSize, - "The minimum size to which all time steps are limited to [s]"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, MaxTimeStepDivisions, - "The maximum number of divisions by two of the timestep size " - "before the simulation bails out"); - EWOMS_REGISTER_PARAM(TypeTag, bool, EnableAsyncVtkOutput, - "Dispatch a separate thread to write the VTK output"); - EWOMS_REGISTER_PARAM(TypeTag, bool, ContinueOnConvergenceError, - "Continue with a non-converged solution instead of giving up " - "if we encounter a time step size smaller than the minimum time " - "step size."); + Parameters::registerParam + ("The maximum size to which all time steps are limited to [s]"); + Parameters::registerParam + ("The minimum size to which all time steps are limited to [s]"); + Parameters::registerParam + ("The maximum number of divisions by two of the timestep size " + "before the simulation bails out"); + Parameters::registerParam + ("Dispatch a separate thread to write the VTK output"); + Parameters::registerParam + ("Continue with a non-converged solution instead of giving up " + "if we encounter a time step size smaller than the minimum time " + "step size."); } /*! diff --git a/opm/models/discretization/common/tpfalinearizer.hh b/opm/models/discretization/common/tpfalinearizer.hh index 0b6bc460b..d9cb6a53e 100644 --- a/opm/models/discretization/common/tpfalinearizer.hh +++ b/opm/models/discretization/common/tpfalinearizer.hh @@ -134,8 +134,8 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, SeparateSparseSourceTerms, - "Treat well source terms all in one go, instead of on a cell by cell basis."); + Parameters::registerParam + ("Treat well source terms all in one go, instead of on a cell by cell basis."); } /*! diff --git a/opm/models/flash/flashmodel.hh b/opm/models/flash/flashmodel.hh index 7e801cc39..bb6b1e943 100644 --- a/opm/models/flash/flashmodel.hh +++ b/opm/models/flash/flashmodel.hh @@ -234,9 +234,9 @@ public: if (enableEnergy) Opm::VtkEnergyModule::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FlashTolerance, - "The maximum tolerance for the flash solver to " - "consider the solution converged"); + Parameters::registerParam + ("The maximum tolerance for the flash solver to " + "consider the solution converged"); } /*! diff --git a/opm/models/io/cubegridvanguard.hh b/opm/models/io/cubegridvanguard.hh index 67dd9f06e..c29b4c568 100644 --- a/opm/models/io/cubegridvanguard.hh +++ b/opm/models/io/cubegridvanguard.hh @@ -66,24 +66,24 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, unsigned, GridGlobalRefinements, - "The number of global refinements of the grid " - "executed after it was loaded"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeX, - "The size of the domain in x direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsX, - "The number of intervalls in x direction"); + Parameters::registerParam + ("The number of global refinements of the grid " + "executed after it was loaded"); + Parameters::registerParam + ("The size of the domain in x direction"); + Parameters::registerParam + ("The number of intervalls in x direction"); if (dimWorld > 1) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeY, - "The size of the domain in y direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsY, - "The number of intervalls in y direction"); + Parameters::registerParam + ("The size of the domain in y direction"); + Parameters::registerParam + ("The number of intervalls in y direction"); } if (dimWorld > 2) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeZ, - "The size of the domain in z direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsZ, - "The number of intervalls in z direction"); + Parameters::registerParam + ("The size of the domain in z direction"); + Parameters::registerParam + ("The number of intervalls in z direction"); } } diff --git a/opm/models/io/dgfvanguard.hh b/opm/models/io/dgfvanguard.hh index d2f01cda8..fa4052153 100644 --- a/opm/models/io/dgfvanguard.hh +++ b/opm/models/io/dgfvanguard.hh @@ -62,11 +62,11 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, std::string, GridFile, - "The file name of the DGF file to load"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, GridGlobalRefinements, - "The number of global refinements of the grid " - "executed after it was loaded"); + Parameters::registerParam + ("The file name of the DGF file to load"); + Parameters::registerParam + ("The number of global refinements of the grid " + "executed after it was loaded"); } /*! diff --git a/opm/models/io/structuredgridvanguard.hh b/opm/models/io/structuredgridvanguard.hh index 85b76fd28..0758a58dd 100644 --- a/opm/models/io/structuredgridvanguard.hh +++ b/opm/models/io/structuredgridvanguard.hh @@ -106,24 +106,24 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, unsigned, GridGlobalRefinements, - "The number of global refinements of the grid " - "executed after it was loaded"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeX, - "The size of the domain in x direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsX, - "The number of intervalls in x direction"); + Parameters::registerParam + ("The number of global refinements of the grid " + "executed after it was loaded"); + Parameters::registerParam + ("The size of the domain in x direction"); + Parameters::registerParam + ("The number of intervalls in x direction"); if (dim > 1) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeY, - "The size of the domain in y direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsY, - "The number of intervalls in y direction"); + Parameters::registerParam + ("The size of the domain in y direction"); + Parameters::registerParam + ("The number of intervalls in y direction"); } if (dim > 2) { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, DomainSizeZ, - "The size of the domain in z direction"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, CellsZ, - "The number of intervalls in z direction"); + Parameters::registerParam + ("The size of the domain in z direction"); + Parameters::registerParam + ("The number of intervalls in z direction"); } } diff --git a/opm/models/io/vtkblackoilenergymodule.hh b/opm/models/io/vtkblackoilenergymodule.hh index d4edcab9e..ee33bbedf 100644 --- a/opm/models/io/vtkblackoilenergymodule.hh +++ b/opm/models/io/vtkblackoilenergymodule.hh @@ -112,18 +112,16 @@ public: if (!enableEnergy) return; - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteRockInternalEnergy, - "Include the volumetric internal energy of rock " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTotalThermalConductivity, - "Include the total thermal conductivity of the medium and the fluids " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFluidInternalEnergies, - "Include the internal energies of the fluids " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFluidEnthalpies, - "Include the enthalpies of the fluids " - "in the VTK output files"); + Parameters::registerParam + ("Include the volumetric internal energy of rock " + "in the VTK output files"); + Parameters::registerParam + ("Include the total thermal conductivity of the medium and the fluids " + "in the VTK output files"); + Parameters::registerParam + ("Include the internal energies of the fluids in the VTK output files"); + Parameters::registerParam + ("Include the enthalpies of the fluids in the VTK output files"); } /*! diff --git a/opm/models/io/vtkblackoilmicpmodule.hh b/opm/models/io/vtkblackoilmicpmodule.hh index b68f6e2da..ed3782602 100644 --- a/opm/models/io/vtkblackoilmicpmodule.hh +++ b/opm/models/io/vtkblackoilmicpmodule.hh @@ -113,21 +113,19 @@ public: if (!enableMICP) return; - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteMicrobialConcentration, - "Include the concentration of the microbial component in the water phase " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOxygenConcentration, - "Include the concentration of the oxygen component in the water phase " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteUreaConcentration, - "Include the concentration of the urea component in the water phase " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteBiofilmConcentration, - "Include the biofilm volume fraction " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteCalciteConcentration, - "Include the calcite volume fraction " - "in the VTK output files"); + Parameters::registerParam + ("Include the concentration of the microbial component in the water phase " + "in the VTK output files"); + Parameters::registerParam + ("Include the concentration of the oxygen component in the water phase " + "in the VTK output files"); + Parameters::registerParam + ("Include the concentration of the urea component in the water phase " + "in the VTK output files"); + Parameters::registerParam + ("Include the biofilm volume fraction in the VTK output files"); + Parameters::registerParam + ("Include the calcite volume fraction in the VTK output files"); } /*! diff --git a/opm/models/io/vtkblackoilmodule.hh b/opm/models/io/vtkblackoilmodule.hh index 4ace25407..c6df8e16e 100644 --- a/opm/models/io/vtkblackoilmodule.hh +++ b/opm/models/io/vtkblackoilmodule.hh @@ -141,39 +141,38 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteGasDissolutionFactor, - "Include the gas dissolution factor (R_s) of the observed oil " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOilVaporizationFactor, - "Include the oil vaporization factor (R_v) of the observed gas " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOilFormationVolumeFactor, - "Include the oil formation volume factor (B_o) in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteGasFormationVolumeFactor, - "Include the gas formation volume factor (B_g) in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteWaterFormationVolumeFactor, - "Include the water formation volume factor (B_w) in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOilSaturationPressure, - "Include the saturation pressure of oil (p_o,sat) in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteGasSaturationPressure, - "Include the saturation pressure of gas (p_g,sat) in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSaturatedOilGasDissolutionFactor, - "Include the gas dissolution factor (R_s,sat) of gas saturated " - "oil in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSaturatedGasOilVaporizationFactor, - "Include the oil vaporization factor (R_v,sat) of oil saturated " - "gas in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSaturationRatios, - "Write the ratio of the actually and maximum dissolved component of " - "the mixtures"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePrimaryVarsMeaning, - "Include how the primary variables should be interpreted to the " - "VTK output files"); + Parameters::registerParam + ("Include the gas dissolution factor (R_s) of the observed oil " + "in the VTK output files"); + Parameters::registerParam + ("Include the oil vaporization factor (R_v) of the observed gas " + "in the VTK output files"); + Parameters::registerParam + ("Include the oil formation volume factor (B_o) in the VTK output files"); + Parameters::registerParam + ("Include the gas formation volume factor (B_g) in the " + "VTK output files"); + Parameters::registerParam + ("Include the water formation volume factor (B_w) in the " + "VTK output files"); + Parameters::registerParam + ("Include the saturation pressure of oil (p_o,sat) in the " + "VTK output files"); + Parameters::registerParam + ("Include the saturation pressure of gas (p_g,sat) in the " + "VTK output files"); + Parameters::registerParam + ("Include the gas dissolution factor (R_s,sat) of gas saturated " + "oil in the VTK output files"); + Parameters::registerParam + ("Include the oil vaporization factor (R_v,sat) of oil saturated " + "gas in the VTK output files"); + Parameters::registerParam + ("Write the ratio of the actually and maximum dissolved component of " + "the mixtures"); + Parameters::registerParam + ("Include how the primary variables should be interpreted to the " + "VTK output files"); } /*! diff --git a/opm/models/io/vtkblackoilpolymermodule.hh b/opm/models/io/vtkblackoilpolymermodule.hh index 9ed56ee92..c26ed4c2d 100644 --- a/opm/models/io/vtkblackoilpolymermodule.hh +++ b/opm/models/io/vtkblackoilpolymermodule.hh @@ -117,24 +117,24 @@ public: if (!enablePolymer) return; - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePolymerConcentration, - "Include the concentration of the polymer component in the water phase " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePolymerDeadPoreVolume, - "Include the fraction of the \"dead\" pore volume " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePolymerRockDensity, - "Include the amount of already adsorbed polymer component" - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePolymerAdsorption, - "Include the adsorption rate of the polymer component" - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePolymerViscosityCorrection, - "Include the viscosity correction of the polymer component " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteWaterViscosityCorrection, - "Include the viscosity correction of the water component " - "due to polymers in the VTK output files"); + Parameters::registerParam + ("Include the concentration of the polymer component in the water phase " + "in the VTK output files"); + Parameters::registerParam + ("Include the fraction of the \"dead\" pore volume " + "in the VTK output files"); + Parameters::registerParam + ("Include the amount of already adsorbed polymer component" + "in the VTK output files"); + Parameters::registerParam + ("Include the adsorption rate of the polymer component" + "in the VTK output files"); + Parameters::registerParam + ("Include the viscosity correction of the polymer component " + "in the VTK output files"); + Parameters::registerParam + ("Include the viscosity correction of the water component " + "due to polymers in the VTK output files"); } /*! diff --git a/opm/models/io/vtkblackoilsolventmodule.hh b/opm/models/io/vtkblackoilsolventmodule.hh index 3b6daeacb..0e0c45b52 100644 --- a/opm/models/io/vtkblackoilsolventmodule.hh +++ b/opm/models/io/vtkblackoilsolventmodule.hh @@ -113,21 +113,21 @@ public: if (!enableSolvent) return; - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolventSaturation, - "Include the \"saturation\" of the solvent component " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolventRsw, - "Include the \"dissolved volume in water\" of the solvent component " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolventDensity, - "Include the \"density\" of the solvent component " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolventViscosity, - "Include the \"viscosity\" of the solvent component " - "in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolventMobility, - "Include the \"mobility\" of the solvent component " - "in the VTK output files"); + Parameters::registerParam + ("Include the \"saturation\" of the solvent component " + "in the VTK output files"); + Parameters::registerParam + ("Include the \"dissolved volume in water\" of the solvent component " + "in the VTK output files"); + Parameters::registerParam + ("Include the \"density\" of the solvent component " + "in the VTK output files"); + Parameters::registerParam + ("Include the \"viscosity\" of the solvent component " + "in the VTK output files"); + Parameters::registerParam + ("Include the \"mobility\" of the solvent component " + "in the VTK output files"); } /*! diff --git a/opm/models/io/vtkcompositionmodule.hh b/opm/models/io/vtkcompositionmodule.hh index d307b19f7..fbdefe143 100644 --- a/opm/models/io/vtkcompositionmodule.hh +++ b/opm/models/io/vtkcompositionmodule.hh @@ -123,20 +123,20 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteMassFractions, - "Include mass fractions in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteMoleFractions, - "Include mole fractions in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTotalMassFractions, - "Include total mass fractions in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTotalMoleFractions, - "Include total mole fractions in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteMolarities, - "Include component molarities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFugacities, - "Include component fugacities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFugacityCoeffs, - "Include component fugacity coefficients in the VTK output files"); + Parameters::registerParam + ("Include mass fractions in the VTK output files"); + Parameters::registerParam + ("Include mole fractions in the VTK output files"); + Parameters::registerParam + ("Include total mass fractions in the VTK output files"); + Parameters::registerParam + ("Include total mole fractions in the VTK output files"); + Parameters::registerParam + ("Include component molarities in the VTK output files"); + Parameters::registerParam + ("Include component fugacities in the VTK output files"); + Parameters::registerParam + ("Include component fugacity coefficients in the VTK output files"); } /*! diff --git a/opm/models/io/vtkdiffusionmodule.hh b/opm/models/io/vtkdiffusionmodule.hh index 68ef64dfb..a575105bb 100644 --- a/opm/models/io/vtkdiffusionmodule.hh +++ b/opm/models/io/vtkdiffusionmodule.hh @@ -108,16 +108,14 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTortuosities, - "Include the tortuosity for each phase in the VTK " - "output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteDiffusionCoefficients, - "Include the molecular diffusion coefficients in " - "the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, - VtkWriteEffectiveDiffusionCoefficients, - "Include the effective molecular diffusion " - "coefficients the medium in the VTK output files"); + Parameters::registerParam + ("Include the tortuosity for each phase in the VTK output files"); + Parameters::registerParam + ("Include the molecular diffusion coefficients in " + "the VTK output files"); + Parameters::registerParam + ("Include the effective molecular diffusion " + "coefficients the medium in the VTK output files"); } /*! diff --git a/opm/models/io/vtkdiscretefracturemodule.hh b/opm/models/io/vtkdiscretefracturemodule.hh index 7496d33e0..c4647dba8 100644 --- a/opm/models/io/vtkdiscretefracturemodule.hh +++ b/opm/models/io/vtkdiscretefracturemodule.hh @@ -133,23 +133,22 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureSaturations, - "Include the phase saturations in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureMobilities, - "Include the phase mobilities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureRelativePermeabilities, - "Include the phase relative permeabilities in the " - "VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFracturePorosity, - "Include the porosity in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureIntrinsicPermeabilities, - "Include the intrinsic permeability in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureFilterVelocities, - "Include in the filter velocities of the phases " - "the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFractureVolumeFraction, - "Add the fraction of the total volume which is " - "occupied by fractures in the VTK output"); + Parameters::registerParam + ("Include the phase saturations in the VTK output files"); + Parameters::registerParam + ("Include the phase mobilities in the VTK output files"); + Parameters::registerParam + ("Include the phase relative permeabilities in the " + "VTK output files"); + Parameters::registerParam + ("Include the porosity in the VTK output files"); + Parameters::registerParam + ("Include the intrinsic permeability in the VTK output files"); + Parameters::registerParam + ("Include in the filter velocities of the phases in the VTK output files"); + Parameters::registerParam + ("Add the fraction of the total volume which is " + "occupied by fractures in the VTK output"); } /*! diff --git a/opm/models/io/vtkenergymodule.hh b/opm/models/io/vtkenergymodule.hh index c285560ed..2847e506c 100644 --- a/opm/models/io/vtkenergymodule.hh +++ b/opm/models/io/vtkenergymodule.hh @@ -111,18 +111,18 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSolidInternalEnergy, - "Include the volumetric internal energy of solid" - "matrix in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteThermalConductivity, - "Include the total thermal conductivity of the" - "medium in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteEnthalpies, - "Include the specific enthalpy of the phases in " - "the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteInternalEnergies, - "Include the specific internal energy of the " - "phases in the VTK output files"); + Parameters::registerParam + ("Include the volumetric internal energy of solid" + "matrix in the VTK output files"); + Parameters::registerParam + ("Include the total thermal conductivity of the" + "medium in the VTK output files"); + Parameters::registerParam + ("Include the specific enthalpy of the phases in " + "the VTK output files"); + Parameters::registerParam + ("Include the specific internal energy of the " + "phases in the VTK output files"); } /*! diff --git a/opm/models/io/vtkmultiphasemodule.hh b/opm/models/io/vtkmultiphasemodule.hh index 13664f10a..b6cd86aa1 100644 --- a/opm/models/io/vtkmultiphasemodule.hh +++ b/opm/models/io/vtkmultiphasemodule.hh @@ -162,30 +162,30 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteExtrusionFactor, - "Include the extrusion factor of the degrees of freedom into the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePressures, - "Include the phase pressures in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteDensities, - "Include the phase densities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteSaturations, - "Include the phase saturations in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteMobilities, - "Include the phase mobilities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteRelativePermeabilities, - "Include the phase relative permeabilities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteViscosities, - "Include component phase viscosities in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteAverageMolarMasses, - "Include the average phase mass in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePorosity, - "Include the porosity in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteIntrinsicPermeabilities, - "Include the intrinsic permeability in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteFilterVelocities, - "Include in the filter velocities of the phases the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePotentialGradients, - "Include the phase pressure potential gradients in the VTK output files"); + Parameters::registerParam + ("Include the extrusion factor of the degrees of freedom into the VTK output files"); + Parameters::registerParam + ("Include the phase pressures in the VTK output files"); + Parameters::registerParam + ("Include the phase densities in the VTK output files"); + Parameters::registerParam + ("Include the phase saturations in the VTK output files"); + Parameters::registerParam + ("Include the phase mobilities in the VTK output files"); + Parameters::registerParam + ("Include the phase relative permeabilities in the VTK output files"); + Parameters::registerParam + ("Include component phase viscosities in the VTK output files"); + Parameters::registerParam + ("Include the average phase mass in the VTK output files"); + Parameters::registerParam + ("Include the porosity in the VTK output files"); + Parameters::registerParam + ("Include the intrinsic permeability in the VTK output files"); + Parameters::registerParam + ("Include in the filter velocities of the phases the VTK output files"); + Parameters::registerParam + ("Include the phase pressure potential gradients in the VTK output files"); } /*! diff --git a/opm/models/io/vtkphasepresencemodule.hh b/opm/models/io/vtkphasepresencemodule.hh index b07f28829..069a871df 100644 --- a/opm/models/io/vtkphasepresencemodule.hh +++ b/opm/models/io/vtkphasepresencemodule.hh @@ -83,9 +83,9 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePhasePresence, - "Include the phase presence pseudo primary " - "variable in the VTK output files"); + Parameters::registerParam + ("Include the phase presence pseudo primary " + "variable in the VTK output files"); } /*! diff --git a/opm/models/io/vtkprimaryvarsmodule.hh b/opm/models/io/vtkprimaryvarsmodule.hh index e01e6e69d..2a4f90ffc 100644 --- a/opm/models/io/vtkprimaryvarsmodule.hh +++ b/opm/models/io/vtkprimaryvarsmodule.hh @@ -93,12 +93,12 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWritePrimaryVars, - "Include the primary variables into the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteProcessRank, - "Include the MPI process rank into the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteDofIndex, - "Include the index of the degrees of freedom into the VTK output files"); + Parameters::registerParam + ("Include the primary variables into the VTK output files"); + Parameters::registerParam + ("Include the MPI process rank into the VTK output files"); + Parameters::registerParam + ("Include the index of the degrees of freedom into the VTK output files"); } /*! diff --git a/opm/models/io/vtkptflashmodule.hh b/opm/models/io/vtkptflashmodule.hh index 6cdd6032b..b2e14685e 100644 --- a/opm/models/io/vtkptflashmodule.hh +++ b/opm/models/io/vtkptflashmodule.hh @@ -99,10 +99,10 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteLiquidMoleFractions, - "Include liquid mole fractions (L) in the VTK output files"); - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteEquilibriumConstants, - "Include equilibrium constants (K) in the VTK output files"); + Parameters::registerParam + ("Include liquid mole fractions (L) in the VTK output files"); + Parameters::registerParam + ("Include equilibrium constants (K) in the VTK output files"); } /*! diff --git a/opm/models/io/vtktemperaturemodule.hh b/opm/models/io/vtktemperaturemodule.hh index c9c075f2f..df5c9ac0d 100644 --- a/opm/models/io/vtktemperaturemodule.hh +++ b/opm/models/io/vtktemperaturemodule.hh @@ -88,8 +88,8 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTemperature, - "Include the temperature in the VTK output files"); + Parameters::registerParam + ("Include the temperature in the VTK output files"); } /*! diff --git a/opm/models/nonlinear/newtonmethod.hh b/opm/models/nonlinear/newtonmethod.hh index df85b45e9..f8acfed08 100644 --- a/opm/models/nonlinear/newtonmethod.hh +++ b/opm/models/nonlinear/newtonmethod.hh @@ -151,25 +151,22 @@ public: { LinearSolverBackend::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, bool, NewtonVerbose, - "Specify whether the Newton method should inform " - "the user about its progress or not"); - EWOMS_REGISTER_PARAM(TypeTag, bool, NewtonWriteConvergence, - "Write the convergence behaviour of the Newton " - "method to a VTK file"); - EWOMS_REGISTER_PARAM(TypeTag, int, NewtonTargetIterations, - "The 'optimum' number of Newton iterations per " - "time step"); - EWOMS_REGISTER_PARAM(TypeTag, int, NewtonMaxIterations, - "The maximum number of Newton iterations per time " - "step"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, NewtonTolerance, - "The maximum raw error tolerated by the Newton" - "method for considering a solution to be " - "converged"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, NewtonMaxError, - "The maximum error tolerated by the Newton " - "method to which does not cause an abort"); + Parameters::registerParam + ("Specify whether the Newton method should inform " + "the user about its progress or not"); + Parameters::registerParam + ("Write the convergence behaviour of the Newton " + "method to a VTK file"); + Parameters::registerParam + ("The 'optimum' number of Newton iterations per time step"); + Parameters::registerParam + ("The maximum number of Newton iterations per time step"); + Parameters::registerParam + ("The maximum raw error tolerated by the Newton" + "method for considering a solution to be converged"); + Parameters::registerParam + ("The maximum error tolerated by the Newton " + "method to which does not cause an abort"); } /*! diff --git a/opm/models/parallel/threadmanager.hh b/opm/models/parallel/threadmanager.hh index 1e3b57bfc..7aee46b41 100644 --- a/opm/models/parallel/threadmanager.hh +++ b/opm/models/parallel/threadmanager.hh @@ -31,6 +31,7 @@ #include #endif +#include #include #include @@ -59,9 +60,9 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, int, ThreadsPerProcess, - "The maximum number of threads to be instantiated per process " - "('-1' means 'automatic')"); + Parameters::registerParam + ("The maximum number of threads to be instantiated per process " + "('-1' means 'automatic')"); } /*! diff --git a/opm/models/ptflash/flashmodel.hh b/opm/models/ptflash/flashmodel.hh index 21bc92372..67a7ea01b 100644 --- a/opm/models/ptflash/flashmodel.hh +++ b/opm/models/ptflash/flashmodel.hh @@ -233,14 +233,14 @@ public: if (enableEnergy) Opm::VtkEnergyModule::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, FlashTolerance, - "The maximum tolerance for the flash solver to " - "consider the solution converged"); - EWOMS_REGISTER_PARAM(TypeTag, int, FlashVerbosity, - "Flash solver verbosity level"); - EWOMS_REGISTER_PARAM(TypeTag, std::string, FlashTwoPhaseMethod, - "Method for solving vapor-liquid composition. Available options include:" - "ssi, newton, ssi+newton"); + Parameters::registerParam + ("The maximum tolerance for the flash solver to " + "consider the solution converged"); + Parameters::registerParam + ("Flash solver verbosity level"); + Parameters::registerParam + ("Method for solving vapor-liquid composition. Available options include: " + "ssi, newton, ssi+newton"); } /*! diff --git a/opm/models/pvs/pvsmodel.hh b/opm/models/pvs/pvsmodel.hh index 87d24a8e5..09108d3f2 100644 --- a/opm/models/pvs/pvsmodel.hh +++ b/opm/models/pvs/pvsmodel.hh @@ -296,9 +296,9 @@ public: if (enableEnergy) Opm::VtkEnergyModule::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, int, PvsVerbosity, - "The verbosity level of the primary variable " - "switching model"); + Parameters::registerParam + ("The verbosity level of the primary variable " + "switching model"); } /*! diff --git a/opm/models/utils/parametersystem.hh b/opm/models/utils/parametersystem.hh index 24d752aa4..f74ad7888 100644 --- a/opm/models/utils/parametersystem.hh +++ b/opm/models/utils/parametersystem.hh @@ -55,26 +55,6 @@ #include #include -/*! - * \ingroup Parameter - * - * \brief Register a run-time parameter. - * - * In OPM, parameters can only be used after they have been - * registered. - * - * Example: - * - * \code - * // Registers a run-time parameter "UpwindWeight" which has type - * // "Scalar" and the description "Relative weight of the upwind node." - * EWOMS_REGISTER_PARAM(TypeTag, Scalar, UpwindWeight, - * "Relative weight of the upwind node."); - * \endcode - */ -#define EWOMS_REGISTER_PARAM(TypeTag, ParamType, ParamName, Description) \ - ::Opm::Parameters::registerParam(Description) - /*! * \ingroup Parameter * @@ -1103,6 +1083,22 @@ bool isSet(const char* paramName, bool errorIfNotRegistered = true) errorIfNotRegistered); } +/*! + * \ingroup Parameter + * + * \brief Register a run-time parameter. + * + * In OPM, parameters can only be used after they have been + * registered. + * + * Example: + * + * \code + * // Registers a run-time parameter "UpwindWeight" + * and the description "Relative weight of the upwind node." + * registerParam("Relative weight of the upwind node."); + * \endcode + */ template class Param> void registerParam(const char* usageString) { diff --git a/opm/models/utils/simulator.hh b/opm/models/utils/simulator.hh index b43afa24e..76e9e6b6a 100644 --- a/opm/models/utils/simulator.hh +++ b/opm/models/utils/simulator.hh @@ -254,15 +254,15 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, EndTime, - "The simulation time at which the simulation is finished [s]"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, InitialTimeStepSize, - "The size of the initial time step [s]"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, RestartTime, - "The simulation time at which a restart should be attempted [s]"); - EWOMS_REGISTER_PARAM(TypeTag, std::string, PredeterminedTimeStepsFile, - "A file with a list of predetermined time step sizes (one " - "time step per line)"); + Parameters::registerParam + ("The simulation time at which the simulation is finished [s]"); + Parameters::registerParam + ("The size of the initial time step [s]"); + Parameters::registerParam + ("The simulation time at which a restart should be attempted [s]"); + Parameters::registerParam + ("A file with a list of predetermined time step sizes (one " + "time step per line)"); Vanguard::registerParameters(); Model::registerParameters(); diff --git a/opm/models/utils/start.hh b/opm/models/utils/start.hh index 78c98fbe7..223b13f93 100644 --- a/opm/models/utils/start.hh +++ b/opm/models/utils/start.hh @@ -78,15 +78,14 @@ static inline void registerAllParameters_(bool finalizeRegistration = true) using Simulator = GetPropType; using ThreadManager = GetPropType; - EWOMS_REGISTER_PARAM(TypeTag, std::string, ParameterFile, - "An .ini file which contains a set of run-time " - "parameters"); - EWOMS_REGISTER_PARAM(TypeTag, int, PrintProperties, - "Print the values of the compile time properties at " - "the start of the simulation"); - EWOMS_REGISTER_PARAM(TypeTag, int, PrintParameters, - "Print the values of the run-time parameters at the " - "start of the simulation"); + Parameters::registerParam + ("An .ini file which contains a set of run-time parameters"); + Parameters::registerParam + ("Print the values of the compile time properties at " + "the start of the simulation"); + Parameters::registerParam + ("Print the values of the run-time parameters at the " + "start of the simulation"); Simulator::registerParameters(); ThreadManager::registerParameters(); diff --git a/opm/simulators/linalg/istlpreconditionerwrappers.hh b/opm/simulators/linalg/istlpreconditionerwrappers.hh index de88b3dac..f2775763c 100644 --- a/opm/simulators/linalg/istlpreconditionerwrappers.hh +++ b/opm/simulators/linalg/istlpreconditionerwrappers.hh @@ -72,11 +72,10 @@ namespace Linear { \ static void registerParameters() \ { \ - EWOMS_REGISTER_PARAM(TypeTag, int, PreconditionerOrder, \ - "The order of the preconditioner"); \ - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation, \ - "The relaxation factor of the " \ - "preconditioner"); \ + Parameters::registerParam \ + ("The order of the preconditioner"); \ + Parameters::registerParam \ + ("The relaxation factor of the preconditioner"); \ } \ \ void prepare(IstlMatrix& matrix) \ @@ -116,9 +115,8 @@ namespace Linear { \ static void registerParameters() \ { \ - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation, \ - "The relaxation factor of the " \ - "preconditioner"); \ + Parameters::registerParam \ + ("The relaxation factor of the preconditioner"); \ } \ \ void prepare(OverlappingMatrix& matrix) \ @@ -164,8 +162,8 @@ public: static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, PreconditionerRelaxation, - "The relaxation factor of the preconditioner"); + Parameters::registerParam + ("The relaxation factor of the preconditioner"); } void prepare(OverlappingMatrix& matrix) diff --git a/opm/simulators/linalg/istlsolverwrappers.hh b/opm/simulators/linalg/istlsolverwrappers.hh index 0a9a1ec3c..2562cbc77 100644 --- a/opm/simulators/linalg/istlsolverwrappers.hh +++ b/opm/simulators/linalg/istlsolverwrappers.hh @@ -124,8 +124,8 @@ public: static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, int, GMResRestart, - "Number of iterations after which the GMRES linear solver is restarted"); + Parameters::registerParam + ("Number of iterations after which the GMRES linear solver is restarted"); } template diff --git a/opm/simulators/linalg/parallelamgbackend.hh b/opm/simulators/linalg/parallelamgbackend.hh index 22178de6a..0ac98b8e1 100644 --- a/opm/simulators/linalg/parallelamgbackend.hh +++ b/opm/simulators/linalg/parallelamgbackend.hh @@ -150,12 +150,12 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverMaxError, - "The maximum residual error which the linear solver tolerates" - " without giving up"); - EWOMS_REGISTER_PARAM(TypeTag, int, AmgCoarsenTarget, - "The coarsening target for the agglomerations of " - "the AMG preconditioner"); + Parameters::registerParam + ("The maximum residual error which the linear solver tolerates " + "without giving up"); + Parameters::registerParam + ("The coarsening target for the agglomerations of " + "the AMG preconditioner"); } protected: diff --git a/opm/simulators/linalg/parallelbasebackend.hh b/opm/simulators/linalg/parallelbasebackend.hh index 3319a3a18..bde303a01 100644 --- a/opm/simulators/linalg/parallelbasebackend.hh +++ b/opm/simulators/linalg/parallelbasebackend.hh @@ -152,16 +152,16 @@ public: */ static void registerParameters() { - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverTolerance, - "The maximum allowed error between of the linear solver"); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverAbsTolerance, - "The maximum accepted error of the norm of the residual"); - EWOMS_REGISTER_PARAM(TypeTag, unsigned, LinearSolverOverlapSize, - "The size of the algebraic overlap for the linear solver"); - EWOMS_REGISTER_PARAM(TypeTag, int, LinearSolverMaxIterations, - "The maximum number of iterations of the linear solver"); - EWOMS_REGISTER_PARAM(TypeTag, int, LinearSolverVerbosity, - "The verbosity level of the linear solver"); + Parameters::registerParam + ("The maximum allowed error between of the linear solver"); + Parameters::registerParam + ("The maximum accepted error of the norm of the residual"); + Parameters::registerParam + ("The size of the algebraic overlap for the linear solver"); + Parameters::registerParam + ("The maximum number of iterations of the linear solver"); + Parameters::registerParam + ("The verbosity level of the linear solver"); PreconditionerWrapper::registerParameters(); } diff --git a/opm/simulators/linalg/parallelbicgstabbackend.hh b/opm/simulators/linalg/parallelbicgstabbackend.hh index 0ea3885a4..82f5239cb 100644 --- a/opm/simulators/linalg/parallelbicgstabbackend.hh +++ b/opm/simulators/linalg/parallelbicgstabbackend.hh @@ -121,9 +121,9 @@ public: { ParentType::registerParameters(); - EWOMS_REGISTER_PARAM(TypeTag, Scalar, LinearSolverMaxError, - "The maximum residual error which the linear solver tolerates" - " without giving up"); + Parameters::registerParam + ("The maximum residual error which the linear solver tolerates" + " without giving up"); } protected: