change namespace from Dumux to Ewoms

eWoms hereby declares full independence. Humor aside, the main technical advantage of this is, that it is now possible to easily install both, Dumux and eWoms on a system using a package management system without bad tricks.
2025-02-25 18:55:30 -06:00 · 2012-11-18 16:42:57 +01:00
parent 834b79a8dd
commit 3e55945ce5
24 changed files with 652 additions and 835 deletions
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,11 +4,11 @@ check_PROGRAMS = tutorial_decoupled tutorial_coupled
 noinst_HEADERS= *.hh
 EXTRA_DIST = CMakeLists.txt

-tutorial_decoupleddir = $(datadir)/dumux/tutorial
+tutorial_decoupleddir = $(datadir)/ewoms/tutorial
 tutorial_decoupled_SOURCES = tutorial_decoupled.cc
 tutorial_decoupled_DATA = $(tutorial_decoupled_SOURCES)

-tutorial_coupleddir = $(datadir)/dumux/tutorial
+tutorial_coupleddir = $(datadir)/ewoms/tutorial
 tutorial_coupled_SOURCES = tutorial_coupled.cc
 tutorial_coupled_DATA = $(tutorial_coupled_SOURCES)

--- a/examples/tutorial_coupled.cc
+++ b/examples/tutorial_coupled.cc
@@ -24,10 +24,10 @@
 */
 #include "config.h" /*@\label{tutorial-coupled:include-begin}@*/
 #include "tutorialproblem_coupled.hh"  /*@\label{tutorial-coupled:include-problem-header}@*/
-#include <dumux/common/start.hh> /*@\label{tutorial-coupled:include-end}@*/
+#include <ewoms/common/start.hh> /*@\label{tutorial-coupled:include-end}@*/

 int main(int argc, char** argv)
 {
    typedef TTAG(TutorialProblemCoupled) TypeTag; /*@\label{tutorial-coupled:set-type-tag}@*/
-    return Dumux::start<TypeTag>(argc, argv); /*@\label{tutorial-coupled:call-start}@*/
+    return Ewoms::start<TypeTag>(argc, argv); /*@\label{tutorial-coupled:call-start}@*/
 }
--- a/examples/tutorial_decoupled.cc
+++ b/examples/tutorial_decoupled.cc
@@ -26,7 +26,7 @@
 #include "config.h" /*@\label{tutorial-decoupled:include-begin}@*/

 #include "tutorialproblem_decoupled.hh" /*@\label{tutorial-decoupled:include-problem-header}@*/
-#include <dumux/common/start.hh> /*@\label{tutorial-decoupled:include-end}@*/
+#include <ewoms/common/start.hh> /*@\label{tutorial-decoupled:include-end}@*/

 ////////////////////////
 // the main function
@@ -34,5 +34,5 @@
 int main(int argc, char** argv)
 {
    typedef TTAG(TutorialProblemDecoupled) TypeTag; /*@\label{tutorial-decoupled:set-type-tag}@*/
-    return Dumux::start<TypeTag>(argc, argv); /*@\label{tutorial-decoupled:call-start}@*/
+    return Ewoms::start<TypeTag>(argc, argv); /*@\label{tutorial-decoupled:call-start}@*/
 }
--- a/examples/tutorialproblem_coupled.hh
+++ b/examples/tutorialproblem_coupled.hh
@@ -20,31 +20,31 @@
 /*!
 * \file
 *
- * \copydoc Dumux::TutorialProblemCoupled
+ * \copydoc Ewoms::TutorialProblemCoupled
 */
-#ifndef DUMUX_TUTORIAL_PROBLEM_COUPLED_HH    // guardian macro /*@\label{tutorial-coupled:guardian1}@*/
-#define DUMUX_TUTORIAL_PROBLEM_COUPLED_HH    // guardian macro /*@\label{tutorial-coupled:guardian2}@*/
+#ifndef EWOMS_TUTORIAL_PROBLEM_COUPLED_HH    // guardian macro /*@\label{tutorial-coupled:guardian1}@*/
+#define EWOMS_TUTORIAL_PROBLEM_COUPLED_HH    // guardian macro /*@\label{tutorial-coupled:guardian2}@*/

 // The numerical model
-#include <dumux/boxmodels/immiscible/immisciblemodel.hh>
+#include <ewoms/boxmodels/immiscible/immisciblemodel.hh>

 // The chemical species that are used
-#include <dumux/material/components/h2o.hh>
-#include <dumux/material/components/lnapl.hh>
+#include <ewoms/material/components/h2o.hh>
+#include <ewoms/material/components/lnapl.hh>

 // The material laws
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/material/fluidmatrixinteractions/mp/2padapter.hh>
+#include <ewoms/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/
+#include <ewoms/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <ewoms/material/fluidmatrixinteractions/mp/2padapter.hh>

 // For the DUNE grid
 #include <dune/grid/yaspgrid.hh> /*@\label{tutorial-coupled:include-grid-manager}@*/
-#include <dumux/common/cubegridcreator.hh> /*@\label{tutorial-coupled:include-grid-creator}@*/
+#include <ewoms/common/cubegridcreator.hh> /*@\label{tutorial-coupled:include-grid-creator}@*/

 // For Dune::FieldMatrix
 #include <dune/common/fmatrix.hh>

-namespace Dumux {
+namespace Ewoms {

 // forward declaration of the problem class
 template <class TypeTag>
@@ -56,21 +56,21 @@ NEW_TYPE_TAG(TutorialProblemCoupled, INHERITS_FROM(BoxImmiscibleTwoPhase)); /*@\

 // Set the "Problem" property
 SET_PROP(TutorialProblemCoupled, Problem) /*@\label{tutorial-coupled:set-problem}@*/
-{ typedef Dumux::TutorialProblemCoupled<TypeTag> type;};
+{ typedef Ewoms::TutorialProblemCoupled<TypeTag> type;};

 // Set grid and the grid creator to be used
 SET_TYPE_PROP(TutorialProblemCoupled, Grid, Dune::YaspGrid</*dim=*/2>); /*@\label{tutorial-coupled:set-grid}@*/
-SET_TYPE_PROP(TutorialProblemCoupled, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-coupled:set-gridcreator}@*/
+SET_TYPE_PROP(TutorialProblemCoupled, GridCreator, Ewoms::CubeGridCreator<TypeTag>); /*@\label{tutorial-coupled:set-gridcreator}@*/

 // Set the wetting phase /*@\label{tutorial-coupled:2p-system-start}@*/
 SET_TYPE_PROP(TutorialProblemCoupled, WettingPhase,   /*@\label{tutorial-coupled:wettingPhase}@*/
-              Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
-                                 Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+              Ewoms::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+                                 Ewoms::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);

 // Set the non-wetting phase
 SET_TYPE_PROP(TutorialProblemCoupled, NonwettingPhase,  /*@\label{tutorial-coupled:nonwettingPhase}@*/
-              Dumux::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
-              Dumux::LNAPL<typename GET_PROP_TYPE(TypeTag, Scalar)> >);  /*@\label{tutorial-coupled:2p-system-end}@*/
+              Ewoms::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+              Ewoms::LNAPL<typename GET_PROP_TYPE(TypeTag, Scalar)> >);  /*@\label{tutorial-coupled:2p-system-end}@*/

 // Set the material law
 SET_PROP(TutorialProblemCoupled, MaterialLaw)
@@ -268,6 +268,6 @@ private:
    // small epsilon value
    Scalar eps_;
 };
-} // namespace Dumux
+} // namespace Ewoms

 #endif
--- a/examples/tutorialproblem_decoupled.hh
+++ b/examples/tutorialproblem_decoupled.hh
@@ -22,34 +22,34 @@
 /*!
 * \file
 *
- * \copydoc Dumux::TutorialProblemDecoupled
+ * \copydoc Ewoms::TutorialProblemDecoupled
 */
-#ifndef DUMUX_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian1}@*/
-#define DUMUX_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian2}@*/
+#ifndef EWOMS_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian1}@*/
+#define EWOMS_TUTORIALPROBLEM_DECOUPLED_HH // guardian macro /*@\label{tutorial-decoupled:guardian2}@*/

 // assign parameters dependent on space (e.g. spatial parameters)
 #include "tutorialspatialparams_decoupled.hh" /*@\label{tutorial-decoupled:spatialparameters}@*/

-// dumux 2p-decoupled environment
-#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
-#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
-#include <dumux/decoupled/2p/impes/impesproblem2p.hh> /*@\label{tutorial-decoupled:parent-problem}@*/
+// eWoms includes
+#include <ewoms/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
+#include <ewoms/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
+#include <ewoms/decoupled/2p/impes/impesproblem2p.hh> /*@\label{tutorial-decoupled:parent-problem}@*/

 // include cfl-criterion after coats: more suitable if the problem is not advection dominated
-#include<dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh>
+#include<ewoms/decoupled/2p/transport/fv/evalcflfluxcoats.hh>

 // the components that are used
-#include <dumux/material/components/h2o.hh>
-#include <dumux/material/components/lnapl.hh>
+#include <ewoms/material/components/h2o.hh>
+#include <ewoms/material/components/lnapl.hh>

 // the grid includes
-#include <dumux/common/cubegridcreator.hh>
+#include <ewoms/common/cubegridcreator.hh>
 #include <dune/grid/yaspgrid.hh>

 // provides Dune::FieldVector
 #include <dune/common/fvector.hh>

-namespace Dumux {
+namespace Ewoms {

 template<class TypeTag>
 class TutorialProblemDecoupled;
@@ -64,13 +64,13 @@ NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransport
 // Set the problem property
 SET_TYPE_PROP(TutorialProblemDecoupled, /*@\label{tutorial-decoupled:set-problem}@*/
              Problem,
-              Dumux::TutorialProblemDecoupled<TypeTag>);
+              Ewoms::TutorialProblemDecoupled<TypeTag>);

 // Set the grid type
 SET_TYPE_PROP(TutorialProblemDecoupled, Grid, Dune::YaspGrid<2>); /*@\label{tutorial-decoupled:set-grid-type}@*/

 //Set the grid creator
-SET_TYPE_PROP(TutorialProblemDecoupled, GridCreator, Dumux::CubeGridCreator<TypeTag>); /*@\label{tutorial-decoupled:set-gridcreator}@*/
+SET_TYPE_PROP(TutorialProblemDecoupled, GridCreator, Ewoms::CubeGridCreator<TypeTag>); /*@\label{tutorial-decoupled:set-gridcreator}@*/

 // Set the wetting phase
 SET_PROP(TutorialProblemDecoupled, WettingPhase) /*@\label{tutorial-decoupled:2p-system-start}@*/
@@ -78,7 +78,7 @@ SET_PROP(TutorialProblemDecoupled, WettingPhase) /*@\label{tutorial-decoupled:2p
 private:
    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 public:
-    typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-decoupled:wettingPhase}@*/
+    typedef Ewoms::LiquidPhase<Scalar, Ewoms::H2O<Scalar> > type; /*@\label{tutorial-decoupled:wettingPhase}@*/
 };

 // Set the non-wetting phase
@@ -87,10 +87,10 @@ SET_PROP(TutorialProblemDecoupled, NonwettingPhase)
 private:
    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
 public:
-    typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-decoupled:nonwettingPhase}@*/
+    typedef Ewoms::LiquidPhase<Scalar, Ewoms::LNAPL<Scalar> > type; /*@\label{tutorial-decoupled:nonwettingPhase}@*/
 }; /*@\label{tutorial-decoupled:2p-system-end}@*/

-SET_TYPE_PROP(TutorialProblemDecoupled, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-decoupled:cflflux}@*/
+SET_TYPE_PROP(TutorialProblemDecoupled, EvalCflFluxFunction, Ewoms::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-decoupled:cflflux}@*/
 SET_SCALAR_PROP(TutorialProblemDecoupled, ImpetCflFactor, 0.95); /*@\label{tutorial-decoupled:cflfactor}@*/

 // Disable gravity
--- a/examples/tutorialspatialparams_decoupled.hh
+++ b/examples/tutorialspatialparams_decoupled.hh
@@ -21,20 +21,20 @@
 *****************************************************************************/
 /*!
 * \file
- * \copydoc Dumux::TutorialSpatialParamsDecoupled
+ * \copydoc Ewoms::TutorialSpatialParamsDecoupled
 */
-#ifndef DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
-#define DUMUX_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
+#ifndef EWOMS_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH
+#define EWOMS_TUTORIAL_SPATIAL_PARAMETERS_DECOUPLED_HH

-#include <dumux/decoupled/spatialparams/fvspatialparams.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+#include <ewoms/decoupled/spatialparams/fvspatialparams.hh>
+#include <ewoms/material/fluidmatrixinteractions/2p/linearmaterial.hh>
+#include <ewoms/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
+#include <ewoms/material/fluidmatrixinteractions/2p/efftoabslaw.hh>

 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>

-namespace Dumux
+namespace Ewoms
 {

 //forward declaration
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(TutorialSpatialParamsDecoupled);

 // Set the spatial parameters
 SET_TYPE_PROP(TutorialSpatialParamsDecoupled, SpatialParams,
-        Dumux::TutorialSpatialParamsDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/
+        Ewoms::TutorialSpatialParamsDecoupled<TypeTag>); /*@\label{tutorial-decoupled:set-spatialparameters}@*/

 // Set the material law
 SET_PROP(TutorialSpatialParamsDecoupled, MaterialLaw)