diff --git a/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh b/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
index adf156cbbb905a69e8e7dc4fb3aeecd8357c4317..ce5b73e0bc2804d1e6592517d2c792e4537152c2 100644
--- a/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
+++ b/appl/lecture/msm/1p2cvs2p/lensproblem1p2c.hh
@@ -73,7 +73,7 @@ SET_PROP(LensProblem1p2c, FluidSystem)
{private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
public:
- typedef Dumux::WaterContaminantFluidSystem<Scalar> type;
+ typedef Dumux::FluidSystems::WaterContaminant<Scalar> type;
};
// Set the spatial parameters
diff --git a/appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh b/appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh
index 3eae55ca4f169650d559b4265ee2e87a19efd336..016c339a8442287dc421a41a55d20bb822c83e1b 100644
--- a/appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh
+++ b/appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh
@@ -42,14 +42,17 @@
namespace Dumux
{
+namespace FluidSystems
+{
+
/*!
* \brief A fluid system with one phase and an arbitrary number of components.
*/
template <class Scalar>
-class WaterContaminantFluidSystem
-: public BaseFluidSystem<Scalar, WaterContaminantFluidSystem<Scalar> >
+class WaterContaminant
+: public BaseFluidSystem<Scalar, WaterContaminant<Scalar> >
{
- typedef WaterContaminantFluidSystem<Scalar> ThisType;
+ typedef WaterContaminant<Scalar> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
public:
@@ -349,6 +352,7 @@ public:
};
+} // end namepace
} // end namepace
#endif
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index 76ac293fc893b20e3a83a6d2f2da0dc0ce0a7b50..5faf882b1e363e96921a1a5d91c7f20542c494f0 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -82,7 +82,7 @@ SET_PROP(BoxOneP, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
public:
- typedef OnePFluidSystem<Scalar, Fluid> type;
+ typedef FluidSystems::OneP<Scalar, Fluid> type;
};
SET_PROP(BoxOneP, Fluid)
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index c9378eade0029d6819d422ed1362d305b43c6aec..d087493b8e4e8d67ffe98dc56a5cde22a8fee6a0 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -110,9 +110,9 @@ SET_PROP(BoxTwoP, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonWettingPhase)) NonWettingPhase;
public:
- typedef Dumux::TwoPImmiscibleFluidSystem<Scalar,
- WettingPhase,
- NonWettingPhase> type;
+ typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ WettingPhase,
+ NonWettingPhase> type;
};
SET_PROP(BoxTwoP, FluidState)
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index c1a2cce40c590443a858c651b23db7d4b85de74a..01bf85b22f149404636737105f300e9c803ee65c 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -140,9 +140,9 @@ SET_PROP(BoxRichards, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonWettingPhase)) NonWettingPhase;
public:
- typedef Dumux::TwoPImmiscibleFluidSystem<Scalar,
- WettingPhase,
- NonWettingPhase> type;
+ typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ WettingPhase,
+ NonWettingPhase> type;
};
// \}
diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh
index 56332f50e73b3f686be457ad6fc7d0f14d6aea25..b2305564aefe562d53759a7aa352a266e24fc20e 100644
--- a/dumux/material/fluidsystems/1pfluidsystem.hh
+++ b/dumux/material/fluidsystems/1pfluidsystem.hh
@@ -33,6 +33,8 @@
#include "basefluidsystem.hh"
namespace Dumux {
+namespace FluidSystems {
+
/*!
* \ingroup Fluidsystems
*
@@ -43,10 +45,10 @@ namespace Dumux {
* Dumux::GasPhase<Component> may be used.
*/
template <class Scalar, class Fluid>
-class OnePFluidSystem
-: public BaseFluidSystem<Scalar, OnePFluidSystem<Scalar, Fluid> >
+class OneP
+ : public BaseFluidSystem<Scalar, OneP<Scalar, Fluid> >
{
- typedef OnePFluidSystem<Scalar, Fluid> ThisType;
+ typedef OneP<Scalar, Fluid> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
public:
@@ -376,6 +378,7 @@ public:
};
+} // end namepace
} // end namepace
#endif
diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
index 2556a6b1887d746bd6ab384961753ba93e51a7bc..823ab30e77e9c6606ad2a54f6d39addf0221c62a 100644
--- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
+++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
@@ -39,6 +39,7 @@
#include "basefluidsystem.hh"
namespace Dumux {
+namespace FluidSystems {
/*!
* \ingroup Fluidsystems
@@ -54,14 +55,14 @@ namespace Dumux {
* systems without compositional effects.
*/
template <class Scalar, class WettingPhase, class NonWettingPhase>
-class TwoPImmiscibleFluidSystem
-: public BaseFluidSystem<Scalar, TwoPImmiscibleFluidSystem<Scalar, WettingPhase, NonWettingPhase> >
+class TwoPImmiscible
+: public BaseFluidSystem<Scalar, TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase> >
{
// do not try to instanciate this class, it has only static members!
- TwoPImmiscibleFluidSystem()
+ TwoPImmiscible()
{}
- typedef TwoPImmiscibleFluidSystem<Scalar, WettingPhase, NonWettingPhase> ThisType;
+ typedef TwoPImmiscible<Scalar, WettingPhase, NonWettingPhase> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
public:
/****************************************
@@ -403,6 +404,7 @@ public:
}
};
+} // end namepace
} // end namepace
#endif
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index e3d15762216caa498e6ff6f58520e509ed5e233f..d52bfb9b87886ff8568b960230320edad3854bfb 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -40,14 +40,17 @@
namespace Dumux
{
+namespace FluidSystems
+{
+
/*!
* \brief A twophase fluid system with water and nitrogen as components.
*/
template <class Scalar, bool useComplexRelations = true>
-class H2ON2FluidSystem
-: public BaseFluidSystem<Scalar, H2ON2FluidSystem<Scalar, useComplexRelations> >
+class H2ON2
+: public BaseFluidSystem<Scalar, H2ON2<Scalar, useComplexRelations> >
{
- typedef H2ON2FluidSystem<Scalar, useComplexRelations> ThisType;
+ typedef H2ON2<Scalar, useComplexRelations> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
// convenience typedefs
@@ -286,9 +289,9 @@ public:
Scalar pressMin, Scalar pressMax, unsigned nPress)
{
if (useComplexRelations)
- Dune::dwarn << "using complex H2O_N2 FluidSystem: Viscosity depends on composition" << std::endl;
+ Dune::dwarn << "using complex H2O_N2 fluid system: Viscosity depends on composition" << std::endl;
else
- Dune::dwarn << "using fast H2O_N2 FluidSystem: Viscosity does not depend on composition" << std::endl;
+ Dune::dwarn << "using fast H2O_N2 fluid system: Viscosity does not depend on composition" << std::endl;
if (H2O::isTabulated) {
std::cout << "Initializing tables for the H2O fluid properties ("
@@ -645,6 +648,7 @@ public:
}
};
-} // end namepace
+} // end namepace FluidSystems
+} // end namepace Dumux
#endif
diff --git a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
index f6e2b4911b574ae1a44af01dce39bc2d7f4f96e9..17a3073c4aa7f926c98113b05ebe24844d613b61 100644
--- a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
+++ b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
@@ -34,6 +34,8 @@
namespace Dumux
{
+namespace FluidSystems
+{
/*!
* \ingroup Fluidsystems
@@ -47,10 +49,10 @@ namespace Dumux
* used in conjunction the 1p2c model.
*/
template <class Scalar>
-class InterstitialFluidTrailFluidSystem
-: public BaseFluidSystem<Scalar, InterstitialFluidTrailFluidSystem<Scalar> >
+class InterstitialFluidTrail
+: public BaseFluidSystem<Scalar, InterstitialFluidTrail<Scalar> >
{
- typedef InterstitialFluidTrailFluidSystem<Scalar> ThisType;
+ typedef InterstitialFluidTrail<Scalar> ThisType;
typedef BaseFluidSystem<Scalar, ThisType> Base;
public:
@@ -353,6 +355,7 @@ public:
};
};
+} // end namepace
} // end namepace
#endif
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index c637c909227a16229a3710576df025e6812a6151..ead3552e6a1dfdcd1d542159d1d5cb170e8702b6 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -71,7 +71,7 @@ SET_PROP(TissueTumorProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
public:
- typedef Dumux::InterstitialFluidTrailFluidSystem<Scalar> type;
+ typedef Dumux::FluidSystems::InterstitialFluidTrail<Scalar> type;
};
// Set the spatial parameters
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 918d48d5ac13cc03c6b8fed967c3b08647fd4310..e2a02db166d86eaa5d0a7c9171d59be585a42d20 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -87,7 +87,7 @@ public:
};
#else
// OR: set the fluid system
-SET_TYPE_PROP(LensProblem, FluidSystem, H2ON2FluidSystem<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar))>);
+SET_TYPE_PROP(LensProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar))>);
#endif
// Enable partial reassembly of the jacobian matrix?
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index 7c7f220450eff6a5ed7ef497aa535f00d738dee9..4e817f3b1165fa4b655b6c859909cf31dace4977 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -62,7 +62,7 @@ SET_PROP(InjectionProblem, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
static const bool useComplexRelations = false;
public:
- typedef Dumux::H2ON2FluidSystem<Scalar, useComplexRelations> type;
+ typedef Dumux::FluidSystems::H2ON2<Scalar, useComplexRelations> type;
};
// Enable gravity
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index c9ba845333820cd1689a0f24f9a0eadc1da535a1..c33bdaade14d4378f564d263e63c2b30e07cc919 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -61,7 +61,7 @@ SET_PROP(WaterAirProblem, Problem)
};
// Set the wetting phase
-SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::H2ON2FluidSystem<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
+SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
// Enable gravity
SET_BOOL_PROP(WaterAirProblem, EnableGravity, true);
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index 9623caece992bc1e5e20fed17ff2d25d4f62228d..2f78475cef62662f031df6f02fecd072492983e1 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -75,7 +75,7 @@ SET_PROP(InjectionProblem2PNI, Problem)
#if 1
// Use the same fluid system as the 2p2c injection problem
-SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, H2ON2FluidSystem<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
+SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
#else
// Set the wetting phase
SET_PROP(InjectionProblem2PNI, WettingPhase)
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index 96781a70516e083bf42f0885ab0ff2723cd7bc55..1be95223b8f9ce0ba68091743037d0992f7d0cd5 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -67,7 +67,7 @@ SET_PROP(ObstacleProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
public:
- typedef Dumux::H2ON2FluidSystem<Scalar, /*useComplexRelations=*/false> type;
+ typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
};
// Dumux::Simple_H2O_N2_TCE_System<TypeTag> );
//Dumux::H2O_N2_System<TypeTag> );
diff --git a/test/material/ncpflash/test_ncpflash.cc b/test/material/ncpflash/test_ncpflash.cc
index e527057df0e6dfea1e24f026f0d9d125d6cdb7ff..8f2bd0b834401e4b8471d7b728d12134ad45d97c 100644
--- a/test/material/ncpflash/test_ncpflash.cc
+++ b/test/material/ncpflash/test_ncpflash.cc
@@ -152,7 +152,7 @@ void completeReferenceFluidState(FluidState &fs,
int main()
{
typedef double Scalar;
- typedef Dumux::H2ON2FluidSystem<Scalar> FluidSystem;
+ typedef Dumux::FluidSystems::H2ON2<Scalar> FluidSystem;
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> CompositionalFluidState;
enum { numPhases = FluidSystem::numPhases };