[properties] replace BEGIN/END_PROPERTIES macro calls

examples/co2injection_flash_ecfv.cpp

@@ -38,7 +38,7 @@
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -69,7 +69,7 @@ SET_TAG_PROP(Co2InjectionFlashEcfvProblem, LinearSolverSplice, ParallelBiCGStabL
 SET_SCALAR_PROP(Co2InjectionFlashEcfvProblem, NewtonTolerance, 1e-5);
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_flash_ni_ecfv.cpp

@@ -35,7 +35,7 @@
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -69,7 +69,7 @@ SET_TAG_PROP(Co2InjectionFlashNiEcfvProblem, LinearSolverSplice, ParallelBiCGSta
 SET_SCALAR_PROP(Co2InjectionFlashNiEcfvProblem, NewtonTolerance, 1e-5);
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_flash_ni_vcfv.cpp

@@ -35,7 +35,7 @@
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -66,7 +66,7 @@ SET_TAG_PROP(Co2InjectionFlashNiVcfvProblem, LinearSolverSplice, ParallelBiCGSta
 SET_SCALAR_PROP(Co2InjectionFlashNiVcfvProblem, NewtonTolerance, 1e-5);
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_flash_vcfv.cpp

@@ -38,7 +38,7 @@
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -66,7 +66,7 @@ SET_TAG_PROP(Co2InjectionFlashVcfvProblem, LinearSolverSplice, ParallelBiCGStabL
 SET_SCALAR_PROP(Co2InjectionFlashVcfvProblem, NewtonTolerance, 1e-5);
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_immiscible_ecfv.cpp

@@ -34,7 +34,7 @@
 
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(Co2InjectionImmiscibleEcfvProblem,
              INHERITS_FROM(ImmiscibleModel,
@@ -42,7 +42,7 @@ NEW_TYPE_TAG(Co2InjectionImmiscibleEcfvProblem,
 SET_TAG_PROP(Co2InjectionImmiscibleEcfvProblem, SpatialDiscretizationSplice,
              EcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 ////////////////////////
 // the main function

examples/co2injection_immiscible_ni_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(Co2InjectionImmiscibleNiEcfvProblem, INHERITS_FROM(ImmiscibleModel,
                                                                 Co2InjectionBaseProblem));
@@ -46,7 +46,7 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionImmiscibleNiEcfvProblem> { static
 //! Use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(Co2InjectionImmiscibleNiEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 ////////////////////////
 // the main function

examples/co2injection_immiscible_ni_vcfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(Co2InjectionImmiscibleNiVcfvProblem, INHERITS_FROM(ImmiscibleModel,
                                                                 Co2InjectionBaseProblem));
@@ -42,7 +42,7 @@ SET_TAG_PROP(Co2InjectionImmiscibleNiVcfvProblem, SpatialDiscretizationSplice, V
 template<class TypeTag>
 struct EnableEnergy<TypeTag, TTag::Co2InjectionImmiscibleNiVcfvProblem> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 ////////////////////////
 // the main function

examples/co2injection_immiscible_vcfv.cpp

@@ -34,13 +34,13 @@
 
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(Co2InjectionImmiscibleVcfvProblem, INHERITS_FROM(ImmiscibleModel,
                                                               Co2InjectionBaseProblem));
 SET_TAG_PROP(Co2InjectionImmiscibleVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 ////////////////////////
 // the main function

examples/co2injection_ncp_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -41,7 +41,7 @@ struct Co2InjectionNcpEcfvProblem { using InheritsFrom = std::tuple<Co2Injection
 } // end namespace TTag
 SET_TAG_PROP(Co2InjectionNcpEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_ncp_ni_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -46,7 +46,7 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionNcpNiEcfvProblem> { static conste
 //! Use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(Co2InjectionNcpNiEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_ncp_ni_vcfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -43,7 +43,7 @@ SET_TAG_PROP(Co2InjectionNcpNiVcfvProblem, SpatialDiscretizationSplice, VcfvDisc
 template<class TypeTag>
 struct EnableEnergy<TypeTag, TTag::Co2InjectionNcpNiVcfvProblem> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_ncp_vcfv.cpp

@@ -34,7 +34,7 @@
 
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -42,7 +42,7 @@ struct Co2InjectionNcpVcfvProblem { using InheritsFrom = std::tuple<Co2Injection
 } // end namespace TTag
 SET_TAG_PROP(Co2InjectionNcpVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_pvs_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -41,7 +41,7 @@ struct Co2InjectionPvsEcfvProblem { using InheritsFrom = std::tuple<Co2Injection
 } // end namespace TTag
 SET_TAG_PROP(Co2InjectionPvsEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_pvs_ni_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -47,7 +47,7 @@ struct EnableEnergy<TypeTag, TTag::Co2InjectionPvsNiEcfvProblem> { static conste
 //! Use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(Co2InjectionPvsNiEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_pvs_ni_vcfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -44,7 +44,7 @@ SET_TAG_PROP(Co2InjectionPvsNiVcfvProblem, SpatialDiscretizationSplice, VcfvDisc
 template<class TypeTag>
 struct EnableEnergy<TypeTag, TTag::Co2InjectionPvsNiVcfvProblem> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/co2injection_pvs_vcfv.cpp

@@ -34,7 +34,7 @@
 
 #include "problems/co2injectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -42,7 +42,7 @@ struct Co2InjectionPvsVcfvProblem { using InheritsFrom = std::tuple<Co2Injection
 } // end namespace TTag
 SET_TAG_PROP(Co2InjectionPvsVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/cuvette_pvs.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/cuvetteproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct CuvetteProblem { using InheritsFrom = std::tuple<CuvetteBaseProblem, PvsModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/diffusion_flash.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/flash/flashmodel.hh>
 #include "problems/diffusionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem, FlashModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/diffusion_ncp.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/ncp/ncpmodel.hh>
 #include "problems/diffusionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem, NcpModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/diffusion_pvs.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/diffusionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct DiffusionProblem { using InheritsFrom = std::tuple<DiffusionBaseProblem, PvsModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/finger_immiscible_ecfv.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/fingerproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -40,7 +40,7 @@ struct FingerProblemEcfv { using InheritsFrom = std::tuple<FingerBaseProblem, Im
 } // end namespace TTag
 SET_TAG_PROP(FingerProblemEcfv, SpatialDiscretizationSplice, EcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/finger_immiscible_vcfv.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/fingerproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -40,7 +40,7 @@ struct FingerProblemVcfv { using InheritsFrom = std::tuple<FingerBaseProblem, Im
 } // end namespace TTag
 SET_TAG_PROP(FingerProblemVcfv, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/groundwater_immiscible.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/groundwaterproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct GroundWaterProblem { using InheritsFrom = std::tuple<GroundWaterBaseProblem, ImmiscibleSinglePhaseModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/infiltration_pvs.cpp

@@ -31,14 +31,14 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/infiltrationproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct InfiltrationProblem { using InheritsFrom = std::tuple<InfiltrationBaseProblem, PvsModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/lens_immiscible_ecfv_ad.hh

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/lensproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -50,6 +50,6 @@ SET_TAG_PROP(LensProblemEcfvAd, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 template<class TypeTag>
 struct LinearSolverScalar<TypeTag, TTag::LensProblemEcfvAd> { using type = float; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif // EWOMS_LENS_IMMISCIBLE_ECFV_AD_HH

examples/lens_immiscible_ecfv_ad_23.cpp

@@ -33,7 +33,7 @@
 #include <dune/grid/geometrygrid.hh>
 #include <dune/grid/io/file/dgfparser/dgfgeogrid.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Use Dune-grid's GeometryGrid< YaspGrid >
 template<class TypeTag>
@@ -81,7 +81,7 @@ public:
                                                 MyYaspGrid::dimensionworld+1> >  type;
 };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #include <opm/models/utils/start.hh>
 

examples/lens_immiscible_vcfv_ad.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/lensproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -48,7 +48,7 @@ template<class TypeTag>
 struct UseP1FiniteElementGradients<TypeTag, TTag::LensProblemVcfvAd> { static constexpr bool value = true; };
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/lens_immiscible_vcfv_fd.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/lensproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -48,7 +48,7 @@ template<class TypeTag>
 struct UseP1FiniteElementGradients<TypeTag, TTag::LensProblemVcfvFd> { static constexpr bool value = true; };
 #endif
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/lens_richards_ecfv.cpp

@@ -32,7 +32,7 @@
 
 #include "problems/richardslensproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -43,7 +43,7 @@ SET_TAG_PROP(RichardsLensEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretiz
 //! Use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(RichardsLensEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/lens_richards_vcfv.cpp

@@ -32,7 +32,7 @@
 
 #include "problems/richardslensproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -40,7 +40,7 @@ struct RichardsLensVcfvProblem { using InheritsFrom = std::tuple<RichardsLensPro
 } // end namespace TTag
 SET_TAG_PROP(RichardsLensVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/obstacle_immiscible.cpp

@@ -32,14 +32,14 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/obstacleproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct ObstacleProblem { using InheritsFrom = std::tuple<ObstacleBaseProblem, ImmiscibleModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/obstacle_ncp.cpp

@@ -32,14 +32,14 @@
 
 #include "problems/obstacleproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
 struct ObstacleProblem { using InheritsFrom = std::tuple<ObstacleBaseProblem, NcpModel>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/obstacle_pvs.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/obstacleproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -44,7 +44,7 @@ struct ObstacleProblem { using InheritsFrom = std::tuple<ObstacleBaseProblem, Pv
 template<class TypeTag>
 struct PvsVerbosity<TypeTag, TTag::ObstacleProblem> { static constexpr int value = 1; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/outflow_pvs.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/outflowproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -42,7 +42,7 @@ struct OutflowProblem { using InheritsFrom = std::tuple<OutflowBaseProblem, PvsM
 template<class TypeTag>
 struct PvsVerbosity<TypeTag, TTag::OutflowProblem> { static constexpr int value = 1; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/powerinjection_darcy_ad.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/powerinjectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(PowerInjectionDarcyAdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
@@ -41,7 +41,7 @@ template<class TypeTag>
 struct FluxModule<TypeTag, TTag::PowerInjectionDarcyAdProblem> { using type = Opm::DarcyFluxModule<TypeTag>; };
 SET_TAG_PROP(PowerInjectionDarcyAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/powerinjection_darcy_fd.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/powerinjectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(PowerInjectionDarcyFdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
@@ -41,7 +41,7 @@ template<class TypeTag>
 struct FluxModule<TypeTag, TTag::PowerInjectionDarcyFdProblem> { using type = Opm::DarcyFluxModule<TypeTag>; };
 SET_TAG_PROP(PowerInjectionDarcyFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/powerinjection_forchheimer_ad.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/powerinjectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(PowerInjectionForchheimerAdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
@@ -41,7 +41,7 @@ template<class TypeTag>
 struct FluxModule<TypeTag, TTag::PowerInjectionForchheimerAdProblem> { using type = Opm::ForchheimerFluxModule<TypeTag>; };
 SET_TAG_PROP(PowerInjectionForchheimerAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/powerinjection_forchheimer_fd.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/immiscible/immisciblemodel.hh>
 #include "problems/powerinjectionproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(PowerInjectionForchheimerFdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
@@ -41,7 +41,7 @@ template<class TypeTag>
 struct FluxModule<TypeTag, TTag::PowerInjectionForchheimerFdProblem> { using type = Opm::ForchheimerFluxModule<TypeTag>; };
 SET_TAG_PROP(PowerInjectionForchheimerFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/problems/co2injectionproblem.hh

@@ -68,7 +68,7 @@ namespace Co2Injection {
 //! \endcond
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(Co2InjectionBaseProblem);
 
@@ -188,7 +188,7 @@ SET_SCALAR_PROP(Co2InjectionBaseProblem, InitialTimeStepSize, 250);
 // The default DGF file to load
 SET_STRING_PROP(Co2InjectionBaseProblem, GridFile, "data/co2injection.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/cuvetteproblem.hh

@@ -56,7 +56,7 @@ template <class TypeTag>
 class CuvetteProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 
 // create a new type tag for the cuvette steam injection problem
@@ -126,7 +126,7 @@ SET_SCALAR_PROP(CuvetteBaseProblem, InitialTimeStepSize, 1);
 // The default DGF file to load
 SET_STRING_PROP(CuvetteBaseProblem, GridFile, "./data/cuvette_11x4.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/diffusionproblem.hh

@@ -52,7 +52,7 @@ template <class TypeTag>
 class DiffusionProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(DiffusionBaseProblem);
 
@@ -125,7 +125,7 @@ SET_SCALAR_PROP(DiffusionBaseProblem, EndTime, 1e6);
 // The default for the initial time step size of the simulation
 SET_SCALAR_PROP(DiffusionBaseProblem, InitialTimeStepSize, 1000);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/fingerproblem.hh

@@ -62,7 +62,7 @@ class FingerProblem;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -160,7 +160,7 @@ SET_SCALAR_PROP(FingerBaseProblem, EndTime, 215);
 // The default for the initial time step size of the simulation
 SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

examples/problems/fractureproblem.hh

@@ -65,7 +65,7 @@ template <class TypeTag>
 class FractureProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create a type tag for the problem
 // Create new type tags
@@ -170,7 +170,7 @@ SET_SCALAR_PROP(FractureProblem, EndTime, 3e3);
 // Set the default value for the initial time step size
 SET_SCALAR_PROP(FractureProblem, InitialTimeStepSize, 100);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/groundwaterproblem.hh

@@ -51,7 +51,7 @@ template <class TypeTag>
 class GroundWaterProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 namespace TTag {
 struct GroundWaterBaseProblem {};
@@ -120,7 +120,7 @@ SET_TAG_PROP(GroundWaterBaseProblem, LinearSolverSplice, ParallelIstlLinearSolve
 SET_TYPE_PROP(GroundWaterBaseProblem, LinearSolverWrapper,
               Opm::Linear::SolverWrapperConjugatedGradients<TypeTag>);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/infiltrationproblem.hh

@@ -52,7 +52,7 @@ template <class TypeTag>
 class InfiltrationProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(InfiltrationBaseProblem);
 
@@ -109,7 +109,7 @@ SET_SCALAR_PROP(InfiltrationBaseProblem, InitialTimeStepSize, 60);
 SET_STRING_PROP(InfiltrationBaseProblem, GridFile,
                 "./data/infiltration_50x3.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/lensproblem.hh

@@ -56,7 +56,7 @@ template <class TypeTag>
 class LensProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -179,7 +179,7 @@ struct EnableStorageCache<TypeTag, TTag::LensBaseProblem> { static constexpr boo
 template<class TypeTag>
 struct EnableIntensiveQuantityCache<TypeTag, TTag::LensBaseProblem> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

examples/problems/obstacleproblem.hh

@@ -57,7 +57,7 @@ template <class TypeTag>
 class ObstacleProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(ObstacleBaseProblem);
 
@@ -122,7 +122,7 @@ SET_SCALAR_PROP(ObstacleBaseProblem, InitialTimeStepSize, 250);
 // The default DGF file to load
 SET_STRING_PROP(ObstacleBaseProblem, GridFile, "./data/obstacle_24x16.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/outflowproblem.hh

@@ -45,7 +45,7 @@ template <class TypeTag>
 class OutflowProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(OutflowBaseProblem);
 
@@ -86,7 +86,7 @@ SET_SCALAR_PROP(OutflowBaseProblem, InitialTimeStepSize, 1);
 // The default DGF file to load
 SET_STRING_PROP(OutflowBaseProblem, GridFile, "./data/outflow.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/powerinjectionproblem.hh

@@ -57,7 +57,7 @@ template <class TypeTag>
 class PowerInjectionProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(PowerInjectionBaseProblem);
 
@@ -145,7 +145,7 @@ SET_SCALAR_PROP(PowerInjectionBaseProblem, EndTime, 100);
 // The default for the initial time step size of the simulation
 SET_SCALAR_PROP(PowerInjectionBaseProblem, InitialTimeStepSize, 1e-3);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/problems/reservoirproblem.hh

@@ -56,7 +56,7 @@ class ReservoirProblem;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 
 NEW_TYPE_TAG(ReservoirBaseProblem);
@@ -149,7 +149,7 @@ SET_STRING_PROP(ReservoirBaseProblem, GridFile, "data/reservoir.dgf");
 // increase the tolerance for this problem to get larger time steps
 SET_SCALAR_PROP(ReservoirBaseProblem, NewtonTolerance, 1e-6);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

examples/problems/richardslensproblem.hh

@@ -51,7 +51,7 @@ class RichardsLensProblem;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -130,7 +130,7 @@ SET_SCALAR_PROP(RichardsLensProblem, InitialTimeStepSize, 100);
 // The default DGF file to load
 SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf");
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

examples/problems/waterairproblem.hh

@@ -58,7 +58,7 @@ template <class TypeTag>
 class WaterAirProblem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(WaterAirBaseProblem);
 
@@ -148,7 +148,7 @@ SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper,
 template<class TypeTag>
 struct PreconditionerOrder<TypeTag, TTag::WaterAirBaseProblem> { static constexpr int value = 2; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

examples/reservoir_blackoil_ecfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -46,7 +46,7 @@ SET_TAG_PROP(ReservoirBlackOilEcfvProblem, SpatialDiscretizationSplice, EcfvDisc
 // Use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(ReservoirBlackOilEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/reservoir_blackoil_vcfv.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -42,7 +42,7 @@ struct ReservoirBlackOilVcfvProblem { using InheritsFrom = std::tuple<ReservoirB
 // Select the vertex centered finite volume method as spatial discretization
 SET_TAG_PROP(ReservoirBlackOilVcfvProblem, SpatialDiscretizationSplice, VcfvDiscretization);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/reservoir_ncp_ecfv.cpp

@@ -32,7 +32,7 @@
 #include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -45,7 +45,7 @@ SET_TAG_PROP(ReservoirNcpEcfvProblem, SpatialDiscretizationSplice, EcfvDiscretiz
 //! use automatic differentiation to linearize the system of PDEs
 SET_TAG_PROP(ReservoirNcpEcfvProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/reservoir_ncp_vcfv.cpp

@@ -33,7 +33,7 @@
 #include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -53,7 +53,7 @@ struct EnableStorageCache<TypeTag, TTag::ReservoirNcpVcfvProblem> { static const
 SET_SCALAR_PROP(ReservoirNcpVcfvProblem, BaseEpsilon, 1e-11);
 
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

examples/tutorial1problem.hh

@@ -57,7 +57,7 @@ template <class TypeTag>
 class Tutorial1Problem;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create a new type tag for the problem
 // Create new type tags
@@ -137,7 +137,7 @@ struct CellsY<TypeTag, TTag::Tutorial1Problem> { static constexpr int value = 1;
 template<class TypeTag>
 struct CellsZ<TypeTag, TTag::Tutorial1Problem> { static constexpr int value = 1; }; /*@\label{tutorial1:default-params-end}@*/
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 //! Tutorial problem using the "immiscible" model.

examples/waterair_pvs_ni.cpp

@@ -31,7 +31,7 @@
 #include <opm/models/pvs/pvsmodel.hh>
 #include "problems/waterairproblem.hh"
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -41,7 +41,7 @@ struct WaterAirProblem { using InheritsFrom = std::tuple<WaterAirBaseProblem, Pv
 template<class TypeTag>
 struct EnableEnergy<TypeTag, TTag::WaterAirProblem> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 int main(int argc, char **argv)
 {

opm/models/blackoil/blackoilmodel.hh

@@ -66,7 +66,7 @@ template <class TypeTag>
 class EclVanguard;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type tag for the black-oil problems
 NEW_TYPE_TAG(BlackOilModel, INHERITS_FROM(MultiPhaseBaseModel,
@@ -179,7 +179,7 @@ public:
 template<class TypeTag>
 struct BlackoilConserveSurfaceVolume<TypeTag, TTag::BlackOilModel> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/blackoil/blackoilnewtonmethod.hh

@@ -35,7 +35,7 @@
 
 #include <opm/material/common/Unused.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template <class TypeTag, class MyTypeTag>
 struct DiscNewtonMethod;
@@ -55,7 +55,7 @@ SET_SCALAR_PROP(NewtonMethod, PriVarOscilationThreshold, 1e-5);
 template<class TypeTag>
 struct ProjectSaturations<TypeTag, TTag::NewtonMethod> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/blackoil/blackoilproperties.hh

@@ -31,7 +31,7 @@
 
 #include <opm/models/common/multiphasebaseproperties.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! Specifies if the simulation should write output files that are
 //! compatible with those produced by the commercial Eclipse simulator
@@ -73,6 +73,6 @@ template<class TypeTag, class MyTypeTag>
 struct BlackOilEnergyScalingFactor { using type = UndefinedProperty; };
 
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/common/multiphasebasemodel.hh

@@ -50,7 +50,7 @@ template <class TypeTag>
 class MultiPhaseBaseModel;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The generic type tag for problems using the immiscible multi-phase model
 // Create new type tags
@@ -135,7 +135,7 @@ template<class TypeTag>
 struct EnableGravity<TypeTag, TTag::MultiPhaseBaseModel> { static constexpr bool value = false; };
 
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/common/multiphasebaseproperties.hh

@@ -32,7 +32,7 @@
 
 #include <opm/models/utils/basicproperties.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The splice to be used for the spatial discretization
 template<class TypeTag, class MyTypeTag>
@@ -81,6 +81,6 @@ struct EnableGravity { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct EnableDiffusion { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/discretefracture/discretefracturemodel.hh

@@ -49,7 +49,7 @@ template <class TypeTag>
 class DiscreteFractureModel;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The generic type tag for problems using the immiscible multi-phase model
 // Create new type tags
@@ -98,7 +98,7 @@ struct UseTwoPointGradients<TypeTag, TTag::DiscreteFractureModel> { static const
 template<class TypeTag>
 struct EnableIntensiveQuantityCache<TypeTag, TTag::DiscreteFractureModel> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretefracture/discretefractureproperties.hh

@@ -34,11 +34,11 @@
 
 #include <opm/models/io/vtkdiscretefracturemodule.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template<class TypeTag, class MyTypeTag>
 struct UseTwoPointGradients { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/discretization/common/baseauxiliarymodule.hh

@@ -34,11 +34,11 @@
 #include <set>
 #include <vector>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(AuxModule);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbaseadlocallinearizer.hh

@@ -46,7 +46,7 @@ template<class TypeTag>
 class FvBaseAdLocalLinearizer;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // declare the property tags required for the finite differences local linearizer
 NEW_TYPE_TAG(AutoDiffLocalLinearizer);
@@ -69,7 +69,7 @@ public:
     typedef Opm::DenseAd::Evaluation<Scalar, numEq> type;
 };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbasediscretization.hh

@@ -86,7 +86,7 @@ class FvBaseDiscretization;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! Set the default type for the time manager
 template<class TypeTag>
@@ -293,7 +293,7 @@ struct UseVolumetricResidual<TypeTag, TTag::FvBaseDiscretization> { static const
 template<class TypeTag>
 struct EnableExperiments<TypeTag, TTag::FvBaseDiscretization> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbasefdlocallinearizer.hh

@@ -50,7 +50,7 @@ class FvBaseFdLocalLinearizer;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // declare the property tags required for the finite differences local linearizer
 NEW_TYPE_TAG(FiniteDifferenceLocalLinearizer);
@@ -82,7 +82,7 @@ SET_SCALAR_PROP(FiniteDifferenceLocalLinearizer,
                 BaseEpsilon,
                 std::max<Scalar>(0.9123e-10, std::numeric_limits<Scalar>::epsilon()*1.23e3));
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbasenewtonconvergencewriter.hh

@@ -34,7 +34,7 @@
 #include <iostream>
 
 //! \cond SKIP_THIS
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // forward declaration of the required property tags
 template<class TypeTag, class MyTypeTag>
@@ -46,7 +46,7 @@ struct NewtonMethod;
 template<class TypeTag, class MyTypeTag>
 struct VtkOutputFormat;
 
-END_PROPERTIES
+} // namespace Opm::Properties
 //! \endcond
 
 namespace Opm {

opm/models/discretization/common/fvbasenewtonmethod.hh

@@ -42,7 +42,7 @@ template <class TypeTag>
 class FvBaseNewtonConvergenceWriter;
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! create a type tag for the Newton method of the finite-volume discretization
 // Create new type tags
@@ -62,7 +62,7 @@ SET_TYPE_PROP(FvBaseNewtonMethod, NewtonMethod,
 SET_TYPE_PROP(FvBaseNewtonMethod, NewtonConvergenceWriter,
               Opm::FvBaseNewtonConvergenceWriter<TypeTag>);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbaseproblem.hh

@@ -45,12 +45,12 @@
 
 #include <sys/stat.h>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template <class TypeTag, class MyTypeTag>
 struct NewtonMethod;
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/common/fvbaseproperties.hh

@@ -34,7 +34,7 @@
 #include <opm/models/io/dgfvanguard.hh>
 #include <opm/simulators/linalg/parallelbicgstabbackend.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 namespace TTag {
 struct FvBaseNewtonMethod;
@@ -350,6 +350,6 @@ struct EnableExperiments { using type = UndefinedProperty; };
 template<class TypeTag>
 struct Vanguard<TypeTag, TTag::NumericModel> { using type = Opm::DgfVanguard<TypeTag>; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/discretization/ecfv/ecfvdiscretization.hh

@@ -48,7 +48,7 @@ template <class TypeTag>
 class EcfvDiscretization;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! Set the stencil
 template<class TypeTag>
@@ -119,7 +119,7 @@ struct LinearizeNonLocalElements<TypeTag, TTag::EcfvDiscretization> { static con
 template<class TypeTag>
 struct UseLinearizationLock<TypeTag, TTag::EcfvDiscretization> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/discretization/ecfv/ecfvproperties.hh

@@ -33,7 +33,7 @@
 
 #include <opm/models/utils/propertysystem.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type tag for models based on the ECFV-scheme
 // Create new type tags
@@ -41,6 +41,6 @@ namespace TTag {
 struct EcfvDiscretization { using InheritsFrom = std::tuple<FvBaseDiscretization>; };
 } // end namespace TTag
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/discretization/vcfv/vcfvdiscretization.hh

@@ -50,7 +50,7 @@ class VcfvDiscretization;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! Set the stencil
 template<class TypeTag>
@@ -125,7 +125,7 @@ template<class TypeTag>
 struct LinearizeNonLocalElements<TypeTag, TTag::VcfvDiscretization> { static constexpr bool value = false; };
 
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/discretization/vcfv/vcfvproperties.hh

@@ -33,7 +33,7 @@
 
 #include <opm/models/utils/propertysystem.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type tag for models based on the VCFV-scheme
 // Create new type tags
@@ -46,6 +46,6 @@ struct VcfvDiscretization { using InheritsFrom = std::tuple<FvBaseDiscretization
 template<class TypeTag, class MyTypeTag>
 struct UseP1FiniteElementGradients { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/flash/flashmodel.hh

@@ -56,7 +56,7 @@ template <class TypeTag>
 class FlashModel;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type tag for the isothermal single phase problems
 NEW_TYPE_TAG(FlashModel, INHERITS_FROM(MultiPhaseBaseModel,
@@ -123,7 +123,7 @@ struct EnableDiffusion<TypeTag, TTag::FlashModel> { static constexpr bool value
 template<class TypeTag>
 struct EnableEnergy<TypeTag, TTag::FlashModel> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/flash/flashproperties.hh

@@ -35,7 +35,7 @@
 #include <opm/models/io/vtkenergymodule.hh>
 #include <opm/models/io/vtkdiffusionmodule.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type of the flash constraint solver
 template<class TypeTag, class MyTypeTag>
@@ -44,6 +44,6 @@ struct FlashSolver { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct FlashTolerance { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/immiscible/immisciblemodel.hh

@@ -55,7 +55,7 @@ template <class TypeTag>
 class ImmiscibleModel;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // Create new type tags
 namespace TTag {
@@ -174,7 +174,7 @@ public:
 };
 
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/immiscible/immiscibleproperties.hh

@@ -33,7 +33,7 @@
 #include <opm/models/common/multiphasebaseproperties.hh>
 #include <opm/models/io/vtkenergymodule.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // these properties only make sense for the ImmiscibleTwoPhase type tag
 //! The wetting phase for two-phase models
@@ -48,6 +48,6 @@ struct NonwettingPhase { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct Fluid { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/io/baseoutputmodule.hh

@@ -47,12 +47,12 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template <class TypeTag, class MyTypeTag>
 struct FluidSystem;
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/io/structuredgridvanguard.hh

@@ -52,7 +52,7 @@ class StructuredGridVanguard;
 
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 NEW_TYPE_TAG(StructuredGridVanguard);
 
@@ -75,7 +75,7 @@ struct Grid<TypeTag, TTag::StructuredGridVanguard> { using type = Dune::YaspGrid
 template<class TypeTag>
 struct Vanguard<TypeTag, TTag::StructuredGridVanguard> { using type = Opm::StructuredGridVanguard<TypeTag>; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/io/vtkblackoilenergymodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkBlackOilEnergy);
@@ -65,7 +65,7 @@ struct VtkWriteFluidInternalEnergies<TypeTag, TTag::VtkBlackOilEnergy> { static
 template<class TypeTag>
 struct VtkWriteFluidEnthalpies<TypeTag, TTag::VtkBlackOilEnergy> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkblackoilmodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkBlackOil);
@@ -92,7 +92,7 @@ template<class TypeTag>
 struct VtkWriteSaturatedGasOilVaporizationFactor<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
 template<class TypeTag>
 struct VtkWritePrimaryVarsMeaning<TypeTag, TTag::VtkBlackOil> { static constexpr bool value = false; };
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkblackoilpolymermodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkBlackOilPolymer);
@@ -73,7 +73,7 @@ struct VtkWritePolymerRockDensity<TypeTag, TTag::VtkBlackOilPolymer> { static co
 template<class TypeTag>
 struct VtkWritePolymerAdsorption<TypeTag, TTag::VtkBlackOilPolymer> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkblackoilsolventmodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkBlackOilSolvent);
@@ -65,7 +65,7 @@ struct VtkWriteSolventViscosity<TypeTag, TTag::VtkBlackOilSolvent> { static cons
 template<class TypeTag>
 struct VtkWriteSolventMobility<TypeTag, TTag::VtkBlackOilSolvent> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkcompositionmodule.hh

@@ -35,7 +35,7 @@
 
 #include <opm/material/common/MathToolbox.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK composition output
 NEW_TYPE_TAG(VtkComposition);
@@ -72,7 +72,7 @@ struct VtkWriteFugacities<TypeTag, TTag::VtkComposition> { static constexpr bool
 template<class TypeTag>
 struct VtkWriteFugacityCoeffs<TypeTag, TTag::VtkComposition> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/io/vtkdiffusionmodule.hh

@@ -37,7 +37,7 @@
 #include <opm/material/densead/Evaluation.hpp>
 #include <opm/material/densead/Math.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK output of the quantities for molecular
 // diffusion
@@ -59,7 +59,7 @@ struct VtkWriteDiffusionCoefficients<TypeTag, TTag::VtkDiffusion> { static const
 template<class TypeTag>
 struct VtkWriteEffectiveDiffusionCoefficients<TypeTag, TTag::VtkDiffusion> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkdiscretefracturemodule.hh

@@ -39,7 +39,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkDiscreteFracture);
@@ -76,7 +76,7 @@ struct VtkWriteFractureFilterVelocities<TypeTag, TTag::VtkDiscreteFracture> { st
 template<class TypeTag>
 struct VtkWriteFractureVolumeFraction<TypeTag, TTag::VtkDiscreteFracture> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkenergymodule.hh

@@ -35,7 +35,7 @@
 
 #include <opm/material/common/MathToolbox.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK energy output
 NEW_TYPE_TAG(VtkEnergy);
@@ -60,7 +60,7 @@ struct VtkWriteInternalEnergies<TypeTag, TTag::VtkEnergy> { static constexpr boo
 template<class TypeTag>
 struct VtkWriteEnthalpies<TypeTag, TTag::VtkEnergy> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkmultiphasemodule.hh

@@ -40,7 +40,7 @@
 
 #include <cstdio>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK multi-phase output
 NEW_TYPE_TAG(VtkMultiPhase);
@@ -97,7 +97,7 @@ struct VtkWritePotentialGradients<TypeTag, TTag::VtkMultiPhase> { static constex
 template<class TypeTag>
 struct VtkWriteFilterVelocities<TypeTag, TTag::VtkMultiPhase> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/io/vtkphasepresencemodule.hh

@@ -33,7 +33,7 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK primary variables output
 NEW_TYPE_TAG(VtkPhasePresence);
@@ -45,7 +45,7 @@ struct VtkWritePhasePresence { using type = UndefinedProperty; };
 template<class TypeTag>
 struct VtkWritePhasePresence<TypeTag, TTag::VtkPhasePresence> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/io/vtkprimaryvarsmodule.hh

@@ -33,7 +33,7 @@
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/models/utils/propertysystem.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK primary variables output
 NEW_TYPE_TAG(VtkPrimaryVars);
@@ -53,7 +53,7 @@ struct VtkWriteProcessRank<TypeTag, TTag::VtkPrimaryVars> { static constexpr boo
 template<class TypeTag>
 struct VtkWriteDofIndex<TypeTag, TTag::VtkPrimaryVars> { static constexpr bool value = false; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/io/vtktemperaturemodule.hh

@@ -35,7 +35,7 @@
 
 #include <opm/material/common/MathToolbox.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 // create new type tag for the VTK temperature output
 NEW_TYPE_TAG(VtkTemperature);
@@ -48,7 +48,7 @@ struct VtkWriteTemperature { using type = UndefinedProperty; };
 template<class TypeTag>
 struct VtkWriteTemperature<TypeTag, TTag::VtkTemperature> { static constexpr bool value = true; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/ncp/ncpmodel.hh

@@ -62,7 +62,7 @@ template <class TypeTag>
 class NcpModel;
 }
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 /*!
  * \brief Define the type tag for the compositional NCP model.
@@ -128,7 +128,7 @@ SET_SCALAR_PROP(NcpModel, NcpSaturationsBaseWeight, 1.0);
 //! The unmodified weight for the fugacity primary variables
 SET_SCALAR_PROP(NcpModel, NcpFugacitiesBaseWeight, 1.0e-6);
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/ncp/ncpnewtonmethod.hh

@@ -37,12 +37,12 @@
 
 #include <algorithm>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template <class TypeTag, class MyTypeTag>
 struct DiscNewtonMethod;
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 

opm/models/ncp/ncpproperties.hh

@@ -35,7 +35,7 @@
 #include <opm/models/io/vtkenergymodule.hh>
 #include <opm/models/io/vtkdiffusionmodule.hh>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The unmodified weight for the pressure primary variable
 template<class TypeTag, class MyTypeTag>
@@ -52,6 +52,6 @@ struct NcpFugacitiesBaseWeight { using type = UndefinedProperty; };
 template<class TypeTag, class MyTypeTag>
 struct NcpCompositionFromFugacitiesSolver { using type = UndefinedProperty; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 #endif

opm/models/nonlinear/newtonmethod.hh

@@ -60,7 +60,7 @@ namespace Opm {
 // forward declaration of property tags
 } // namespace Opm
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 //! The type tag on which the default properties for the Newton method
 //! are attached
@@ -139,7 +139,7 @@ struct NewtonTargetIterations<TypeTag, TTag::NewtonMethod> { static constexpr in
 template<class TypeTag>
 struct NewtonMaxIterations<TypeTag, TTag::NewtonMethod> { static constexpr int value = 18; };
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!

opm/models/nonlinear/nullconvergencewriter.hh

@@ -32,12 +32,12 @@
 
 #include <opm/material/common/Unused.hpp>
 
-BEGIN_PROPERTIES
+namespace Opm::Properties {
 
 template <class TypeTag, class MyTypeTag>
 struct NewtonMethod;
 
-END_PROPERTIES
+} // namespace Opm::Properties
 
 namespace Opm {
 /*!