Merge pull request #534 from akva2/namespace_change

changed: namespace Ewoms -> namespace Opm

examples/co2injection_flash_ecfv.cpp

@@ -49,8 +49,8 @@ SET_TAG_PROP(Co2InjectionFlashEcfvProblem, LocalLinearizerSplice, AutoDiffLocalL
 // use the flash solver adapted to the CO2 injection problem
 SET_TYPE_PROP(
     Co2InjectionFlashEcfvProblem, FlashSolver,
-    Ewoms::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
-                             typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
+    Opm::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
+                           typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
 
 // the flash model has serious problems with the numerical
 // precision. if quadruple precision math is available, we use it,
@@ -70,5 +70,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionFlashEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_ni_ecfv.cpp

@@ -48,8 +48,8 @@ SET_TAG_PROP(Co2InjectionFlashNiEcfvProblem, LocalLinearizerSplice, AutoDiffLoca
 // use the CO2 injection problem adapted flash solver
 SET_TYPE_PROP(
     Co2InjectionFlashNiEcfvProblem, FlashSolver,
-    Ewoms::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
-                             typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
+    Opm::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
+                           typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
 
 // the flash model has serious problems with the numerical
 // precision. if quadruple precision math is available, we use it,
@@ -69,5 +69,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionFlashNiEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_ni_vcfv.cpp

@@ -45,8 +45,8 @@ SET_BOOL_PROP(Co2InjectionFlashNiVcfvProblem, EnableEnergy, true);
 // use the CO2 injection problem adapted flash solver
 SET_TYPE_PROP(
     Co2InjectionFlashNiVcfvProblem, FlashSolver,
-    Ewoms::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
-                             typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
+    Opm::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
+                           typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
 
 // the flash model has serious problems with the numerical
 // precision. if quadruple precision math is available, we use it,
@@ -66,5 +66,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionFlashNiVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_flash_vcfv.cpp

@@ -46,8 +46,8 @@ SET_TAG_PROP(Co2InjectionFlashVcfvProblem, SpatialDiscretizationSplice, VcfvDisc
 // use the flash solver adapted to the CO2 injection problem
 SET_TYPE_PROP(
     Co2InjectionFlashVcfvProblem, FlashSolver,
-    Ewoms::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
-                             typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
+    Opm::Co2InjectionFlash<typename GET_PROP_TYPE(TypeTag, Scalar),
+                           typename GET_PROP_TYPE(TypeTag, FluidSystem)>);
 
 // the flash model has serious problems with the numerical
 // precision. if quadruple precision math is available, we use it,
@@ -67,5 +67,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionFlashVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ecfv.cpp

@@ -50,5 +50,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionImmiscibleEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ni_ecfv.cpp

@@ -53,5 +53,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionImmiscibleNiEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_ni_vcfv.cpp

@@ -49,5 +49,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionImmiscibleNiVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_immiscible_vcfv.cpp

@@ -48,5 +48,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionImmiscibleVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ecfv.cpp

@@ -43,5 +43,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionNcpEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ni_ecfv.cpp

@@ -47,5 +47,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionNcpNiEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_ni_vcfv.cpp

@@ -44,5 +44,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionNcpNiVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_ncp_vcfv.cpp

@@ -44,5 +44,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionNcpVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ecfv.cpp

@@ -43,5 +43,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionPvsEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ni_ecfv.cpp

@@ -48,5 +48,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionPvsNiEcfvProblem) EcfvProblemTypeTag;
-    return Ewoms::start<EcfvProblemTypeTag>(argc, argv);
+    return Opm::start<EcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_ni_vcfv.cpp

@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionPvsNiVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/co2injection_pvs_vcfv.cpp

@@ -44,5 +44,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(Co2InjectionPvsVcfvProblem) VcfvProblemTypeTag;
-    return Ewoms::start<VcfvProblemTypeTag>(argc, argv);
+    return Opm::start<VcfvProblemTypeTag>(argc, argv);
 }

examples/cuvette_pvs.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(CuvetteProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_flash.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(DiffusionProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_ncp.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(DiffusionProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/diffusion_pvs.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(DiffusionProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/finger_immiscible_ecfv.cpp

@@ -42,5 +42,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(FingerProblemEcfv) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/finger_immiscible_vcfv.cpp

@@ -42,5 +42,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(FingerProblemVcfv) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/fracture_discretefracture.cpp

@@ -33,5 +33,5 @@
 int main(int argc, char **argv)
 {
     typedef TTAG(FractureProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/groundwater_immiscible.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(GroundWaterProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/infiltration_pvs.cpp

@@ -40,5 +40,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(InfiltrationProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad.cpp

@@ -35,5 +35,5 @@
 int main(int argc, char **argv)
 {
     typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_23.cpp

@@ -87,5 +87,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_cu1.cpp

@@ -44,5 +44,5 @@ int mainCU1(int argc, char **argv);
 int mainCU1(int argc, char **argv)
 {
     typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_ecfv_ad_cu2.cpp

@@ -44,5 +44,5 @@ int mainCU2(int argc, char **argv);
 int mainCU2(int argc, char **argv)
 {
     typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_vcfv_ad.cpp

@@ -49,5 +49,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(LensProblemVcfvAd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_immiscible_vcfv_fd.cpp

@@ -49,5 +49,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(LensProblemVcfvFd) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_richards_ecfv.cpp

@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(RichardsLensEcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/lens_richards_vcfv.cpp

@@ -42,5 +42,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(RichardsLensVcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_immiscible.cpp

@@ -41,5 +41,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ObstacleProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_ncp.cpp

@@ -41,5 +41,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ObstacleProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/obstacle_pvs.cpp

@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ObstacleProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/outflow_pvs.cpp

@@ -43,5 +43,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(OutflowProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_darcy_ad.cpp

@@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionDarcyAdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
                            PowerInjectionBaseProblem));
 
-SET_TYPE_PROP(PowerInjectionDarcyAdProblem, FluxModule, Ewoms::DarcyFluxModule<TypeTag>);
+SET_TYPE_PROP(PowerInjectionDarcyAdProblem, FluxModule, Opm::DarcyFluxModule<TypeTag>);
 SET_TAG_PROP(PowerInjectionDarcyAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
 END_PROPERTIES
@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(PowerInjectionDarcyAdProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_darcy_fd.cpp

@@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionDarcyFdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
                            PowerInjectionBaseProblem));
 
-SET_TYPE_PROP(PowerInjectionDarcyFdProblem, FluxModule, Ewoms::DarcyFluxModule<TypeTag>);
+SET_TYPE_PROP(PowerInjectionDarcyFdProblem, FluxModule, Opm::DarcyFluxModule<TypeTag>);
 SET_TAG_PROP(PowerInjectionDarcyFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer);
 
 END_PROPERTIES
@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(PowerInjectionDarcyFdProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_forchheimer_ad.cpp

@@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionForchheimerAdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
                            PowerInjectionBaseProblem));
 
-SET_TYPE_PROP(PowerInjectionForchheimerAdProblem, FluxModule, Ewoms::ForchheimerFluxModule<TypeTag>);
+SET_TYPE_PROP(PowerInjectionForchheimerAdProblem, FluxModule, Opm::ForchheimerFluxModule<TypeTag>);
 SET_TAG_PROP(PowerInjectionForchheimerAdProblem, LocalLinearizerSplice, AutoDiffLocalLinearizer);
 
 END_PROPERTIES
@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(PowerInjectionForchheimerAdProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/powerinjection_forchheimer_fd.cpp

@@ -37,7 +37,7 @@ NEW_TYPE_TAG(PowerInjectionForchheimerFdProblem,
              INHERITS_FROM(ImmiscibleTwoPhaseModel,
                            PowerInjectionBaseProblem));
 
-SET_TYPE_PROP(PowerInjectionForchheimerFdProblem, FluxModule, Ewoms::ForchheimerFluxModule<TypeTag>);
+SET_TYPE_PROP(PowerInjectionForchheimerFdProblem, FluxModule, Opm::ForchheimerFluxModule<TypeTag>);
 SET_TAG_PROP(PowerInjectionForchheimerFdProblem, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer);
 
 END_PROPERTIES
@@ -45,5 +45,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(PowerInjectionForchheimerFdProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/problems/co2injectionflash.hh

@@ -23,14 +23,14 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::Co2InjectionFlash
+ * \copydoc Opm::Co2InjectionFlash
  */
 #ifndef EWOMS_CO2_INJECTION_FLASH_HH
 #define EWOMS_CO2_INJECTION_FLASH_HH
 
 #include <opm/material/constraintsolvers/NcpFlash.hpp>
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \brief Flash solver used by the CO2 injection problem.
  *
@@ -61,6 +61,6 @@ public:
     }
 };
 
-} // namespace Ewoms
+} // namespace Opm
 
 #endif // EWOMS_CO2_INJECTION_FLASH_HH

examples/problems/co2injectionproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::Co2InjectionProblem
+ * \copydoc Opm::Co2InjectionProblem
  */
 #ifndef EWOMS_CO2_INJECTION_PROBLEM_HH
 #define EWOMS_CO2_INJECTION_PROBLEM_HH
@@ -57,7 +57,7 @@
 #include <iostream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 //! \cond SKIP_THIS
 template <class TypeTag>
 class Co2InjectionProblem;
@@ -89,14 +89,14 @@ SET_TYPE_PROP(Co2InjectionBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
 SET_TYPE_PROP(Co2InjectionBaseProblem, Problem,
-              Ewoms::Co2InjectionProblem<TypeTag>);
+              Opm::Co2InjectionProblem<TypeTag>);
 
 // Set fluid configuration
 SET_PROP(Co2InjectionBaseProblem, FluidSystem)
 {
 private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-    typedef Ewoms::Co2Injection::CO2Tables CO2Tables;
+    typedef Opm::Co2Injection::CO2Tables CO2Tables;
 
 public:
     typedef Opm::BrineCO2FluidSystem<Scalar, CO2Tables> type;
@@ -173,7 +173,7 @@ SET_STRING_PROP(Co2InjectionBaseProblem, GridFile, "data/co2injection.dgf");
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -649,6 +649,6 @@ private:
     Scalar pressureLow_, pressureHigh_;
     Scalar temperatureLow_, temperatureHigh_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/cuvetteproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::CuvetteProblem
+ * \copydoc Opm::CuvetteProblem
  */
 #ifndef EWOMS_CUVETTE_PROBLEM_HH
 #define EWOMS_CUVETTE_PROBLEM_HH
@@ -51,7 +51,7 @@
 
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class CuvetteProblem;
 }
@@ -66,7 +66,7 @@ NEW_TYPE_TAG(CuvetteBaseProblem);
 SET_TYPE_PROP(CuvetteBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(CuvetteBaseProblem, Problem, Ewoms::CuvetteProblem<TypeTag>);
+SET_TYPE_PROP(CuvetteBaseProblem, Problem, Opm::CuvetteProblem<TypeTag>);
 
 // Set the fluid system
 SET_TYPE_PROP(
@@ -123,7 +123,7 @@ SET_STRING_PROP(CuvetteBaseProblem, GridFile, "./data/cuvette_11x4.dgf");
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -632,6 +632,6 @@ private:
 
     const Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/diffusionproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::DiffusionProblem
+ * \copydoc Opm::DiffusionProblem
  */
 #ifndef EWOMS_POWER_INJECTION_PROBLEM_HH
 #define EWOMS_POWER_INJECTION_PROBLEM_HH
@@ -47,7 +47,7 @@
 #include <sstream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class DiffusionProblem;
 }
@@ -60,10 +60,10 @@ NEW_TYPE_TAG(DiffusionBaseProblem);
 SET_TYPE_PROP(DiffusionBaseProblem, Grid, Dune::YaspGrid</*dim=*/1>);
 
 // set the Vanguard property
-SET_TYPE_PROP(DiffusionBaseProblem, Vanguard, Ewoms::CubeGridVanguard<TypeTag>);
+SET_TYPE_PROP(DiffusionBaseProblem, Vanguard, Opm::CubeGridVanguard<TypeTag>);
 
 // Set the problem property
-SET_TYPE_PROP(DiffusionBaseProblem, Problem, Ewoms::DiffusionProblem<TypeTag>);
+SET_TYPE_PROP(DiffusionBaseProblem, Problem, Opm::DiffusionProblem<TypeTag>);
 
 // Set the fluid system
 SET_PROP(DiffusionBaseProblem, FluidSystem)
@@ -117,7 +117,7 @@ SET_SCALAR_PROP(DiffusionBaseProblem, InitialTimeStepSize, 1000);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  * \brief 1D problem which is driven by molecular diffusion.
@@ -369,6 +369,6 @@ private:
     Scalar temperature_;
 };
 
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/fingerproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::FingerProblem
+ * \copydoc Opm::FingerProblem
  */
 #ifndef EWOMS_FINGER_PROBLEM_HH
 #define EWOMS_FINGER_PROBLEM_HH
@@ -56,11 +56,11 @@
 #include <vector>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class FingerProblem;
 
-} // namespace Ewoms
+} // namespace Opm
 
 BEGIN_PROPERTIES
 
@@ -80,7 +80,7 @@ SET_TYPE_PROP(FingerBaseProblem,
 NEW_PROP_TAG(InitialWaterSaturation);
 
 // Set the problem property
-SET_TYPE_PROP(FingerBaseProblem, Problem, Ewoms::FingerProblem<TypeTag>);
+SET_TYPE_PROP(FingerBaseProblem, Problem, Opm::FingerProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(FingerBaseProblem, WettingPhase)
@@ -147,7 +147,7 @@ SET_SCALAR_PROP(FingerBaseProblem, InitialTimeStepSize, 10);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 
 /*!
  * \ingroup TestProblems
@@ -550,6 +550,6 @@ private:
     Scalar eps_;
 };
 
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/fractureproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::FractureProblem
+ * \copydoc Opm::FractureProblem
  */
 #ifndef EWOMS_FRACTURE_PROBLEM_HH
 #define EWOMS_FRACTURE_PROBLEM_HH
@@ -60,7 +60,7 @@
 #include <sstream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class FractureProblem;
 }
@@ -76,10 +76,10 @@ SET_TYPE_PROP(
     Dune::ALUGrid</*dim=*/2, /*dimWorld=*/2, Dune::simplex, Dune::nonconforming>);
 
 // Set the Vanguard property
-SET_TYPE_PROP(FractureProblem, Vanguard, Ewoms::DgfVanguard<TypeTag>);
+SET_TYPE_PROP(FractureProblem, Vanguard, Opm::DgfVanguard<TypeTag>);
 
 // Set the problem property
-SET_TYPE_PROP(FractureProblem, Problem, Ewoms::FractureProblem<TypeTag>);
+SET_TYPE_PROP(FractureProblem, Problem, Opm::FractureProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(FractureProblem, WettingPhase)
@@ -160,7 +160,7 @@ SET_SCALAR_PROP(FractureProblem, InitialTimeStepSize, 100);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -220,7 +220,7 @@ class FractureProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
     };
     typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, FaceLayout> FaceMapper;
 
-    typedef Ewoms::FractureMapper<TypeTag> FractureMapper;
+    typedef Opm::FractureMapper<TypeTag> FractureMapper;
 
 public:
     /*!
@@ -648,6 +648,6 @@ private:
     Scalar temperature_;
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif // EWOMS_FRACTURE_PROBLEM_HH

examples/problems/groundwaterproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::GroundWaterProblem
+ * \copydoc Opm::GroundWaterProblem
  */
 #ifndef EWOMS_GROUND_WATER_PROBLEM_HH
 #define EWOMS_GROUND_WATER_PROBLEM_HH
@@ -46,7 +46,7 @@
 #include <sstream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class GroundWaterProblem;
 }
@@ -78,7 +78,7 @@ SET_TYPE_PROP(GroundWaterBaseProblem, Grid, Dune::YaspGrid<2>);
 // SET_TYPE_PROP(GroundWaterBaseProblem, Grid, Dune::SGrid<2, 2>);
 
 SET_TYPE_PROP(GroundWaterBaseProblem, Problem,
-              Ewoms::GroundWaterProblem<TypeTag>);
+              Opm::GroundWaterProblem<TypeTag>);
 
 SET_SCALAR_PROP(GroundWaterBaseProblem, LensLowerLeftX, 0.25);
 SET_SCALAR_PROP(GroundWaterBaseProblem, LensLowerLeftY, 0.25);
@@ -105,11 +105,11 @@ SET_STRING_PROP(GroundWaterBaseProblem, GridFile, "./data/groundwater_2d.dgf");
 // ILU-0) from dune-istl
 SET_TAG_PROP(GroundWaterBaseProblem, LinearSolverSplice, ParallelIstlLinearSolver);
 SET_TYPE_PROP(GroundWaterBaseProblem, LinearSolverWrapper,
-              Ewoms::Linear::SolverWrapperConjugatedGradients<TypeTag>);
+              Opm::Linear::SolverWrapperConjugatedGradients<TypeTag>);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -392,6 +392,6 @@ private:
 
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/infiltrationproblem.hh

@@ -22,7 +22,7 @@
 */
 /*!
  * \file
- * \copydoc Ewoms::InfiltrationProblem
+ * \copydoc Opm::InfiltrationProblem
  */
 #ifndef EWOMS_INFILTRATION_PROBLEM_HH
 #define EWOMS_INFILTRATION_PROBLEM_HH
@@ -47,7 +47,7 @@
 #include <sstream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class InfiltrationProblem;
 }
@@ -61,7 +61,7 @@ SET_TYPE_PROP(InfiltrationBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
 SET_TYPE_PROP(InfiltrationBaseProblem, Problem,
-              Ewoms::InfiltrationProblem<TypeTag>);
+              Opm::InfiltrationProblem<TypeTag>);
 
 // Set the fluid system
 SET_TYPE_PROP(
@@ -106,7 +106,7 @@ SET_STRING_PROP(InfiltrationBaseProblem, GridFile,
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  * \brief Isothermal NAPL infiltration problem where LNAPL
@@ -469,6 +469,6 @@ private:
     Scalar temperature_;
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/lensproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::LensProblem
+ * \copydoc Opm::LensProblem
  */
 #ifndef EWOMS_LENS_PROBLEM_HH
 #define EWOMS_LENS_PROBLEM_HH
@@ -51,7 +51,7 @@
 #include <string>
 #include <iostream>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class LensProblem;
 }
@@ -69,7 +69,7 @@ NEW_PROP_TAG(LensUpperRightY);
 NEW_PROP_TAG(LensUpperRightZ);
 
 // Set the problem property
-SET_TYPE_PROP(LensBaseProblem, Problem, Ewoms::LensProblem<TypeTag>);
+SET_TYPE_PROP(LensBaseProblem, Problem, Opm::LensProblem<TypeTag>);
 
 // Use Dune-grid's YaspGrid
 SET_TYPE_PROP(LensBaseProblem, Grid, Dune::YaspGrid<2>);
@@ -158,7 +158,7 @@ SET_BOOL_PROP(LensBaseProblem, EnableIntensiveQuantityCache, true);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 
 /*!
  * \ingroup TestProblems
@@ -326,7 +326,7 @@ public:
 
         std::string disc = "vertex centered finite volume";
         typedef typename GET_PROP_TYPE(TypeTag, Discretization) D;
-        bool useEcfv = std::is_same<D, Ewoms::EcfvDiscretization<TypeTag>>::value;
+        bool useEcfv = std::is_same<D, Opm::EcfvDiscretization<TypeTag>>::value;
         if (useEcfv)
             disc = "element centered finite volume";
 
@@ -625,6 +625,6 @@ private:
     Scalar eps_;
 };
 
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/obstacleproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::ObstacleProblem
+ * \copydoc Opm::ObstacleProblem
  */
 #ifndef EWOMS_OBSTACLE_PROBLEM_HH
 #define EWOMS_OBSTACLE_PROBLEM_HH
@@ -52,7 +52,7 @@
 #include <string>
 #include <iostream>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class ObstacleProblem;
 }
@@ -65,7 +65,7 @@ NEW_TYPE_TAG(ObstacleBaseProblem);
 SET_TYPE_PROP(ObstacleBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(ObstacleBaseProblem, Problem, Ewoms::ObstacleProblem<TypeTag>);
+SET_TYPE_PROP(ObstacleBaseProblem, Problem, Opm::ObstacleProblem<TypeTag>);
 
 // Set fluid configuration
 SET_TYPE_PROP(ObstacleBaseProblem, FluidSystem,
@@ -119,7 +119,7 @@ SET_STRING_PROP(ObstacleBaseProblem, GridFile, "./data/obstacle_24x16.dgf");
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -569,6 +569,6 @@ private:
     Scalar temperature_;
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/outflowproblem.hh

@@ -22,7 +22,7 @@
 */
 /*!
  * \file
- * \copydoc Ewoms::OutflowProblem
+ * \copydoc Opm::OutflowProblem
  */
 #ifndef EWOMS_OUTFLOW_PROBLEM_HH
 #define EWOMS_OUTFLOW_PROBLEM_HH
@@ -40,7 +40,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class OutflowProblem;
 }
@@ -53,7 +53,7 @@ NEW_TYPE_TAG(OutflowBaseProblem);
 SET_TYPE_PROP(OutflowBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(OutflowBaseProblem, Problem, Ewoms::OutflowProblem<TypeTag>);
+SET_TYPE_PROP(OutflowBaseProblem, Problem, Opm::OutflowProblem<TypeTag>);
 
 // Set fluid system
 SET_PROP(OutflowBaseProblem, FluidSystem)
@@ -83,7 +83,7 @@ SET_STRING_PROP(OutflowBaseProblem, GridFile, "./data/outflow.dgf");
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  *
@@ -369,6 +369,6 @@ private:
     Scalar porosity_;
     Scalar tortuosity_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/powerinjectionproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::PowerInjectionProblem
+ * \copydoc Opm::PowerInjectionProblem
  */
 #ifndef EWOMS_POWER_INJECTION_PROBLEM_HH
 #define EWOMS_POWER_INJECTION_PROBLEM_HH
@@ -52,7 +52,7 @@
 #include <type_traits>
 #include <iostream>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class PowerInjectionProblem;
 }
@@ -66,11 +66,11 @@ SET_TYPE_PROP(PowerInjectionBaseProblem, Grid, Dune::YaspGrid</*dim=*/1>);
 
 // set the Vanguard property
 SET_TYPE_PROP(PowerInjectionBaseProblem, Vanguard,
-              Ewoms::CubeGridVanguard<TypeTag>);
+              Opm::CubeGridVanguard<TypeTag>);
 
 // Set the problem property
 SET_TYPE_PROP(PowerInjectionBaseProblem, Problem,
-              Ewoms::PowerInjectionProblem<TypeTag>);
+              Opm::PowerInjectionProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(PowerInjectionBaseProblem, WettingPhase)
@@ -138,7 +138,7 @@ SET_SCALAR_PROP(PowerInjectionBaseProblem, InitialTimeStepSize, 1e-3);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  * \brief 1D Problem with very fast injection of gas on the left.
@@ -236,7 +236,7 @@ public:
         std::ostringstream oss;
         oss << "powerinjection_";
         if (std::is_same<typename GET_PROP_TYPE(TypeTag, FluxModule),
-                         Ewoms::DarcyFluxModule<TypeTag> >::value)
+                         Opm::DarcyFluxModule<TypeTag> >::value)
             oss << "darcy";
         else
             oss << "forchheimer";
@@ -429,6 +429,6 @@ private:
     Scalar eps_;
 };
 
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/reservoirproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::ReservoirProblem
+ * \copydoc Opm::ReservoirProblem
  */
 #ifndef EWOMS_RESERVOIR_PROBLEM_HH
 #define EWOMS_RESERVOIR_PROBLEM_HH
@@ -50,11 +50,11 @@
 #include <vector>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class ReservoirProblem;
 
-} // namespace Ewoms
+} // namespace Opm
 
 BEGIN_PROPERTIES
 
@@ -72,7 +72,7 @@ NEW_PROP_TAG(WellWidth);
 SET_TYPE_PROP(ReservoirBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(ReservoirBaseProblem, Problem, Ewoms::ReservoirProblem<TypeTag>);
+SET_TYPE_PROP(ReservoirBaseProblem, Problem, Opm::ReservoirProblem<TypeTag>);
 
 // Set the material Law
 SET_PROP(ReservoirBaseProblem, MaterialLaw)
@@ -141,7 +141,7 @@ SET_SCALAR_PROP(ReservoirBaseProblem, NewtonTolerance, 1e-6);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 
 /*!
  * \ingroup TestProblems
@@ -746,6 +746,6 @@ private:
     Scalar maxDepth_;
     Scalar wellWidth_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/richardslensproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::RichardsLensProblem
+ * \copydoc Opm::RichardsLensProblem
  */
 #ifndef EWOMS_RICHARDS_LENS_PROBLEM_HH
 #define EWOMS_RICHARDS_LENS_PROBLEM_HH
@@ -45,11 +45,11 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class RichardsLensProblem;
 
-} // namespace Ewoms
+} // namespace Opm
 
 BEGIN_PROPERTIES
 
@@ -59,7 +59,7 @@ NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards));
 SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the physical problem to be solved
-SET_TYPE_PROP(RichardsLensProblem, Problem, Ewoms::RichardsLensProblem<TypeTag>);
+SET_TYPE_PROP(RichardsLensProblem, Problem, Opm::RichardsLensProblem<TypeTag>);
 
 // Set the wetting phase
 SET_PROP(RichardsLensProblem, WettingFluid)
@@ -120,7 +120,7 @@ SET_STRING_PROP(RichardsLensProblem, GridFile, "./data/richardslens_24x16.dgf");
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 
 /*!
  * \ingroup TestProblems
@@ -481,6 +481,6 @@ private:
     Scalar eps_;
     Scalar pnRef_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/problems/waterairproblem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::WaterAirProblem
+ * \copydoc Opm::WaterAirProblem
  */
 #ifndef EWOMS_WATER_AIR_PROBLEM_HH
 #define EWOMS_WATER_AIR_PROBLEM_HH
@@ -53,7 +53,7 @@
 #include <sstream>
 #include <string>
 
-namespace Ewoms {
+namespace Opm {
 template <class TypeTag>
 class WaterAirProblem;
 }
@@ -66,7 +66,7 @@ NEW_TYPE_TAG(WaterAirBaseProblem);
 SET_TYPE_PROP(WaterAirBaseProblem, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(WaterAirBaseProblem, Problem, Ewoms::WaterAirProblem<TypeTag>);
+SET_TYPE_PROP(WaterAirBaseProblem, Problem, Opm::WaterAirProblem<TypeTag>);
 
 // Set the material Law
 SET_PROP(WaterAirBaseProblem, MaterialLaw)
@@ -130,19 +130,19 @@ SET_STRING_PROP(WaterAirBaseProblem, GridFile, "./data/waterair.dgf");
 // Use the restarted GMRES linear solver with the ILU-2 preconditioner from dune-istl
 SET_TAG_PROP(WaterAirBaseProblem, LinearSolverSplice, ParallelIstlLinearSolver);
 SET_TYPE_PROP(WaterAirBaseProblem, LinearSolverWrapper,
-              Ewoms::Linear::SolverWrapperRestartedGMRes<TypeTag>);
+              Opm::Linear::SolverWrapperRestartedGMRes<TypeTag>);
 #if DUNE_VERSION_NEWER(DUNE_ISTL, 2,7)
 SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper,
-              Ewoms::Linear::PreconditionerWrapperILU<TypeTag>);
+              Opm::Linear::PreconditionerWrapperILU<TypeTag>);
 #else
 SET_TYPE_PROP(WaterAirBaseProblem, PreconditionerWrapper,
-              Ewoms::Linear::PreconditionerWrapperILUn<TypeTag>);
+              Opm::Linear::PreconditionerWrapperILUn<TypeTag>);
 #endif
 SET_INT_PROP(WaterAirBaseProblem, PreconditionerOrder, 2);
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 /*!
  * \ingroup TestProblems
  * \brief Non-isothermal gas injection problem where a air
@@ -589,6 +589,6 @@ private:
     Scalar maxDepth_;
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif

examples/reservoir_blackoil_ecfv.cpp

@@ -48,5 +48,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ReservoirBlackOilEcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_blackoil_vcfv.cpp

@@ -44,5 +44,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ReservoirBlackOilVcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_ncp_ecfv.cpp

@@ -47,5 +47,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ReservoirNcpEcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/reservoir_ncp_vcfv.cpp

@@ -54,5 +54,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(ReservoirNcpVcfvProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

examples/tutorial1.cpp

@@ -33,5 +33,5 @@
 int main(int argc, char **argv)
 {
     typedef TTAG(Tutorial1Problem) TypeTag; /*@\label{tutorial1:set-type-tag}@*/
-    return Ewoms::start<TypeTag>(argc, argv); /*@\label{tutorial1:call-start}@*/
+    return Opm::start<TypeTag>(argc, argv); /*@\label{tutorial1:call-start}@*/
 }

examples/tutorial1problem.hh

@@ -23,7 +23,7 @@
 /*!
  * \file
  *
- * \copydoc Ewoms::Tutorial1Problem
+ * \copydoc Opm::Tutorial1Problem
  */
 #ifndef EWOMS_TUTORIAL1_PROBLEM_HH /*@\label{tutorial1:guardian1}@*/
 #define EWOMS_TUTORIAL1_PROBLEM_HH /*@\label{tutorial1:guardian2}@*/
@@ -51,7 +51,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/common/version.hh>
 
-namespace Ewoms {
+namespace Opm {
 // forward declaration of the problem class
 template <class TypeTag>
 class Tutorial1Problem;
@@ -68,11 +68,11 @@ SET_TAG_PROP(Tutorial1Problem, SpatialDiscretizationSplice,
 
 // Set the "Problem" property
 SET_TYPE_PROP(Tutorial1Problem, Problem,
-              Ewoms::Tutorial1Problem<TypeTag>); /*@\label{tutorial1:set-problem}@*/
+              Opm::Tutorial1Problem<TypeTag>); /*@\label{tutorial1:set-problem}@*/
 
 // Set grid and the grid manager to be used
 SET_TYPE_PROP(Tutorial1Problem, Grid, Dune::YaspGrid</*dim=*/2>); /*@\label{tutorial1:set-grid}@*/
-SET_TYPE_PROP(Tutorial1Problem, Vanguard, Ewoms::CubeGridVanguard<TypeTag>); /*@\label{tutorial1:set-grid-manager}@*/
+SET_TYPE_PROP(Tutorial1Problem, Vanguard, Opm::CubeGridVanguard<TypeTag>); /*@\label{tutorial1:set-grid-manager}@*/
 
 // Set the wetting phase /*@\label{tutorial1:2p-system-start}@*/
 SET_TYPE_PROP(Tutorial1Problem,
@@ -129,7 +129,7 @@ SET_INT_PROP(Tutorial1Problem, CellsZ, 1); /*@\label{tutorial1:default-params-en
 
 END_PROPERTIES
 
-namespace Ewoms {
+namespace Opm {
 //! Tutorial problem using the "immiscible" model.
 template <class TypeTag>
 class Tutorial1Problem
@@ -309,7 +309,7 @@ private:
     // small epsilon value
     Scalar eps_;
 };
-} // namespace Ewoms
+} // namespace Opm
 
 #endif
 

examples/waterair_pvs_ni.cpp

@@ -42,5 +42,5 @@ END_PROPERTIES
 int main(int argc, char **argv)
 {
     typedef TTAG(WaterAirProblem) ProblemTypeTag;
-    return Ewoms::start<ProblemTypeTag>(argc, argv);
+    return Opm::start<ProblemTypeTag>(argc, argv);
 }

tests/models/test_propertysystem.cpp

@@ -185,7 +185,7 @@ int main()
     std::cout << "---------------------------------------\n";
 
     std::cout << "---- All properties for Sedan ---\n";
-    Ewoms::Properties::printValues<TTAG(Sedan)>();
+    Opm::Properties::printValues<TTAG(Sedan)>();
 
     std::cout << "---- Message for (HummerH1, CanonCaliber) ---\n"
               << PROP_DIAGNOSTIC(TTAG(HummerH1), CanonCaliber);

tests/models/test_quadrature.cpp

@@ -51,7 +51,7 @@
 
 const unsigned dim = 3;
 typedef double Scalar;
-typedef Ewoms::QuadrialteralQuadratureGeometry<Scalar, dim> QuadratureGeom;
+typedef Opm::QuadrialteralQuadratureGeometry<Scalar, dim> QuadratureGeom;
 typedef QuadratureGeom::LocalPosition LocalPosition;
 typedef QuadratureGeom::GlobalPosition GlobalPosition;
 
@@ -121,7 +121,7 @@ void writeTetrahedronSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid)
 
     GridFactory2 gf2;
     const auto &gridView = grid.leafView();
-    typedef Ewoms::VcfvStencil<Scalar, GridView> Stencil;
+    typedef Opm::VcfvStencil<Scalar, GridView> Stencil;
     typedef typename Stencil :: Mapper Mapper;
 
 #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
@@ -206,7 +206,7 @@ void writeCubeSubControlVolumes(const Grid& EWOMS_NO_ALUGRID_UNUSED grid)
     typedef Dune::ALUGrid<dim, dim, Dune::cube, Dune::nonconforming> Grid2;
     typedef typename Grid2::LeafGridView GridView2;
     typedef Dune::GridFactory<Grid2> GridFactory2;
-    typedef Ewoms::VcfvStencil<Scalar, GridView> Stencil;
+    typedef Opm::VcfvStencil<Scalar, GridView> Stencil;
 
     GridFactory2 gf2;
     const auto &gridView = grid.leafView();
@@ -312,7 +312,7 @@ void testQuadrature()
     const auto eEndIt = gridView.end<0>();
     Scalar result = 0;
     // instanciate a stencil
-    typedef Ewoms::VcfvStencil<Scalar, GridView> Stencil;
+    typedef Opm::VcfvStencil<Scalar, GridView> Stencil;
     typedef typename Stencil :: Mapper Mapper;
 
 #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)

tests/models/test_tasklets.cpp

@@ -35,9 +35,9 @@
 
 std::mutex outputMutex;
 
-Ewoms::TaskletRunner *runner;
+Opm::TaskletRunner *runner;
 
-class SleepTasklet : public Ewoms::TaskletInterface
+class SleepTasklet : public Opm::TaskletInterface
 {
 public:
     SleepTasklet(int mseconds)
@@ -77,7 +77,7 @@ int SleepTasklet::numInstantiated_ = 0;
 int main()
 {
     int numWorkers = 2;
-    runner = new Ewoms::TaskletRunner(numWorkers);
+    runner = new Opm::TaskletRunner(numWorkers);
 
     // the master thread is not a worker thread
     assert(runner->workerThreadIndex() < 0);