From 70908d90178fe60740c76fac3d52566af9410b50 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 21 Aug 2020 13:42:08 +0200 Subject: [PATCH] changed: remove BEGIN_PROPERTIES/END_PROPERTIES macro usage --- ebos/ebos.hh | 4 +-- ebos/ebos_altidx.cc | 5 +-- ebos/ebos_brine.cc | 4 +-- ebos/ebos_foam.cc | 4 +-- ebos/ebos_gasoil.cc | 4 +-- ebos/ebos_oilwater.cc | 4 +-- ebos/ebos_oilwaterpolymer.cc | 4 +-- ebos/ebos_plain.cc | 4 +-- ebos/ebos_polymer.cc | 4 +-- ebos/ebos_solvent.cc | 4 +-- ebos/ebos_thermal.cc | 4 +-- ebos/eclalugridvanguard.hh | 4 +-- ebos/eclbasevanguard.hh | 4 +-- ebos/eclcpgridvanguard.hh | 4 +-- ebos/eclnewtonmethod.hh | 4 +-- ebos/ecloutputblackoilmodule.hh | 4 +-- ebos/eclpolyhedralgridvanguard.hh | 4 +-- ebos/eclproblem.hh | 5 ++- ebos/ecltracermodel.hh | 4 +-- ebos/eclwriter.hh | 4 +-- ebos/vtkecltracermodule.hh | 5 +-- flow/flow_blackoil_dunecpr.cpp | 32 +++++++++---------- flow/flow_onephase.cpp | 6 ++-- flow/flow_onephase_energy.cpp | 5 +-- opm/simulators/flow/BlackoilModelEbos.hpp | 6 ++-- .../flow/BlackoilModelParametersEbos.hpp | 4 +-- opm/simulators/flow/FlowMainEbos.hpp | 4 +-- opm/simulators/flow/Main.hpp | 4 +-- opm/simulators/flow/NonlinearSolverEbos.hpp | 4 +-- .../SimulatorFullyImplicitBlackoilEbos.hpp | 4 +-- .../linalg/FlowLinearSolverParameters.hpp | 6 ++-- opm/simulators/linalg/ISTLSolverEbos.hpp | 4 +-- .../linalg/ISTLSolverEbosFlexible.hpp | 4 +-- .../timestepping/AdaptiveTimeSteppingEbos.hpp | 5 ++- opm/simulators/wells/BlackoilWellModel.hpp | 4 +-- 35 files changed, 88 insertions(+), 91 deletions(-) diff --git a/ebos/ebos.hh b/ebos/ebos.hh index 0e714492c..de03f57b8 100644 --- a/ebos/ebos.hh +++ b/ebos/ebos.hh @@ -41,7 +41,7 @@ template class EbosProblem; } -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem, FlowModelParameters)); @@ -109,7 +109,7 @@ SET_INT_PROP(EbosTypeTag, ThreadsPerProcess, 2); // smallest time step size is reached. SET_BOOL_PROP(EbosTypeTag, ContinueOnConvergenceError, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { template diff --git a/ebos/ebos_altidx.cc b/ebos/ebos_altidx.cc index f77ef2763..54aa92001 100644 --- a/ebos/ebos_altidx.cc +++ b/ebos/ebos_altidx.cc @@ -50,7 +50,8 @@ public: }; } -BEGIN_PROPERTIES + +namespace Opm::Properties { NEW_TYPE_TAG(EbosAltIdxTypeTag, INHERITS_FROM(EbosTypeTag)); @@ -63,7 +64,7 @@ public: typedef Opm::BlackOilFluidSystem type; }; -END_PROPERTIES +} // namespace Opm::Properties int main(int argc, char **argv) { diff --git a/ebos/ebos_brine.cc b/ebos/ebos_brine.cc index ef3780c2e..2a6177726 100644 --- a/ebos/ebos_brine.cc +++ b/ebos/ebos_brine.cc @@ -30,14 +30,14 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosBrineTypeTag, INHERITS_FROM(EbosTypeTag)); // enable the brine extension of the black oil model SET_BOOL_PROP(EbosBrineTypeTag, EnableBrine, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_foam.cc b/ebos/ebos_foam.cc index 6f534f317..c19192113 100644 --- a/ebos/ebos_foam.cc +++ b/ebos/ebos_foam.cc @@ -30,14 +30,14 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosFoamTypeTag, INHERITS_FROM(EbosTypeTag)); // enable the foam extension of the black oil model SET_BOOL_PROP(EbosFoamTypeTag, EnableFoam, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_gasoil.cc b/ebos/ebos_gasoil.cc index 9897e1b36..9e5423e76 100644 --- a/ebos/ebos_gasoil.cc +++ b/ebos/ebos_gasoil.cc @@ -30,7 +30,7 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosGasOilTypeTag, INHERITS_FROM(EbosTypeTag)); @@ -53,7 +53,7 @@ public: /*disabledCompIdx=*/FluidSystem::waterCompIdx> type; }; -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_oilwater.cc b/ebos/ebos_oilwater.cc index 4acf6359a..18df22cb2 100644 --- a/ebos/ebos_oilwater.cc +++ b/ebos/ebos_oilwater.cc @@ -30,7 +30,7 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosOilWaterTypeTag, INHERITS_FROM(EbosTypeTag)); @@ -53,7 +53,7 @@ public: /*disabledCompIdx=*/FluidSystem::gasCompIdx> type; }; -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_oilwaterpolymer.cc b/ebos/ebos_oilwaterpolymer.cc index 5fdcdf235..2e71e5ae2 100644 --- a/ebos/ebos_oilwaterpolymer.cc +++ b/ebos/ebos_oilwaterpolymer.cc @@ -29,7 +29,7 @@ #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosOilWaterPolymerTypeTag, INHERITS_FROM(EbosTypeTag)); @@ -55,7 +55,7 @@ public: /*disabledCompIdx=*/FluidSystem::gasCompIdx> type; }; -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_plain.cc b/ebos/ebos_plain.cc index 0b58c49d7..ab16342d8 100644 --- a/ebos/ebos_plain.cc +++ b/ebos/ebos_plain.cc @@ -31,11 +31,11 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosPlainTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem)); -END_PROPERTIES +} // namespace Opm::Properties int main(int argc, char **argv) { diff --git a/ebos/ebos_polymer.cc b/ebos/ebos_polymer.cc index 3786e3999..e447c704b 100644 --- a/ebos/ebos_polymer.cc +++ b/ebos/ebos_polymer.cc @@ -30,14 +30,14 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosPolymerTypeTag, INHERITS_FROM(EbosTypeTag)); // enable the polymer extension of the black oil model SET_BOOL_PROP(EbosPolymerTypeTag, EnablePolymer, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_solvent.cc b/ebos/ebos_solvent.cc index 89ec59d66..77557a036 100644 --- a/ebos/ebos_solvent.cc +++ b/ebos/ebos_solvent.cc @@ -30,14 +30,14 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosSolventTypeTag, INHERITS_FROM(EbosTypeTag)); // enable the solvent extension of the black oil model SET_BOOL_PROP(EbosSolventTypeTag, EnableSolvent, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ebos_thermal.cc b/ebos/ebos_thermal.cc index 8f7f0411b..f936a9dd7 100644 --- a/ebos/ebos_thermal.cc +++ b/ebos/ebos_thermal.cc @@ -30,14 +30,14 @@ #include "ebos.hh" #include "startEbos.hh" -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EbosThermalTypeTag, INHERITS_FROM(EbosTypeTag)); // enable the energy extension of the black oil model SET_BOOL_PROP(EbosThermalTypeTag, EnableEnergy, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclalugridvanguard.hh b/ebos/eclalugridvanguard.hh index 6ea8b101b..d28b63ca4 100644 --- a/ebos/eclalugridvanguard.hh +++ b/ebos/eclalugridvanguard.hh @@ -40,7 +40,7 @@ class EclAluGridVanguard; } // namespace Opm -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EclAluGridVanguard, INHERITS_FROM(EclBaseVanguard)); @@ -49,7 +49,7 @@ SET_TYPE_PROP(EclAluGridVanguard, Vanguard, Opm::EclAluGridVanguard); SET_TYPE_PROP(EclAluGridVanguard, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>); SET_TYPE_PROP(EclAluGridVanguard, EquilGrid, Dune::CpGrid); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclbasevanguard.hh b/ebos/eclbasevanguard.hh index ff14a72b5..8351cf81b 100644 --- a/ebos/eclbasevanguard.hh +++ b/ebos/eclbasevanguard.hh @@ -64,7 +64,7 @@ template class EclBaseVanguard; } -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EclBaseVanguard); @@ -88,7 +88,7 @@ SET_BOOL_PROP(EclBaseVanguard, SchedRestart, false); SET_INT_PROP(EclBaseVanguard, EdgeWeightsMethod, 1); SET_BOOL_PROP(EclBaseVanguard, OwnerCellsFirst, true); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclcpgridvanguard.hh b/ebos/eclcpgridvanguard.hh index 627fcda80..26d163b3f 100644 --- a/ebos/eclcpgridvanguard.hh +++ b/ebos/eclcpgridvanguard.hh @@ -47,7 +47,7 @@ template class EclCpGridVanguard; } -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EclCpGridVanguard, INHERITS_FROM(EclBaseVanguard)); @@ -56,7 +56,7 @@ SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Opm::EclCpGridVanguard); SET_TYPE_PROP(EclCpGridVanguard, Grid, Dune::CpGrid); SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid)); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclnewtonmethod.hh b/ebos/eclnewtonmethod.hh index eccff96a8..66c98ef1b 100644 --- a/ebos/eclnewtonmethod.hh +++ b/ebos/eclnewtonmethod.hh @@ -35,7 +35,7 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EclNewtonSumTolerance); NEW_PROP_TAG(EclNewtonStrictIterations); @@ -43,7 +43,7 @@ NEW_PROP_TAG(EclNewtonRelaxedVolumeFraction); NEW_PROP_TAG(EclNewtonSumToleranceExponent); NEW_PROP_TAG(EclNewtonRelaxedTolerance); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index aee1bd1a5..851ec98f4 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -44,7 +44,7 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { // create new type tag for the Ecl-output NEW_TYPE_TAG(EclOutputBlackOil); @@ -53,7 +53,7 @@ NEW_PROP_TAG(ForceDisableFluidInPlaceOutput); SET_BOOL_PROP(EclOutputBlackOil, ForceDisableFluidInPlaceOutput, false); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclpolyhedralgridvanguard.hh b/ebos/eclpolyhedralgridvanguard.hh index 8a187637a..8c373ddea 100644 --- a/ebos/eclpolyhedralgridvanguard.hh +++ b/ebos/eclpolyhedralgridvanguard.hh @@ -37,7 +37,7 @@ template class EclPolyhedralGridVanguard; } -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EclPolyhedralGridVanguard, INHERITS_FROM(EclBaseVanguard)); @@ -46,7 +46,7 @@ SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Opm::EclPolyhedralGridVanguar SET_TYPE_PROP(EclPolyhedralGridVanguard, Grid, Dune::PolyhedralGrid<3, 3>); SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid)); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh index f1b6663e8..ae4241c0e 100644 --- a/ebos/eclproblem.hh +++ b/ebos/eclproblem.hh @@ -115,7 +115,7 @@ template class EclProblem; } -BEGIN_PROPERTIES +namespace Opm::Properties { #if EBOS_USE_ALUGRID NEW_TYPE_TAG(EclBaseProblem, INHERITS_FROM(EclAluGridVanguard, EclOutputBlackOil, VtkEclTracer)); @@ -374,10 +374,9 @@ SET_BOOL_PROP(EclBaseProblem, EclEnableTuning, false); SET_STRING_PROP(EclBaseProblem, OutputMode, "all"); +} // namespace Opm::Properties -END_PROPERTIES - namespace Opm { /*! diff --git a/ebos/ecltracermodel.hh b/ebos/ecltracermodel.hh index 3ef383048..f066e5bd4 100644 --- a/ebos/ecltracermodel.hh +++ b/ebos/ecltracermodel.hh @@ -42,11 +42,11 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EnableTracerModel); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh index e35320918..1e6ce7ecb 100644 --- a/ebos/eclwriter.hh +++ b/ebos/eclwriter.hh @@ -66,13 +66,13 @@ #include #endif -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EnableEclOutput); NEW_PROP_TAG(EnableAsyncEclOutput); NEW_PROP_TAG(EclOutputDoublePrecision); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/ebos/vtkecltracermodule.hh b/ebos/vtkecltracermodule.hh index ba6878610..81a51ee34 100644 --- a/ebos/vtkecltracermodule.hh +++ b/ebos/vtkecltracermodule.hh @@ -40,7 +40,7 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { // create new type tag for the VTK tracer output NEW_TYPE_TAG(VtkEclTracer); @@ -50,7 +50,8 @@ NEW_PROP_TAG(VtkWriteEclTracerConcentration); // set default values for what quantities to output SET_BOOL_PROP(VtkEclTracer, VtkWriteEclTracerConcentration, false); -END_PROPERTIES + +} // namespace Opm::Properties namespace Opm { /*! diff --git a/flow/flow_blackoil_dunecpr.cpp b/flow/flow_blackoil_dunecpr.cpp index 6cae954f2..7940a3aeb 100644 --- a/flow/flow_blackoil_dunecpr.cpp +++ b/flow/flow_blackoil_dunecpr.cpp @@ -23,26 +23,24 @@ #include #include -BEGIN_PROPERTIES -NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem)); - -SET_BOOL_PROP(EclFlowProblemSimple, MatrixAddWellContributions, true); -SET_INT_PROP(EclFlowProblemSimple, LinearSolverVerbosity,0); -SET_SCALAR_PROP(EclFlowProblemSimple, LinearSolverReduction, 1e-2); -SET_INT_PROP(EclFlowProblemSimple, LinearSolverMaxIter, 100); -SET_BOOL_PROP(EclFlowProblemSimple, UseAmg, true);//probably not used -SET_BOOL_PROP(EclFlowProblemSimple, UseCpr, true); -SET_INT_PROP(EclFlowProblemSimple, CprMaxEllIter, 1); -SET_INT_PROP(EclFlowProblemSimple, CprEllSolvetype, 3); -SET_INT_PROP(EclFlowProblemSimple, CprReuseSetup, 3); -SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0); -SET_STRING_PROP(EclFlowProblemSimple, LinearSolverConfiguration, "ilu0"); -SET_STRING_PROP(EclFlowProblemSimple, SystemStrategy, "quasiimpes"); -END_PROPERTIES - namespace Opm { namespace Properties { + NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem)); + + SET_BOOL_PROP(EclFlowProblemSimple, MatrixAddWellContributions, true); + SET_INT_PROP(EclFlowProblemSimple, LinearSolverVerbosity,0); + SET_SCALAR_PROP(EclFlowProblemSimple, LinearSolverReduction, 1e-2); + SET_INT_PROP(EclFlowProblemSimple, LinearSolverMaxIter, 100); + SET_BOOL_PROP(EclFlowProblemSimple, UseAmg, true);//probably not used + SET_BOOL_PROP(EclFlowProblemSimple, UseCpr, true); + SET_INT_PROP(EclFlowProblemSimple, CprMaxEllIter, 1); + SET_INT_PROP(EclFlowProblemSimple, CprEllSolvetype, 3); + SET_INT_PROP(EclFlowProblemSimple, CprReuseSetup, 3); + SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0); + SET_STRING_PROP(EclFlowProblemSimple, LinearSolverConfiguration, "ilu0"); + SET_STRING_PROP(EclFlowProblemSimple, SystemStrategy, "quasiimpes"); + SET_PROP(EclFlowProblemSimple, FluidSystem) { private: diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase.cpp index 2cad940da..dd92d613a 100644 --- a/flow/flow_onephase.cpp +++ b/flow/flow_onephase.cpp @@ -23,7 +23,8 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { + NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem)); //! The indices required by the model SET_PROP(EclFlowProblemSimple, Indices) @@ -45,7 +46,8 @@ public: /*enebledCompIdx=*/FluidSystem::waterCompIdx> type; }; -END_PROPERTIES + +} // namespace Opm::Properties int main(int argc, char** argv) { diff --git a/flow/flow_onephase_energy.cpp b/flow/flow_onephase_energy.cpp index 0c5ec5346..772fd4cd7 100644 --- a/flow/flow_onephase_energy.cpp +++ b/flow/flow_onephase_energy.cpp @@ -22,8 +22,8 @@ #include #include +namespace Opm::Properties { -BEGIN_PROPERTIES NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem)); SET_BOOL_PROP(EclFlowProblemSimple, EnableEnergy, true); //! The indices required by the model @@ -46,7 +46,8 @@ public: /*enebledCompIdx=*/FluidSystem::waterCompIdx> type; }; -END_PROPERTIES + +} // namespace Opm::Properties int main(int argc, char** argv) { diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index c6f506321..f58751ee1 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -69,8 +69,7 @@ #include #include - -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem, FlowNonLinearSolver, FlowModelParameters, FlowTimeSteppingParameters)); SET_STRING_PROP(EclFlowProblem, OutputDir, ""); @@ -93,8 +92,7 @@ SET_BOOL_PROP(EclFlowProblem, EnableBrine, false); SET_TYPE_PROP(EclFlowProblem, EclWellModel, Opm::BlackoilWellModel); SET_TAG_PROP(EclFlowProblem, LinearSolverSplice, FlowIstlSolver); - -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { /// A model implementation for three-phase black oil. diff --git a/opm/simulators/flow/BlackoilModelParametersEbos.hpp b/opm/simulators/flow/BlackoilModelParametersEbos.hpp index 0e7bc8c51..c006de576 100644 --- a/opm/simulators/flow/BlackoilModelParametersEbos.hpp +++ b/opm/simulators/flow/BlackoilModelParametersEbos.hpp @@ -25,7 +25,7 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowModelParameters); @@ -93,7 +93,7 @@ SET_SCALAR_PROP(FlowModelParameters, RelaxedPressureTolInnerIterMsw, 0.5e5); SET_INT_PROP(FlowModelParameters, ThreadsPerProcess, -1); #endif -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index 3598ff6c0..b2d713873 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -48,7 +48,7 @@ #include #endif -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EnableDryRun); NEW_PROP_TAG(OutputInterval); @@ -60,7 +60,7 @@ SET_STRING_PROP(EclFlowProblem, EnableDryRun, "auto"); SET_BOOL_PROP(EclFlowProblem, EnableLoggingFalloutWarning, false); SET_INT_PROP(EclFlowProblem, OutputInterval, 1); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index 4e22b79b7..a295df93e 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -68,13 +68,13 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { // this is a dummy type tag that is used to setup the parameters before the actual // simulator. NEW_TYPE_TAG(FlowEarlyBird, INHERITS_FROM(EclFlowProblem)); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { template diff --git a/opm/simulators/flow/NonlinearSolverEbos.hpp b/opm/simulators/flow/NonlinearSolverEbos.hpp index 7214e492f..d4fc5736f 100644 --- a/opm/simulators/flow/NonlinearSolverEbos.hpp +++ b/opm/simulators/flow/NonlinearSolverEbos.hpp @@ -34,7 +34,7 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowNonLinearSolver); @@ -48,7 +48,7 @@ SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMaxIterations, 20); SET_INT_PROP(FlowNonLinearSolver, FlowNewtonMinIterations, 1); SET_STRING_PROP(FlowNonLinearSolver, NewtonRelaxationType, "dampen"); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp index ed60b1639..e306f5bf0 100644 --- a/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp +++ b/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp @@ -34,7 +34,7 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EnableAdaptiveTimeStepping); NEW_PROP_TAG(EnableTuning); @@ -43,7 +43,7 @@ SET_BOOL_PROP(EclFlowProblem, EnableTerminalOutput, true); SET_BOOL_PROP(EclFlowProblem, EnableAdaptiveTimeStepping, true); SET_BOOL_PROP(EclFlowProblem, EnableTuning, false); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/linalg/FlowLinearSolverParameters.hpp b/opm/simulators/linalg/FlowLinearSolverParameters.hpp index eed47e70c..05c334010 100644 --- a/opm/simulators/linalg/FlowLinearSolverParameters.hpp +++ b/opm/simulators/linalg/FlowLinearSolverParameters.hpp @@ -39,7 +39,7 @@ class ISTLSolverEbos; } -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowIstlSolverParams); @@ -100,9 +100,7 @@ SET_STRING_PROP(FlowIstlSolverParams, GpuMode, "none"); SET_INT_PROP(FlowIstlSolverParams, BdaDeviceId, 0); SET_INT_PROP(FlowIstlSolverParams, OpenclPlatformId, 0); - - -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/linalg/ISTLSolverEbos.hpp b/opm/simulators/linalg/ISTLSolverEbos.hpp index 5ab7cf9bf..8c4231629 100644 --- a/opm/simulators/linalg/ISTLSolverEbos.hpp +++ b/opm/simulators/linalg/ISTLSolverEbos.hpp @@ -54,7 +54,7 @@ #include #endif -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowIstlSolver, INHERITS_FROM(FlowIstlSolverParams)); @@ -74,7 +74,7 @@ public: typedef typename Opm::Linear::IstlSparseMatrixAdapter type; }; -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { diff --git a/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp b/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp index 6361db03d..c30748edf 100644 --- a/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp +++ b/opm/simulators/linalg/ISTLSolverEbosFlexible.hpp @@ -33,11 +33,11 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowIstlSolverFlexible, INHERITS_FROM(FlowIstlSolverParams)); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm diff --git a/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp b/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp index c03b4fe62..4e9e5b9ce 100644 --- a/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp +++ b/opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp @@ -17,7 +17,7 @@ #include #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_TYPE_TAG(FlowTimeSteppingParameters); @@ -61,8 +61,7 @@ SET_SCALAR_PROP(FlowTimeSteppingParameters, TimeStepControlGrowthRate, 1.25); SET_STRING_PROP(FlowTimeSteppingParameters, TimeStepControlFileName, "timesteps"); SET_SCALAR_PROP(FlowTimeSteppingParameters, MinTimeStepBeforeShuttingProblematicWellsInDays, 0.001); - -END_PROPERTIES +} // namespace Opm::Properties namespace Opm { // AdaptiveTimeStepping diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp index 0af4bd0d6..38cb97647 100644 --- a/opm/simulators/wells/BlackoilWellModel.hpp +++ b/opm/simulators/wells/BlackoilWellModel.hpp @@ -61,11 +61,11 @@ #include -BEGIN_PROPERTIES +namespace Opm::Properties { NEW_PROP_TAG(EnableTerminalOutput); -END_PROPERTIES +} // namespace Opm::Properties namespace Opm {