changed: remove BEGIN_PROPERTIES/END_PROPERTIES macro usage

ebos/ebos.hh

@@ -41,7 +41,7 @@ template <class TypeTag>
 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 <class TypeTag>

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<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type;
 };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

ebos/ebos_plain.cc

@@ -31,11 +31,11 @@
 
 #include <opm/models/utils/start.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(EbosPlainTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

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 {
 

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 {
 

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 {
 

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<TypeTag>);
 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 {
 

ebos/eclbasevanguard.hh

@@ -64,7 +64,7 @@ template <class TypeTag>
 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 {
 

ebos/eclcpgridvanguard.hh

@@ -47,7 +47,7 @@ template <class TypeTag>
 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<TypeTag>);
 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 {
 

ebos/eclnewtonmethod.hh

@@ -35,7 +35,7 @@
 
 #include <opm/material/common/Unused.hpp>
 
-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 {
 

ebos/ecloutputblackoilmodule.hh

@@ -44,7 +44,7 @@
 
 #include <type_traits>
 
-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 {
 

ebos/eclpolyhedralgridvanguard.hh

@@ -37,7 +37,7 @@ template <class TypeTag>
 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 {
 

ebos/eclproblem.hh

@@ -115,7 +115,7 @@ template <class TypeTag>
 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 {
 
 /*!

ebos/ecltracermodel.hh

@@ -42,11 +42,11 @@
 #include <vector>
 #include <iostream>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_PROP_TAG(EnableTracerModel);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

ebos/eclwriter.hh

@@ -66,13 +66,13 @@
 #include <mpi.h>
 #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 {
 

ebos/vtkecltracermodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-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 {
     /*!

flow/flow_blackoil_dunecpr.cpp

@@ -23,26 +23,24 @@
 #include <opm/simulators/flow/Main.hpp>
 #include  <opm/simulators/linalg/ISTLSolverEbosFlexible.hpp>
 
-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:

flow/flow_onephase.cpp

@@ -23,7 +23,8 @@
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 
 
-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)
 {

flow/flow_onephase_energy.cpp

@@ -22,8 +22,8 @@
 #include <opm/simulators/flow/Main.hpp>
 #include <opm/models/blackoil/blackoilonephaseindices.hh>
 
+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)
 {

opm/simulators/flow/BlackoilModelEbos.hpp

@@ -69,8 +69,7 @@
 #include <vector>
 #include <algorithm>
 
-
+namespace Opm::Properties {
-BEGIN_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<TypeTag>);
 SET_TAG_PROP(EclFlowProblem, LinearSolverSplice, FlowIstlSolver);
 
-
+} // namespace Opm::Properties
-END_PROPERTIES
 
 namespace Opm {
     /// A model implementation for three-phase black oil.

opm/simulators/flow/BlackoilModelParametersEbos.hpp

@@ -25,7 +25,7 @@
 
 #include <string>
 
-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
 {

opm/simulators/flow/FlowMainEbos.hpp

@@ -48,7 +48,7 @@
 #include <dune/common/parallel/mpihelper.hh>
 #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
 {

opm/simulators/flow/Main.hpp

@@ -68,13 +68,13 @@
 #include <string>
 #include <type_traits>
 
-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 <class TypeTag>

opm/simulators/flow/NonlinearSolverEbos.hpp

@@ -34,7 +34,7 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <memory>
 
-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 {
 

opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -34,7 +34,7 @@
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/ErrorMacros.hpp>
 
-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 {
 

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);
 
-
+} // namespace Opm::Properties
-
-END_PROPERTIES
 
 namespace Opm
 {

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -54,7 +54,7 @@
 #include <opm/simulators/linalg/bda/BdaBridge.hpp>
 #endif
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(FlowIstlSolver, INHERITS_FROM(FlowIstlSolverParams));
 
@@ -74,7 +74,7 @@ public:
     typedef typename Opm::Linear::IstlSparseMatrixAdapter<Block> type;
 };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm
 {

opm/simulators/linalg/ISTLSolverEbosFlexible.hpp

@@ -33,11 +33,11 @@
 #include <memory>
 #include <utility>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(FlowIstlSolverFlexible, INHERITS_FROM(FlowIstlSolverParams));
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 
 namespace Opm

opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp

@@ -17,7 +17,7 @@
 #include <opm/simulators/timestepping/TimeStepControl.hpp>
 #include <opm/core/props/phaseUsageFromDeck.hpp>
 
-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);
 
-
+} // namespace Opm::Properties
-END_PROPERTIES
 
 namespace Opm {
     // AdaptiveTimeStepping

opm/simulators/wells/BlackoilWellModel.hpp

@@ -61,11 +61,11 @@
 
 #include <opm/simulators/utils/DeferredLogger.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_PROP_TAG(EnableTerminalOutput);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {