diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index 1e46316d6b59064137c3fe360994a0c528cb879f..19051ecf44da7176247232f3d755b3c9557b7ee7 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -148,13 +148,13 @@ SET_STRING_PROP(NumericModel, ModelParameterGroup, "");
SET_STRING_PROP(NumericModel, GridParameterGroup, "Grid");
//! Use the DgfGridCreator by default
-SET_TYPE_PROP(NumericModel, GridCreator, Dumux::GridCreator<TypeTag>);
+SET_TYPE_PROP(NumericModel, GridCreator, GridCreator<TypeTag>);
//! Use the minimal point source implementation as default
-SET_TYPE_PROP(NumericModel, PointSource, Dumux::PointSource<TypeTag>);
+SET_TYPE_PROP(NumericModel, PointSource, PointSource<TypeTag>);
//! Use the point source helper using the bounding box tree as a default
-SET_TYPE_PROP(NumericModel, PointSourceHelper, Dumux::BoundingBoxTreePointSourceHelper<TypeTag>);
+SET_TYPE_PROP(NumericModel, PointSourceHelper, BoundingBoxTreePointSourceHelper<TypeTag>);
//! Set default output level to 0 -> only primary variables are added to output
SET_INT_PROP(NumericModel, VtkOutputLevel, 0);
@@ -165,7 +165,7 @@ SET_PROP(NumericModel, VtkMultiWriter)
private:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- typedef typename Dumux::VtkMultiWriter<GridView> type;
+ typedef VtkMultiWriter<GridView> type;
};
} // namespace Properties
diff --git a/dumux/common/boundingboxtree.hh b/dumux/common/boundingboxtree.hh
index 50de581baf63007c9dc152a24814403dd24f6236..51d1c7b8936ce364135d007d917c8752d5405d22 100644
--- a/dumux/common/boundingboxtree.hh
+++ b/dumux/common/boundingboxtree.hh
@@ -216,7 +216,7 @@ public:
const GlobalPosition v3 = *p[(i + 3)%4] - *p[i];
const GlobalPosition v = point - *p[i];
// compute the normal to the facet (cross product)
- GlobalPosition n1 = Dumux::crossProduct(v1, v2);
+ GlobalPosition n1 = crossProduct(v1, v2);
n1 /= n1.two_norm();
// find out on which side of the plane v and v3 are
const double t1 = n1.dot(v);
@@ -245,7 +245,7 @@ public:
const GlobalPosition v = point - p0;
// compute the normal of the triangle
- const GlobalPosition n = Dumux::crossProduct(v1, v2);
+ const GlobalPosition n = crossProduct(v1, v2);
// first check if we are in the plane of the triangle
// if not we can return early
@@ -256,15 +256,15 @@ public:
// compute the normal to the triangle made of point and first edge
// the dot product of this normal and the triangle normal has to
// be positive because we defined the edges in the right orientation
- const GlobalPosition n1 = Dumux::crossProduct(v, v1);
+ const GlobalPosition n1 = crossProduct(v, v1);
const double t1 = n.dot(n1);
if (t1 < 0) return false;
- const GlobalPosition n2 = Dumux::crossProduct(v, v2);
+ const GlobalPosition n2 = crossProduct(v, v2);
const double t2 = n.dot(n2);
if (t2 < 0) return false;
- const GlobalPosition n3 = Dumux::crossProduct(v, v3);
+ const GlobalPosition n3 = crossProduct(v, v3);
const double t3 = n.dot(n3);
if (t3 < 0) return false;
@@ -291,7 +291,7 @@ public:
return false;
// if the cross product is zero the points are on a line
- const GlobalPosition n = Dumux::crossProduct(v1, v2);
+ const GlobalPosition n = crossProduct(v1, v2);
// early return if the vector length is larger than zero
if (n.two_norm() > v1norm*eps_)
@@ -537,7 +537,7 @@ public:
return false;
// if the cross product is zero the points are on a line
- const double n = Dumux::crossProduct(v1, v2);
+ const double n = crossProduct(v1, v2);
// early return if the cross product is larger than zero
if (n > v1norm*eps_)
@@ -930,7 +930,7 @@ public:
//! Compute all intersections between entities and another bounding box tree
template<class OtherGridView>
std::vector<BoundingBoxTreeIntersection<GridView, OtherGridView>>
- computeEntityCollisions(const Dumux::BoundingBoxTree<OtherGridView>& otherTree) const
+ computeEntityCollisions(const BoundingBoxTree<OtherGridView>& otherTree) const
{
// check if the world dimensions match
static_assert(dimworld == OtherGridView::dimensionworld, "Can only collide bounding box trees of same world dimension");
@@ -1056,7 +1056,7 @@ private:
//! Compute collisions with other bounding box tree recursively
template <class OtherGridView>
- void computeCollisions_(const Dumux::BoundingBoxTree<OtherGridView>& treeB,
+ void computeCollisions_(const BoundingBoxTree<OtherGridView>& treeB,
unsigned int nodeA,
unsigned int nodeB,
std::vector<BoundingBoxTreeIntersection<GridView, OtherGridView>>& intersections) const
@@ -1087,7 +1087,7 @@ private:
auto geometryA = treeA.entity(eIdxA).geometry();
auto geometryB = treeB.entity(eIdxB).geometry();
- using CollisionType = Dumux::GeometryCollision<decltype(geometryA), decltype(geometryB)>;
+ using CollisionType = GeometryCollision<decltype(geometryA), decltype(geometryB)>;
std::vector<GlobalPosition> intersection;
if (CollisionType::collide(geometryA, geometryB, intersection))
intersections.emplace_back(eIdxA, eIdxB, std::move(intersection));
diff --git a/dumux/common/geometrycollision.hh b/dumux/common/geometrycollision.hh
index a7d5e1823e8252d4dcce5f2dd3ed41f2d88a33b7..44d7bc7002322a3e8707a3922edaf8006c06ff75 100644
--- a/dumux/common/geometrycollision.hh
+++ b/dumux/common/geometrycollision.hh
@@ -117,7 +117,7 @@ public:
const auto v1 = geo1.corner(f[2]) - geo1.corner(f[0]);
const auto eps = eps_*v0.two_norm();
- auto n = Dumux::crossProduct(v0, v1);
+ auto n = crossProduct(v0, v1);
n /= n.two_norm();
const Scalar denom = n*d;
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index fdefd276b7ce3213769a15e2252bb4b3b7bf76c4..a60dcb545b743e8b6651ecc8be6dcb61b050f85d 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -168,9 +168,9 @@ private:
* \brief A point source class with an identifier to attach data
*/
template<class TypeTag, typename IdType>
-class IdPointSource : public Dumux::PointSource<TypeTag>
+class IdPointSource : public PointSource<TypeTag>
{
- typedef typename Dumux::PointSource<TypeTag> ParentType;
+ typedef PointSource<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
@@ -215,9 +215,9 @@ private:
* \brief A point source class for time dependent point sources
*/
template<class TypeTag>
-class TimeDependentPointSource : public Dumux::PointSource<TypeTag>
+class TimeDependentPointSource : public PointSource<TypeTag>
{
- typedef typename Dumux::PointSource<TypeTag> ParentType;
+ typedef PointSource<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
diff --git a/dumux/common/splinecommon_.hh b/dumux/common/splinecommon_.hh
index e0475bbf757a130ae06d226ac0199370a2a3759b..c02c972017a8450a93b359e54bfa52750f8c114b 100644
--- a/dumux/common/splinecommon_.hh
+++ b/dumux/common/splinecommon_.hh
@@ -585,7 +585,7 @@ protected:
Scalar a, Scalar b, Scalar c, Scalar d,
Scalar x0 = -1e100, Scalar x1 = 1e100) const
{
- int n = Dumux::invertCubicPolynomial(sol,
+ int n = invertCubicPolynomial(sol,
a_(segIdx) - a,
b_(segIdx) - b,
c_(segIdx) - c,
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 94b238278145014242b8a86eaf1d601045b99e2c..13ca485f0a5835322891556e3821156ebdc921a7 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -410,7 +410,7 @@ int start_(int argc,
printProps = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, TimeManager, PrintProperties);
if (printProps && mpiHelper.rank() == 0) {
- Dumux::Properties::print<TypeTag>();
+ Properties::print<TypeTag>();
}
// deal with the restart stuff
@@ -470,7 +470,7 @@ int start_(int argc,
dumuxMessage_(false);
if (printParams && mpiHelper.rank() == 0) {
- Dumux::Parameters::print<TypeTag>();
+ Parameters::print<TypeTag>();
}
// check if a deprecated TypeTag has been used
@@ -509,8 +509,8 @@ int start(int argc,
try {
return start_<TypeTag>(argc, argv, usage);
}
- catch (Dumux::ParameterException &e) {
- Dumux::Parameters::print<TypeTag>();
+ catch (ParameterException &e) {
+ Parameters::print<TypeTag>();
std::cerr << e << ". Abort!\n";
return 1;
}
diff --git a/dumux/freeflow/stokes/propertydefaults.hh b/dumux/freeflow/stokes/propertydefaults.hh
index 310947b58b2e9a1965426464c828d564cada0e10..10014fb585a0a54360330a9204e0b9a6429f6cae 100644
--- a/dumux/freeflow/stokes/propertydefaults.hh
+++ b/dumux/freeflow/stokes/propertydefaults.hh
@@ -58,7 +58,7 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! The local jacobian operator for the stokes box scheme
-SET_TYPE_PROP(BoxStokes, LocalJacobian, Dumux::StokesLocalJacobian<TypeTag>);
+SET_TYPE_PROP(BoxStokes, LocalJacobian, StokesLocalJacobian<TypeTag>);
SET_PROP(BoxStokes, NumEq) //!< set the number of equations
{
@@ -108,7 +108,7 @@ SET_PROP(BoxStokes, Fluid)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
//! Set the indices used by the Stokes model
@@ -120,7 +120,7 @@ SET_PROP(BoxStokes, FluidState)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
};
diff --git a/dumux/freeflow/stokesnc/fluxvariables.hh b/dumux/freeflow/stokesnc/fluxvariables.hh
index 429293f5c42fedcf24d41e7d98368170e80fdd25..501bbef858460d4e2a1b1331b05880c41d0cb291 100644
--- a/dumux/freeflow/stokesnc/fluxvariables.hh
+++ b/dumux/freeflow/stokesnc/fluxvariables.hh
@@ -48,7 +48,7 @@ template <class TypeTag>
class StokesncFluxVariables : public StokesFluxVariables<TypeTag>
{
friend class StokesFluxVariables<TypeTag>; // be friends with parent
- typedef Dumux::StokesFluxVariables<TypeTag> ParentType;
+ typedef StokesFluxVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/freeflow/stokesnc/propertydefaults.hh b/dumux/freeflow/stokesnc/propertydefaults.hh
index 18ae0971b55ab02a7ea0d909af79517414f99c7b..ef2fabe2e2d17412616d263ef0349c0d17971fb1 100644
--- a/dumux/freeflow/stokesnc/propertydefaults.hh
+++ b/dumux/freeflow/stokesnc/propertydefaults.hh
@@ -84,7 +84,7 @@ SET_PROP(BoxStokesnc, FluidState)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Choose the considered phase (single-phase system); the gas phase is used
diff --git a/dumux/freeflow/zeroeq/problem.hh b/dumux/freeflow/zeroeq/problem.hh
index 2692e6367835b2e7e4d30a38fd8efaea4219a4e9..07488b0977f6c371396b2f8dcf70ed25748ca6e1 100644
--- a/dumux/freeflow/zeroeq/problem.hh
+++ b/dumux/freeflow/zeroeq/problem.hh
@@ -51,7 +51,7 @@ public:
{ }
/*!
- * \brief Called by the Dumux::TimeManager in order to initialize the problem.
+ * \brief Called by the TimeManager in order to initialize the problem.
*
* If you overload this method don't forget to call ParentType::init().<br>
* This initializes all wall-related properties, which are necessary for the
diff --git a/dumux/geomechanics/el1p2c/fluxvariables.hh b/dumux/geomechanics/el1p2c/fluxvariables.hh
index 66d263bf375d3dc16ac12faec2236860cd71ca1e..c9821265116df84eaa1b52ac12ee59e3cd5659f6 100644
--- a/dumux/geomechanics/el1p2c/fluxvariables.hh
+++ b/dumux/geomechanics/el1p2c/fluxvariables.hh
@@ -56,8 +56,8 @@ class ElOnePTwoCFluxVariables: public ElasticFluxVariablesBase<TypeTag> ,
friend class ElasticFluxVariablesBase<TypeTag>; // be friends with parents
friend class OnePTwoCFluxVariables<TypeTag>; // be friends with parents
- typedef Dumux::ElasticFluxVariablesBase<TypeTag> ElasticBase;
- typedef Dumux::OnePTwoCFluxVariables<TypeTag> OnePTwoCBase;
+ typedef ElasticFluxVariablesBase<TypeTag> ElasticBase;
+ typedef OnePTwoCFluxVariables<TypeTag> OnePTwoCBase;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
diff --git a/dumux/geomechanics/el1p2c/propertydefaults.hh b/dumux/geomechanics/el1p2c/propertydefaults.hh
index 987a6cff3523c6107349d7c1f07bf5b2db2900e8..373a2fe316b3bfa33d6c36ffccb6d2d80f5f5de8 100644
--- a/dumux/geomechanics/el1p2c/propertydefaults.hh
+++ b/dumux/geomechanics/el1p2c/propertydefaults.hh
@@ -80,10 +80,10 @@ SET_TYPE_PROP(BoxElasticOnePTwoC,
SET_TYPE_PROP(BoxElasticOnePTwoC, Model, ElOnePTwoCModel<TypeTag>);
//! define the ElementVolumeVariables
-SET_TYPE_PROP(BoxElasticOnePTwoC, ElementVolumeVariables, Dumux::ElOnePTwoCElementVolumeVariables<TypeTag>);
+SET_TYPE_PROP(BoxElasticOnePTwoC, ElementVolumeVariables, ElOnePTwoCElementVolumeVariables<TypeTag>);
//! define the VolumeVariables
-SET_TYPE_PROP(BoxElasticOnePTwoC, VolumeVariables, Dumux::ElOnePTwoCVolumeVariables<TypeTag>);
+SET_TYPE_PROP(BoxElasticOnePTwoC, VolumeVariables, ElOnePTwoCVolumeVariables<TypeTag>);
//! define the FluxVariables
SET_TYPE_PROP(BoxElasticOnePTwoC, FluxVariables, ElOnePTwoCFluxVariables<TypeTag>);
@@ -99,7 +99,7 @@ SET_PROP(BoxElasticOnePTwoC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! set default upwind weights to 1.0, i.e. fully upwind
diff --git a/dumux/geomechanics/el2p/fluxvariables.hh b/dumux/geomechanics/el2p/fluxvariables.hh
index b28e077f0fd3269d7883c46c11ff665b3dd9690c..b4bc43e83c9b8961cb831f3063c051dfa8cdcfa1 100644
--- a/dumux/geomechanics/el2p/fluxvariables.hh
+++ b/dumux/geomechanics/el2p/fluxvariables.hh
@@ -59,7 +59,7 @@ template<class TypeTag>
class ElTwoPFluxVariables: public ImplicitDarcyFluxVariables<TypeTag>
{
friend class ImplicitDarcyFluxVariables<TypeTag>; // be friends with parent
- typedef Dumux::ImplicitDarcyFluxVariables<TypeTag> ParentType;
+ typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
diff --git a/dumux/geomechanics/el2p/localoperator.hh b/dumux/geomechanics/el2p/localoperator.hh
index 15107987ff2bc0ccfe8851a5236d96a95b0873a4..acd7cb90af1a7cc292abb4f552b91eb15db03c7b 100644
--- a/dumux/geomechanics/el2p/localoperator.hh
+++ b/dumux/geomechanics/el2p/localoperator.hh
@@ -306,7 +306,7 @@ public:
// assume deformation induced porosity changes
if(model_.problem().coupled() == true){
if (porosity + uDiv < 1e-3*porosity){
- DUNE_THROW(Dumux::NumericalProblem, "volume change too large");
+ DUNE_THROW(NumericalProblem, "volume change too large");
}
else
// this equation would be correct if the bulk volume could change (Vol_new = Vol_init * (1+div u)), however, we
diff --git a/dumux/geomechanics/el2p/newtoncontroller.hh b/dumux/geomechanics/el2p/newtoncontroller.hh
index c1e5febb3519f75e7172c1c9c353eba4e07cb7f8..fef843b5aa3464f43571fecc7c55ba7ab324b327 100644
--- a/dumux/geomechanics/el2p/newtoncontroller.hh
+++ b/dumux/geomechanics/el2p/newtoncontroller.hh
@@ -91,7 +91,7 @@ public:
/*!
* \brief Solve the linear system of equations \f$\mathbf{A}x - b = 0\f$.
*
- * Throws Dumux::NumericalProblem if the linear solver didn't
+ * Throws NumericalProblem if the linear solver didn't
* converge.
*
* \param A The matrix of the linear system of equations
@@ -138,7 +138,7 @@ public:
if (this->gridView_().comm().size() > 1)
converged = this->gridView_().comm().min(converged);
- Dumux::NumericalProblem p;
+ NumericalProblem p;
std::string msg;
std::ostringstream ms(msg);
ms << e.what() << "M=" << A.base()[e.r][e.c];
@@ -151,7 +151,7 @@ public:
if (this->gridView_().comm().size() > 1)
converged = this->gridView_().comm().min(converged);
- Dumux::NumericalProblem p;
+ NumericalProblem p;
p.message(e.what());
throw p;
}
diff --git a/dumux/geomechanics/el2p/propertydefaults.hh b/dumux/geomechanics/el2p/propertydefaults.hh
index ed0234067bd7153dbdb2fe86d55328f2ad318c7c..251008ce06e0a98914dc4c8d4038441fee61175b 100644
--- a/dumux/geomechanics/el2p/propertydefaults.hh
+++ b/dumux/geomechanics/el2p/propertydefaults.hh
@@ -93,7 +93,7 @@ SET_TYPE_PROP(BoxElasticTwoP, Model, ElTwoPModel<TypeTag>);
/*!
* \brief An array of secondary variable containers.
*/
-SET_TYPE_PROP(BoxElasticTwoP, ElementVolumeVariables, Dumux::ElTwoPElementVolumeVariables<TypeTag>);
+SET_TYPE_PROP(BoxElasticTwoP, ElementVolumeVariables, ElTwoPElementVolumeVariables<TypeTag>);
//! the VolumeVariables property
SET_TYPE_PROP(BoxElasticTwoP, VolumeVariables, ElTwoPVolumeVariables<TypeTag>);
@@ -145,17 +145,17 @@ SET_PROP(BoxElasticTwoP, EffectivePermeabilityModel)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::PermeabilityRutqvistTsang<Scalar> type;
+ typedef PermeabilityRutqvistTsang<Scalar> type;
};
-// SET_TYPE_PROP(BoxElasticTwoP, EffectivePermeabilityModel, Dumux::PermeabilityRutqvistTsang<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Gridview)::dimension>);
+// SET_TYPE_PROP(BoxElasticTwoP, EffectivePermeabilityModel, PermeabilityRutqvistTsang<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Gridview)::dimension>);
// use the SuperLU linear solver by default
#if HAVE_SUPERLU
-SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, Dumux::SuperLUBackend<TypeTag> );
+SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, SuperLUBackend<TypeTag> );
#else
#warning no SuperLU detected, defaulting to ILU0BiCGSTAB. For many problems, the el2p model requires a direct solver.
-SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
#endif
// set the grid operator
@@ -315,20 +315,20 @@ public:
// set the grid function space for the sub-models
SET_TYPE_PROP(BoxElasticTwoP, Constraints, Dune::PDELab::NoConstraints);
-SET_TYPE_PROP(BoxElasticTwoP, JacobianAssembler, Dumux::PDELab::El2PAssembler<TypeTag>);
+SET_TYPE_PROP(BoxElasticTwoP, JacobianAssembler, PDELab::El2PAssembler<TypeTag>);
SET_PROP(BoxElasticTwoP, WettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(BoxElasticTwoP, NonwettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(BoxElasticTwoP, FluidSystem)
@@ -338,7 +338,7 @@ SET_PROP(BoxElasticTwoP, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
- typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ typedef FluidSystems::TwoPImmiscible<Scalar,
WettingPhase,
NonwettingPhase> type;
};
@@ -361,7 +361,7 @@ SET_TYPE_PROP(BoxElasticTwoP, NewtonController, ElTwoPNewtonController<TypeTag>)
SET_PROP(BoxElasticTwoP, LocalOperator)
{
- typedef Dumux::PDELab::El2PLocalOperator<TypeTag> type;
+ typedef PDELab::El2PLocalOperator<TypeTag> type;
};
//! use the local FEM space associated with cubes by default
@@ -426,7 +426,7 @@ public:
};
//! The local jacobian operator
-SET_TYPE_PROP(BoxElasticTwoP, LocalJacobian, Dumux::ElTwoPLocalJacobian<TypeTag>);
+SET_TYPE_PROP(BoxElasticTwoP, LocalJacobian, ElTwoPLocalJacobian<TypeTag>);
SET_TYPE_PROP(BoxElasticTwoP, BaseModel, ElTwoPBaseModel<TypeTag>);
diff --git a/dumux/implicit/assembler.hh b/dumux/implicit/assembler.hh
index 5a414bbde71a56fbc3240e9c5df5d438533fb757..b2ab1c8f5277dbf8865c3e2a6d3c029e1cb7e5ad 100644
--- a/dumux/implicit/assembler.hh
+++ b/dumux/implicit/assembler.hh
@@ -167,7 +167,7 @@ public:
if (gridView_().comm().size() > 1)
succeeded = gridView_().comm().min(succeeded);
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "rank " << problem_().gridView().comm().rank()
<< " caught an exception while assembling:" << e.what()
diff --git a/dumux/implicit/box/propertydefaults.hh b/dumux/implicit/box/propertydefaults.hh
index 2d6f8c2d77f6536c74be1af3e93cf7c73aa8f5e3..9a970a7e7fc4ba07de2aa53871daa00d3dc74079 100644
--- a/dumux/implicit/box/propertydefaults.hh
+++ b/dumux/implicit/box/propertydefaults.hh
@@ -48,7 +48,7 @@ template<class TypeTag> class BoxFVElementGeometry;
namespace Properties {
//! Set the default for the FVElementGeometry
-SET_TYPE_PROP(BoxModel, FVElementGeometry, Dumux::BoxFVElementGeometry<TypeTag>);
+SET_TYPE_PROP(BoxModel, FVElementGeometry, BoxFVElementGeometry<TypeTag>);
//! Disable evaluation of shape function gradients at the sub-control volume center by default
// The shape function gradients at the sub-control volume center are currently only
@@ -56,19 +56,19 @@ SET_TYPE_PROP(BoxModel, FVElementGeometry, Dumux::BoxFVElementGeometry<TypeTag>)
SET_BOOL_PROP(BoxModel, EvalGradientsAtSCVCenter, false);
//! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(BoxModel, ElementBoundaryTypes, Dumux::BoxElementBoundaryTypes<TypeTag>);
+SET_TYPE_PROP(BoxModel, ElementBoundaryTypes, BoxElementBoundaryTypes<TypeTag>);
//! Mapper for the degrees of freedoms.
SET_TYPE_PROP(BoxModel, DofMapper, typename GET_PROP_TYPE(TypeTag, VertexMapper));
//! Set the BaseLocalResidual to BoxLocalResidual
-SET_TYPE_PROP(BoxModel, BaseLocalResidual, Dumux::BoxLocalResidual<TypeTag>);
+SET_TYPE_PROP(BoxModel, BaseLocalResidual, BoxLocalResidual<TypeTag>);
//! An array of secondary variable containers
-SET_TYPE_PROP(BoxModel, ElementVolumeVariables, Dumux::BoxElementVolumeVariables<TypeTag>);
+SET_TYPE_PROP(BoxModel, ElementVolumeVariables, BoxElementVolumeVariables<TypeTag>);
//! Assembler for the global jacobian matrix
-SET_TYPE_PROP(BoxModel, JacobianAssembler, Dumux::BoxAssembler<TypeTag>);
+SET_TYPE_PROP(BoxModel, JacobianAssembler, BoxAssembler<TypeTag>);
//! disable two-point-flux by default
SET_BOOL_PROP(BoxModel, ImplicitUseTwoPointFlux, false);
diff --git a/dumux/implicit/cellcentered/propertydefaults.hh b/dumux/implicit/cellcentered/propertydefaults.hh
index d55d931eae46117edc04f65ee0162841503414ff..162aba12786523466f18c31cf83635ce424b119a 100644
--- a/dumux/implicit/cellcentered/propertydefaults.hh
+++ b/dumux/implicit/cellcentered/propertydefaults.hh
@@ -49,22 +49,22 @@ template<class TypeTag> class CCFVElementGeometry;
namespace Properties {
//! Set the default for the FVElementGeometry
-SET_TYPE_PROP(CCModel, FVElementGeometry, Dumux::CCFVElementGeometry<TypeTag>);
+SET_TYPE_PROP(CCModel, FVElementGeometry, CCFVElementGeometry<TypeTag>);
//! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(CCModel, ElementBoundaryTypes, Dumux::CCElementBoundaryTypes<TypeTag>);
+SET_TYPE_PROP(CCModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
//! Mapper for the degrees of freedoms.
SET_TYPE_PROP(CCModel, DofMapper, typename GET_PROP_TYPE(TypeTag, ElementMapper));
//! Set the BaseLocalResidual to CCLocalResidual
-SET_TYPE_PROP(CCModel, BaseLocalResidual, Dumux::CCLocalResidual<TypeTag>);
+SET_TYPE_PROP(CCModel, BaseLocalResidual, CCLocalResidual<TypeTag>);
//! An array of secondary variable containers
-SET_TYPE_PROP(CCModel, ElementVolumeVariables, Dumux::CCElementVolumeVariables<TypeTag>);
+SET_TYPE_PROP(CCModel, ElementVolumeVariables, CCElementVolumeVariables<TypeTag>);
//! Assembler for the global jacobian matrix
-SET_TYPE_PROP(CCModel, JacobianAssembler, Dumux::CCAssembler<TypeTag>);
+SET_TYPE_PROP(CCModel, JacobianAssembler, CCAssembler<TypeTag>);
//! indicate that this is no box discretization
SET_BOOL_PROP(CCModel, ImplicitIsBox, false);
diff --git a/dumux/implicit/localjacobian.hh b/dumux/implicit/localjacobian.hh
index 709079444af86e2ae8d4fea01cf42c8383f51674..4ba53f954b9386f13cfb224e592c6182307612d6 100644
--- a/dumux/implicit/localjacobian.hh
+++ b/dumux/implicit/localjacobian.hh
@@ -284,7 +284,7 @@ public:
// the base epsilon is thus approximately 10^-8.
/*
static const Scalar baseEps
- = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ = geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
*/
static const Scalar baseEps = 1e-10;
assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
diff --git a/dumux/implicit/problem.hh b/dumux/implicit/problem.hh
index ab77a23d81bfdb59b94fdfa731a997eebfae6f9b..763a7d53f92bdc3a1d10a584ee6c6dfb59ccbed4 100644
--- a/dumux/implicit/problem.hh
+++ b/dumux/implicit/problem.hh
@@ -134,7 +134,7 @@ public:
}
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*
* If you overload this method don't forget to call
@@ -437,7 +437,7 @@ public:
* \brief Applies a vector of point sources. The point sources
* are possibly solution dependent.
*
- * \param pointSources A vector of Dumux::PointSource s that contain
+ * \param pointSources A vector of PointSource s that contain
source values for all phases and space positions.
*
* For this method, the \a values method of the point source
@@ -594,7 +594,7 @@ public:
}
/*!
- * \brief Called by Dumux::TimeManager in order to do a time
+ * \brief Called by TimeManager in order to do a time
* integration on the model.
*/
void timeIntegration()
@@ -664,7 +664,7 @@ public:
{ return newtonCtl_; }
/*!
- * \brief Called by Dumux::TimeManager whenever a solution for a
+ * \brief Called by TimeManager whenever a solution for a
* time step has been computed and the simulation time has
* been updated.
*
@@ -875,11 +875,11 @@ public:
* The file will start with the prefix returned by the name()
* method, has the current time of the simulation clock in it's
* name and uses the extension <tt>.drs</tt>. (Dumux ReStart
- * file.) See Dumux::Restart for details.
+ * file.) See Restart for details.
*/
void serialize()
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.serializeBegin(asImp_());
if (gridView().comm().rank() == 0)
@@ -897,7 +897,7 @@ public:
* The file will start with the prefix returned by the name()
* method, has the current time of the simulation clock in it's
* name and uses the extension <tt>.drs</tt>. (Dumux ReStart
- * file.) See Dumux::Restart for details.
+ * file.) See Restart for details.
*
* \tparam Restarter The serializer type
*
@@ -920,7 +920,7 @@ public:
*/
void restart(const Scalar tRestart)
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
@@ -1052,7 +1052,7 @@ public:
{
// Note: two concepts are implemented here. The PointSource property can be set to a
// customized point source function achieving variable point sources,
- // see Dumux::TimeDependentPointSource for an example. The second imitated the standard
+ // see TimeDependentPointSource for an example. The second imitated the standard
// dumux source interface with solDependentPointSource / pointSourceAtPos, methods
// that can be overloaded in the actual problem class also achieving variable point sources.
// The first one is more convenient for simple function like a time dependent source.
@@ -1105,7 +1105,7 @@ protected:
createResultWriter_();
return *resultWriter_;
}
- //! \copydoc Dumux::IMPETProblem::resultWriter()
+ //! \copydoc IMPETProblem::resultWriter()
VtkMultiWriter& resultWriter() const
{
createResultWriter_();
diff --git a/dumux/implicit/propertydefaults.hh b/dumux/implicit/propertydefaults.hh
index 9537be8433e63c1e7a8990b8b75b75f22a740f66..2b89a546b97179c05a29551396c2f92a6c7fcc0d 100644
--- a/dumux/implicit/propertydefaults.hh
+++ b/dumux/implicit/propertydefaults.hh
@@ -52,7 +52,7 @@ namespace Properties {
//////////////////////////////////////////////////////////////////
//! Set the default type for the time manager
-SET_TYPE_PROP(ImplicitBase, TimeManager, Dumux::TimeManager<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, TimeManager, TimeManager<TypeTag>);
//////////////////////////////////////////////////////////////////
// Properties
@@ -64,10 +64,10 @@ SET_TYPE_PROP(ImplicitBase,
typename GET_PROP_TYPE(TypeTag, Grid)::LeafGridView);
//! use the plain newton method by default
-SET_TYPE_PROP(ImplicitBase, NewtonMethod, Dumux::NewtonMethod<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, NewtonMethod, NewtonMethod<TypeTag>);
//! use the plain newton controller by default
-SET_TYPE_PROP(ImplicitBase, NewtonController, Dumux::NewtonController<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, NewtonController, NewtonController<TypeTag>);
//! Mapper for the grid view's vertices.
SET_TYPE_PROP(ImplicitBase,
@@ -82,13 +82,13 @@ SET_TYPE_PROP(ImplicitBase,
Dune::MCMGElementLayout>);
//! Set the BaseModel to ImplicitModel
-SET_TYPE_PROP(ImplicitBase, BaseModel, Dumux::ImplicitModel<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, BaseModel, ImplicitModel<TypeTag>);
//! The volume variable class, to be overloaded by the model
-SET_TYPE_PROP(ImplicitBase, VolumeVariables, Dumux::ImplicitVolumeVariables<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, VolumeVariables, ImplicitVolumeVariables<TypeTag>);
//! The local jacobian operator
-SET_TYPE_PROP(ImplicitBase, LocalJacobian, Dumux::ImplicitLocalJacobian<TypeTag>);
+SET_TYPE_PROP(ImplicitBase, LocalJacobian, ImplicitLocalJacobian<TypeTag>);
//! The type of a solution for the whole grid at a fixed time
SET_TYPE_PROP(ImplicitBase,
@@ -109,7 +109,7 @@ SET_TYPE_PROP(ImplicitBase,
//! Boundary types at a single degree of freedom
SET_TYPE_PROP(ImplicitBase,
BoundaryTypes,
- Dumux::BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
+ BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
//! use forward differences to calculate the jacobian by default
SET_INT_PROP(ImplicitBase, ImplicitNumericDifferenceMethod, +1);
@@ -135,7 +135,7 @@ public:
};
//! use the stabilized BiCG solver preconditioned by the ILU-0 by default
-SET_TYPE_PROP(ImplicitBase, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(ImplicitBase, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
// if the deflection of the newton method is large, we do not
// need to solve the linear approximation accurately. Assuming
diff --git a/dumux/io/adaptivegridrestart.hh b/dumux/io/adaptivegridrestart.hh
index 80b846d1065b10d49c5e9d22b92acd44abb8ccc3..1823c9452d3ec4134be7e4cd70b3fe4bc15fe9b4 100644
--- a/dumux/io/adaptivegridrestart.hh
+++ b/dumux/io/adaptivegridrestart.hh
@@ -132,7 +132,7 @@ private:
std::string name = GET_RUNTIME_PARAM_FROM_GROUP(TTAG(NumericModel), std::string, Problem, Name);
oss << name;
}
- catch (Dumux::ParameterException &e)
+ catch (ParameterException &e)
{
std::cerr << e.what() << std::endl;
std::cerr << "Taking name from problem.name(): " << problem.name() << std::endl;
diff --git a/dumux/io/artgridcreator.hh b/dumux/io/artgridcreator.hh
index 94b2f8b990d106859553f5bf8b64cd0a0f149fa3..1cde782284d9dc53eb6bbd40dbc7d1a368b46fca 100644
--- a/dumux/io/artgridcreator.hh
+++ b/dumux/io/artgridcreator.hh
@@ -76,7 +76,7 @@ public:
bool verbose = false;
try { verbose = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Grid, Verbosity);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
if (verbose)
std::cout << "Opening " << artFileName << std::endl;
@@ -477,11 +477,11 @@ private:
};
template <class TypeTag>
-typename Dumux::ArtGridCreator<TypeTag>::VerticesVector ArtGridCreator<TypeTag>::vertices_;
+typename ArtGridCreator<TypeTag>::VerticesVector ArtGridCreator<TypeTag>::vertices_;
template <class TypeTag>
-typename Dumux::ArtGridCreator<TypeTag>::EdgesVector ArtGridCreator<TypeTag>::edges_;
+typename ArtGridCreator<TypeTag>::EdgesVector ArtGridCreator<TypeTag>::edges_;
template <class TypeTag>
-typename Dumux::ArtGridCreator<TypeTag>::FacesVector ArtGridCreator<TypeTag>::faces_;
+typename ArtGridCreator<TypeTag>::FacesVector ArtGridCreator<TypeTag>::faces_;
template <class TypeTag>
int ArtGridCreator<TypeTag>::vertexNumber_;
template <class TypeTag>
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index 41bd2b2d5e9fb31a2bfc1d6c683554da8cd50a5e..e9546a399479a492c0b2c0e5d8ac36516ee71040 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -241,15 +241,15 @@ protected:
// get some optional parameters
bool verbose = false;
try { verbose = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Verbosity);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
bool boundarySegments = false;
try { boundarySegments = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), BoundarySegments);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
bool domainMarkers = false;
try { domainMarkers = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), DomainMarkers);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
if(domainMarkers)
{
@@ -295,13 +295,13 @@ protected:
// The optional parameters (they have a default)
GlobalPosition lowerLeft(0.0);
try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
typedef std::array<unsigned int, dim> CellArray;
CellArray cells;
std::fill(cells.begin(), cells.end(), 1);
try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
// make the grid
if (cellType == CellType::Cube)
@@ -323,7 +323,7 @@ protected:
const int level = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Refinement);
grid().globalRefine(level);
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
}
@@ -408,7 +408,7 @@ public:
static const int isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
int overlap = isBox ? 0 : 1;
try { overlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Overlap);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
if (isBox && overlap != 0)
DUNE_THROW(Dune::NotImplemented, "Parallel overlapping grids for box models.");
@@ -425,7 +425,7 @@ public:
{
int overlap = 1;
try { overlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Overlap);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
return overlap;
}
@@ -468,7 +468,7 @@ public:
postProcessing_();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
@@ -482,12 +482,12 @@ public:
CellArray cells;
std::fill(cells.begin(), cells.end(), 1);
try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
typedef std::bitset<dim> BitSet;
BitSet periodic;
try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
// get the overlap dependent on some template parameters
int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
@@ -495,7 +495,7 @@ public:
bool default_lb = false;
CellArray partitioning;
try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (Dumux::ParameterException &e) { default_lb = true; }
+ catch (ParameterException &e) { default_lb = true; }
//make the grid
if (default_lb)
@@ -507,8 +507,8 @@ public:
}
postProcessing_();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameter "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameter "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
@@ -524,7 +524,7 @@ private:
// Check if should refine the grid
bool keepPhysicalOverlap = true;
try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
ParentType::grid().refineOptions(keepPhysicalOverlap);
ParentType::maybeRefineGrid();
}
@@ -570,18 +570,18 @@ public:
// The optional parameters (they have a default)
GlobalPosition lowerLeft(0.0);
try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
typedef std::array<int, dim> CellArray;
CellArray cells;
std::fill(cells.begin(), cells.end(), 1);
try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
typedef std::bitset<dim> BitSet;
BitSet periodic;
try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
// the default is dependent on the discretization
int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
@@ -589,7 +589,7 @@ public:
bool default_lb = false;
CellArray partitioning;
try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (Dumux::ParameterException &e) { default_lb = true; }
+ catch (ParameterException &e) { default_lb = true; }
//make the grid
if (default_lb)
@@ -601,8 +601,8 @@ public:
}
postProcessing_();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
@@ -618,7 +618,7 @@ private:
// Check if should refine the grid
bool keepPhysicalOverlap = true;
try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
ParentType::grid().refineOptions(keepPhysicalOverlap);
ParentType::maybeRefineGrid();
}
@@ -692,7 +692,7 @@ public:
paramName += ".Cells";
paramName += std::to_string(i);
try { cells[i] = GET_RUNTIME_PARAM_CSTRING(TypeTag, IntVector, paramName.c_str()); }
- catch (Dumux::ParameterException &e) { cells[i].resize(positions[i].size()-1, 1.0); }
+ catch (ParameterException &e) { cells[i].resize(positions[i].size()-1, 1.0); }
}
// grading factor (has a default)
@@ -703,14 +703,14 @@ public:
paramName += ".Grading";
paramName += std::to_string(i);
try { grading[i] = GET_RUNTIME_PARAM_CSTRING(TypeTag, ScalarVector, paramName.c_str()); }
- catch (Dumux::ParameterException &e) { grading[i].resize(positions[i].size()-1, 1.0); }
+ catch (ParameterException &e) { grading[i].resize(positions[i].size()-1, 1.0); }
}
// The optional parameters (they have a default)
typedef std::bitset<dim> BitSet;
BitSet periodic;
try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
// the default is dependent on the discretization
int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
@@ -719,13 +719,13 @@ public:
typedef std::array<int, dim> CellArray;
CellArray partitioning;
try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (Dumux::ParameterException &e) { default_lb = true; }
+ catch (ParameterException &e) { default_lb = true; }
//make the grid
// sanity check of the input parameters
bool verbose = false;
try { verbose = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Verbosity);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
for (unsigned int dimIdx = 0; dimIdx < dim; ++dimIdx)
{
@@ -850,8 +850,8 @@ public:
}
postProcessing_();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters:" << std::endl
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters:" << std::endl
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".Positions0, ..." << std::endl);
}
catch (...) { throw; }
@@ -866,7 +866,7 @@ private:
// Check if should refine the grid
bool keepPhysicalOverlap = true;
try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
ParentType::grid().refineOptions(keepPhysicalOverlap);
ParentType::maybeRefineGrid();
}
@@ -905,7 +905,7 @@ public:
postProcessing_();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Look for the necessary keys to construct from the input file
@@ -918,12 +918,12 @@ public:
// The optional parameters
int cells = 1;
try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells);}
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
ParentType::gridPtr() = std::make_shared<Grid>(cells, leftBoundary, rightBoundary);
postProcessing_();
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Look for the necessary keys to construct from the input file with just a coordinates vector
@@ -935,8 +935,8 @@ public:
ParentType::gridPtr() = std::make_shared<Grid>(coordinates);
postProcessing_();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".LeftBoundary, "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".RightBoundary or "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".Coordinates or a grid file in "
@@ -957,7 +957,7 @@ private:
if (refType != "Local" && refType != "Copy")
DUNE_THROW(Dune::IOError, "OneGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
if (refType == "Local")
@@ -1011,7 +1011,7 @@ public:
postProcessing_();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
@@ -1023,7 +1023,7 @@ public:
if (cellType != "Cube" && cellType != "Simplex")
DUNE_THROW(Dune::IOError, "UGGrid only supports 'Cube' or 'Simplex' as cell type. Not '"<< cellType<<"'!");
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// make the grid
@@ -1033,8 +1033,8 @@ public:
ParentType::template makeStructuredGrid<dim, dim>(ParentType::CellType::Simplex);
postProcessing_();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
@@ -1050,7 +1050,7 @@ private:
bool setDefaultHeapSize = true;
unsigned defaultHeapSize;
try { defaultHeapSize = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, unsigned, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), HeapSize);}
- catch (Dumux::ParameterException &e) { setDefaultHeapSize = false; }
+ catch (ParameterException &e) { setDefaultHeapSize = false; }
if(setDefaultHeapSize)
Grid::setDefaultHeapSize(defaultHeapSize);
@@ -1067,7 +1067,7 @@ private:
if (refType != "Local" && refType != "Copy")
DUNE_THROW(Dune::IOError, "UGGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
if (refType == "Local")
@@ -1081,7 +1081,7 @@ private:
if (closureType != "None" && closureType != "Green")
DUNE_THROW(Dune::IOError, "UGGrid only supports 'Green' or 'None' as closure type. Not '"<< closureType<<"'!");
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
if (closureType == "Green")
@@ -1147,7 +1147,7 @@ public:
ParentType::gridPtr() = std::shared_ptr<Grid>(Dune::BackupRestoreFacility<Grid>::restore(oss.str()));
return;
}
- catch (Dumux::ParameterException &e)
+ catch (ParameterException &e)
{
std::cerr << e.what() << std::endl;
std::cerr << "Restart functionality for an adaptive grid requested, but failed." << std::endl;
@@ -1156,7 +1156,7 @@ public:
}
}
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
#endif
@@ -1167,7 +1167,7 @@ public:
ParentType::maybeRefineGrid();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
@@ -1179,8 +1179,8 @@ public:
ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex);
ParentType::maybeRefineGrid();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
@@ -1226,7 +1226,7 @@ public:
ParentType::maybeRefineGrid();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Then look for the necessary keys to construct a structured grid from the input file
@@ -1234,8 +1234,8 @@ public:
ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex);
ParentType::maybeRefineGrid();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
@@ -1277,7 +1277,7 @@ public:
ParentType::maybeRefineGrid();
return;
}
- catch (Dumux::ParameterException &e) {}
+ catch (ParameterException &e) {}
catch (...) { throw; }
// Then look for the necessary keys to construct a structured grid from the input file
@@ -1289,13 +1289,13 @@ public:
// The optional parameters (they have a default)
GlobalPosition lowerLeft(0.0);
try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
typedef std::array<unsigned int, 1> CellArray;
CellArray cells;
std::fill(cells.begin(), cells.end(), 1);
try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (Dumux::ParameterException &e) { }
+ catch (ParameterException &e) { }
// make the grid (structured interval grid in dimworld space)
Dune::GridFactory<Grid> factory;
@@ -1317,8 +1317,8 @@ public:
ParentType::gridPtr() = std::shared_ptr<Grid>(factory.createGrid());
ParentType::maybeRefineGrid();
}
- catch (Dumux::ParameterException &e) {
- DUNE_THROW(Dumux::ParameterException, "Please supply the mandatory parameters "
+ catch (ParameterException &e) {
+ DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
<< GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
}
diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh
index 4d36442d9675721a91bf7c2701ccdfa61a110a9a..d47f398ca84c240f67180f093d50b2c2d79d3308 100644
--- a/dumux/io/plotthermalconductivitymodel.hh
+++ b/dumux/io/plotthermalconductivitymodel.hh
@@ -51,7 +51,7 @@ class PlotThermalConductivityModel
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
+ typedef CompositionalFluidState<Scalar, FluidSystem> FluidState;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
diff --git a/dumux/io/restart.hh b/dumux/io/restart.hh
index 366b8b0020a5923a8884e5663b72a73b678fa2b8..cd1fc50fa0fbb69d9a4b24a059c12f609b55754e 100644
--- a/dumux/io/restart.hh
+++ b/dumux/io/restart.hh
@@ -282,7 +282,7 @@ public:
const std::string directory=".")
{
DUNE_THROW(Dune::NotImplemented,
- "Dumux::Restart::restartFileList()");
+ "Restart::restartFileList()");
}
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index daa16eee3565f19e096ea2cbd23640bfc4f99ce7..cb7597643f129578d7e8fa2c0e49250915f45203 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -173,7 +173,7 @@ public:
sanitizeBuffer_(buf, nComps);
using FunctionPtr = std::shared_ptr<const typename VtkWriter::VTKFunction>;
- typedef Dumux::VtkNestedFunction<GridView, VertexMapper, DataBuffer> VtkFn;
+ typedef VtkNestedFunction<GridView, VertexMapper, DataBuffer> VtkFn;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
vertexMapper_,
@@ -204,7 +204,7 @@ public:
sanitizeBuffer_(buf, nComps);
using FunctionPtr = std::shared_ptr<const typename VtkWriter::VTKFunction>;
- typedef Dumux::VtkNestedFunction<GridView, ElementMapper, DataBuffer> VtkFn;
+ typedef VtkNestedFunction<GridView, ElementMapper, DataBuffer> VtkFn;
FunctionPtr fnPtr(new VtkFn(name,
gridView_,
elementMapper_,
diff --git a/dumux/material/binarycoefficients/h2o_o2.hh b/dumux/material/binarycoefficients/h2o_o2.hh
index c4519a63e9fe34335fed6970c233fbb4879fc90e..08fe72df381f420790e5689b08395ddf8ebd1711 100644
--- a/dumux/material/binarycoefficients/h2o_o2.hh
+++ b/dumux/material/binarycoefficients/h2o_o2.hh
@@ -68,7 +68,7 @@ public:
static Scalar gasDiffCoeff(Scalar temperature, Scalar pressure)
{
typedef Dumux::H2O<Scalar> H2O;
- typedef Dumux::O2<Scalar> O2;
+ typedef O2<Scalar> O2;
// atomic diffusion volumes
const Scalar SigmaNu[2] = { 13.1 /* H2O */, 16.3 /* O2 */ };
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 3fde11b2a550ed58361a86f3b807f9a47562866a..3d1f4592b14401d1fd398eed83f2517522724d67 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -55,7 +55,7 @@ enum ElectroChemistryModel { Ochs, Acosta };
* This class calculates source terms and current densities for fuel cells
* with the electrochemical models suggested by Ochs (2008) \cite ochs2008 or Acosta et al. (2006) \cite A3:acosta:2006
*/
-template <class TypeTag, Dumux::ElectroChemistryModel electroChemistryModel>
+template <class TypeTag, ElectroChemistryModel electroChemistryModel>
class ElectroChemistry
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -66,7 +66,7 @@ class ElectroChemistry
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef Dumux::Constants<Scalar> Constant;
+ typedef Constants<Scalar> Constant;
typedef ElectroChemistry<TypeTag, electroChemistryModel> ThisType;
@@ -194,7 +194,7 @@ public:
if(iterations >= maxIter)
{
- DUNE_THROW(Dumux::NumericalProblem, "Newton solver for electrochemistry didn't converge");
+ DUNE_THROW(NumericalProblem, "Newton solver for electrochemistry didn't converge");
}
}
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index 8f4c29b4337e608e0d159d44881ffbf168ff3548..e6b1d4cdf3b8dc6bf5008e8a48612167ef8897b0 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -46,7 +46,7 @@ NEW_PROP_TAG(PrimaryVariables);
* with the electrochemical models suggested by Ochs (2008) \cite ochs2008 or Acosta (2006) \cite A3:acosta:2006
* for the non-isothermal case
*/
-template <class TypeTag, Dumux::ElectroChemistryModel electroChemistryModel>
+template <class TypeTag, ElectroChemistryModel electroChemistryModel>
class ElectroChemistryNI : public ElectroChemistry<TypeTag, electroChemistryModel>
{
typedef ElectroChemistry<TypeTag, electroChemistryModel> ParentType;
@@ -57,7 +57,7 @@ class ElectroChemistryNI : public ElectroChemistry<TypeTag, electroChemistryMode
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef Dumux::Constants<Scalar> Constant;
+ typedef Constants<Scalar> Constant;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index 0518520214aa756487f6d3d1cdc805937a314024..945b997bfc10d7796a4a8b82e1b91b58f1715190 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -155,7 +155,7 @@ public:
Scalar r;
if(temperature < 273.15 || temperature > 660.)
{
- DUNE_THROW(Dumux::NumericalProblem,
+ DUNE_THROW(NumericalProblem,
"simpleGasViscosity: Temperature out of range! (T = " << temperature << " K)");
}
r = 1.496*1.E-6*std::pow(temperature,1.5)/(temperature+120.);
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index 6dbb4b1ebbe43a044c5c2eed2f8c30cd0ba46291..3ec94c47a6cf6150e838cada7e8a6ce5d2b22734 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -46,12 +46,12 @@ namespace Dumux
* \tparam H2O Static polymorphism: the Brine class can access all properties of the H2O class
*/
template <class Scalar,
-class H2O_Tabulated = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar>>>
+class H2O_Tabulated = TabulatedComponent<Scalar, H2O<Scalar>>>
class Brine : public Component<Scalar, Brine<Scalar, H2O_Tabulated> >
{
public:
- typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar>> H2O;
+ typedef TabulatedComponent<Scalar, Dumux::H2O<Scalar>> H2O;
//HACK: If salinity is a pseudo-component, a constat value is used
static Scalar constantSalinity;
diff --git a/dumux/material/components/co2.hh b/dumux/material/components/co2.hh
index c217e12c9cb80ab204a94bb4a83cbd938adc7723..14b00c851cfa29e1c4908d3f6770c2f004d84e8b 100644
--- a/dumux/material/components/co2.hh
+++ b/dumux/material/components/co2.hh
@@ -43,13 +43,13 @@ namespace Dumux
* properties can be provided in tabulated form, which is necessary for this
* component implementation. The template is passed through the fluidsystem
* brineco2fluidsystem.hh
- * If only gaseous co2 is regarded, one can use Dumux::SimpleCO2 instead.
+ * If only gaseous co2 is regarded, one can use SimpleCO2 instead.
*/
template <class Scalar, class CO2Tables>
class CO2 : public Component<Scalar, CO2<Scalar, CO2Tables> >
{
static const Scalar R;
- typedef typename Dumux::IdealGas<Scalar> IdealGas;
+ typedef Dumux::IdealGas<Scalar> IdealGas;
static bool warningThrown;
diff --git a/dumux/material/components/iapws/common.hh b/dumux/material/components/iapws/common.hh
index 8fe5d2b3f250e2c0b926993b2e698f9b3936e530..78b42ddcd8e0e545ec4f6b8f1b09f2c09f242390 100644
--- a/dumux/material/components/iapws/common.hh
+++ b/dumux/material/components/iapws/common.hh
@@ -66,7 +66,7 @@ public:
static constexpr Scalar molarMass = 18.01518e-3;
//! Specific gas constant of water \f$\mathrm{[J/(kg*K)]}\f$
- static constexpr Scalar Rs = Dumux::Constants<Scalar>::R / molarMass;
+ static constexpr Scalar Rs = Constants<Scalar>::R / molarMass;
//! Critical temperature of water \f$\mathrm{[K]}\f$
static constexpr Scalar criticalTemperature = 647.096;
diff --git a/dumux/material/components/mesitylene.hh b/dumux/material/components/mesitylene.hh
index 76ee24cee07b6cc0b89986d733080bbe2ceb3575..2204685ef50da93a8e631272797b903f33a5e652 100644
--- a/dumux/material/components/mesitylene.hh
+++ b/dumux/material/components/mesitylene.hh
@@ -42,7 +42,7 @@ namespace Dumux
template <class Scalar>
class Mesitylene : public Component<Scalar, Mesitylene<Scalar> >
{
- typedef Dumux::Constants<Scalar> Consts;
+ typedef Constants<Scalar> Consts;
public:
/*!
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index f7962b684870d1204818c23d69f8237e5b4a39ea..7316c85d2b0b3aac8081166a296093531e0a8a64 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -305,7 +305,7 @@ public:
};
template <class Scalar>
-const Scalar SimpleH2O<Scalar>::R = Dumux::Constants<Scalar>::R / 18e-3;
+const Scalar SimpleH2O<Scalar>::R = Constants<Scalar>::R / 18e-3;
} // end namespace
diff --git a/dumux/material/constraintsolvers/compositionfromfugacities.hh b/dumux/material/constraintsolvers/compositionfromfugacities.hh
index 674aaa0d269f7d8648da55ce1bfadc716b1e2166..fa801fcce0a80bcdc076ca8dd3ebe7fed8bc55dd 100644
--- a/dumux/material/constraintsolvers/compositionfromfugacities.hh
+++ b/dumux/material/constraintsolvers/compositionfromfugacities.hh
@@ -140,7 +140,7 @@ public:
x = 0;
try { J.solve(x, b); }
catch (Dune::FMatrixError e)
- { throw Dumux::NumericalProblem(e.what()); }
+ { throw NumericalProblem(e.what()); }
//std::cout << "original delta: " << x << "\n";
diff --git a/dumux/material/constraintsolvers/immiscibleflash.hh b/dumux/material/constraintsolvers/immiscibleflash.hh
index cd42baff8faf28e6ba153b7be45426ec89707cf6..a5d234a8c78eabd0acfe158ab3eaa35c8e18cdd2 100644
--- a/dumux/material/constraintsolvers/immiscibleflash.hh
+++ b/dumux/material/constraintsolvers/immiscibleflash.hh
@@ -181,7 +181,7 @@ public:
std::cout << "b: " << b << "\n";
*/
- throw Dumux::NumericalProblem(e.what());
+ throw NumericalProblem(e.what());
}
Valgrind::CheckDefined(deltaX);
diff --git a/dumux/material/constraintsolvers/ncpflash.hh b/dumux/material/constraintsolvers/ncpflash.hh
index c13fd38274f430a2852fe72c4da3311a0f533199..8f9b7a4499b2670a605f7d0da6667e7ef0476ba1 100644
--- a/dumux/material/constraintsolvers/ncpflash.hh
+++ b/dumux/material/constraintsolvers/ncpflash.hh
@@ -203,7 +203,7 @@ public:
std::cout << "J: " << J << "\n";
*/
- throw Dumux::NumericalProblem(e.what());
+ throw NumericalProblem(e.what());
}
Valgrind::CheckDefined(deltaX);
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index cc4278f932653428a000501dfdfb787493afaaaf..e0cb23a160b96de51b7b88d681606cde4c742750 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -158,7 +158,7 @@ public:
Scalar a = params.a(phaseIdx); // "attractive factor"
Scalar b = params.b(phaseIdx); // "co-volume"
- Scalar RT = Dumux::Constants<Scalar>::R*T;
+ Scalar RT = Constants<Scalar>::R*T;
Scalar Astar = a*p/(RT*RT);
Scalar Bstar = b*p/RT;
@@ -233,7 +233,7 @@ public:
Scalar p = params.pressure();
Scalar Vm = params.molarVolume();
- Scalar RT = Dumux::Constants<Scalar>::R*T;
+ Scalar RT = Constants<Scalar>::R*T;
Scalar Z = p*Vm/RT;
Scalar Bstar = p*params.b() / RT;
@@ -368,7 +368,7 @@ protected:
Scalar u = 2;
Scalar w = -1;
- Scalar RT = Dumux::Constants<Scalar>::R*T;
+ Scalar RT = Constants<Scalar>::R*T;
// calculate coefficients of the 4th order polynominal in
// monomial basis
@@ -417,7 +417,7 @@ protected:
// invert resulting cubic polynomial analytically
Scalar allV[4];
allV[0] = V;
- int numSol = 1 + Dumux::invertCubicPolynomial(allV + 1, b1, b2, b3, b4);
+ int numSol = 1 + invertCubicPolynomial(allV + 1, b1, b2, b3, b4);
// sort all roots of the derivative
std::sort(allV + 0, allV + numSol);
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index 18f98b5b6729899d88e0552d78efd4059c9382c6..51170591bcfb5b3c6f12e1123a6c39b38a14255b 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -104,7 +104,7 @@ public:
Scalar bi_b = params.bPure(phaseIdx, compIdx) / params.b(phaseIdx);
// Calculate the compressibility factor
- Scalar RT = Dumux::Constants<Scalar>::R*fs.temperature(phaseIdx);
+ Scalar RT = Constants<Scalar>::R*fs.temperature(phaseIdx);
Scalar p = fs.pressure(phaseIdx); // molar volume in [bar]
Scalar Z = p*Vm/RT; // compressibility factor
diff --git a/dumux/material/eos/pengrobinsonparamsmixture.hh b/dumux/material/eos/pengrobinsonparamsmixture.hh
index 33b4652f1ae86e0d4c7f093b327ff313eeadeb8c..db585546a2f7193a6e487146b979a01ae3d6a384 100644
--- a/dumux/material/eos/pengrobinsonparamsmixture.hh
+++ b/dumux/material/eos/pengrobinsonparamsmixture.hh
@@ -65,7 +65,7 @@ class PengRobinsonParamsMixture
enum { numComponents = FluidSystem::numComponents };
// Peng-Robinson parameters for pure substances
- typedef Dumux::PengRobinsonParams<Scalar> PureParams;
+ typedef PengRobinsonParams<Scalar> PureParams;
public:
/*!
@@ -100,7 +100,7 @@ public:
Scalar pc = FluidSystem::criticalPressure(i);
Scalar omega = FluidSystem::acentricFactor(i);
Scalar Tr = temperature/FluidSystem::criticalTemperature(i);
- Scalar RTc = Dumux::Constants<Scalar>::R*FluidSystem::criticalTemperature(i);
+ Scalar RTc = Constants<Scalar>::R*FluidSystem::criticalTemperature(i);
Scalar f_omega;
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index 35c9bd6c007001bd43b13627fae3bdbca52770ac..3d170470e9d5e05f4e3acf5b1ac5121af02f1a5a 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -79,7 +79,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::pc()
+ * \copydetails BrooksCorey::pc()
*/
static Scalar pc(const Params ¶ms, Scalar swe)
{
@@ -119,7 +119,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::sw()
+ * \copydetails BrooksCorey::sw()
*/
static Scalar sw(const Params ¶ms, Scalar pc)
{
@@ -163,7 +163,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::dpc_dsw()
+ * \copydetails BrooksCorey::dpc_dsw()
*/
DUNE_DEPRECATED_MSG("dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead.")
static Scalar dpc_dsw(const Params ¶ms, Scalar swe)
@@ -183,7 +183,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::dpc_dswe()
+ * \copydetails BrooksCorey::dpc_dswe()
*/
static Scalar dpc_dswe(const Params ¶ms, Scalar swe)
{
@@ -216,7 +216,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::dsw_dpc()
+ * \copydetails BrooksCorey::dsw_dpc()
*/
DUNE_DEPRECATED_MSG("dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead.")
static Scalar dsw_dpc(const Params ¶ms, Scalar pc)
@@ -236,7 +236,7 @@ public:
*
* For the non-regularized part:
*
- * \copydetails Dumux::BrooksCorey::dswe_dpc()
+ * \copydetails BrooksCorey::dswe_dpc()
*/
static Scalar dswe_dpc(const Params ¶ms, Scalar pc)
{
@@ -283,7 +283,7 @@ public:
* - between \f$\mathrm{ 0.95 \leq \overline{S}_w \leq 1}\f$: use a spline as interpolation
*
* For not-regularized part:
- \copydetails Dumux::BrooksCorey::krw()
+ \copydetails BrooksCorey::krw()
*/
static Scalar krw(const Params ¶ms, Scalar swe)
{
@@ -306,7 +306,7 @@ public:
* - above \f$\mathrm{\overline{S}_w =1}\f$: set relative permeability to one
* - for \f$\mathrm{0 \leq \overline{S}_w \leq 0.05}\f$: use a spline as interpolation
*
- \copydetails Dumux::BrooksCorey::krn()
+ \copydetails BrooksCorey::krn()
*
*/
static Scalar krn(const Params ¶ms, Scalar swe)
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
index 25fc16eacb9d4a2626aeb9fceb82229452bb6d1b..050bc62f9a7decb3644f6a467032078ce377f8d0 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh
@@ -36,7 +36,7 @@ namespace Dumux
* \ingroup fluidmatrixinteractionsparams
*/
template <class ScalarT>
-class RegularizedBrooksCoreyParams : public Dumux::BrooksCoreyParams<ScalarT>
+class RegularizedBrooksCoreyParams : public BrooksCoreyParams<ScalarT>
{
typedef Dumux::BrooksCoreyParams<ScalarT> BrooksCoreyParams;
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index e13a04068ab492f390bc6a43a668fb56b4db6bf3..bf9133a399e611447a78ee1aa3ad259b75a6cb9a 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -88,7 +88,7 @@ public:
*
* For not-regularized part:
*
- \copydetails Dumux::VanGenuchten::pc()
+ \copydetails VanGenuchten::pc()
*/
static Scalar pc(const Params ¶ms, Scalar swe)
{
@@ -141,7 +141,7 @@ public:
*
* For not-regularized part:
*
- \copydetails Dumux::VanGenuchten::sw()
+ \copydetails VanGenuchten::sw()
*
*/
static Scalar sw(const Params ¶ms, Scalar pc)
@@ -199,7 +199,7 @@ public:
*
* For not-regularized part:
*
- \copydetails Dumux::VanGenuchten::dpc_dsw()
+ \copydetails VanGenuchten::dpc_dsw()
*
*/
DUNE_DEPRECATED_MSG("dpc_dsw(const Params ¶ms, Scalar swe) is deprecated. Use dpc_dswe(const Params ¶ms, Scalar swe) instead.")
@@ -220,7 +220,7 @@ public:
*
* For not-regularized part:
*
- \copydetails Dumux::VanGenuchten::dpc_dswe()
+ \copydetails VanGenuchten::dpc_dswe()
*
*/
static Scalar dpc_dswe(const Params ¶ms, Scalar swe)
@@ -249,7 +249,7 @@ public:
* by a straight line and use that slope (yes, there is a kink :-( ).
*
* For not-regularized part:
- \copydetails Dumux::VanGenuchten::dsw_dpc()
+ \copydetails VanGenuchten::dsw_dpc()
*/
DUNE_DEPRECATED_MSG("dsw_dpc(const Params ¶ms, Scalar pc) is deprecated. Use dswe_dpc(const Params ¶ms, Scalar pc) instead.")
static Scalar dsw_dpc(const Params ¶ms, Scalar pc)
@@ -268,7 +268,7 @@ public:
* by a straight line and use that slope (yes, there is a kink :-( ).
*
* For not-regularized part:
- \copydetails Dumux::VanGenuchten::dswe_dpc()
+ \copydetails VanGenuchten::dswe_dpc()
*/
static Scalar dswe_dpc(const Params ¶ms, Scalar pc)
{
@@ -306,7 +306,7 @@ public:
* - between \f$\mathrm{0.95 \leq \overline{S}_w \leq 1}\f$: use a spline as interpolation
*
* For not-regularized part:
- \copydetails Dumux::VanGenuchten::krw()
+ \copydetails VanGenuchten::krw()
*/
static Scalar krw(const Params ¶ms, Scalar swe)
{
@@ -341,7 +341,7 @@ public:
* - above \f$\mathrm{\overline{S}_w =1}\f$: set relative permeability to one
* - for \f$\mathrm{0 \leq \overline{S}_w \leq 0.05}\f$: use a spline as interpolation
*
- \copydetails Dumux::VanGenuchten::krn()
+ \copydetails VanGenuchten::krn()
*
*/
static Scalar krn(const Params ¶ms, Scalar swe)
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
index c4b6811b99e0d80f2b1ff269ae2c0b1fe3557858..ed2de421d4ff4eec6724600d5e70b4d0c47ad6f9 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchtenoftemperature.hh
@@ -40,7 +40,7 @@ namespace Dumux
* Everything except the capillary pressure is taken from the parent, i.e. Regularized VanGenuchten.
*/
template <class ScalarT, class ParamsT = RegularizedVanGenuchtenParams<ScalarT> >
-class RegularizedVanGenuchtenOfTemperature : public Dumux::RegularizedVanGenuchten<ScalarT, ParamsT>
+class RegularizedVanGenuchtenOfTemperature : public RegularizedVanGenuchten<ScalarT, ParamsT>
{
typedef Dumux::RegularizedVanGenuchten<ScalarT, ParamsT> RegularizedVanGenuchten;
// Data is in /home/pnuske/paper/pcOfT/
diff --git a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh
index 6f9a767439aeb43fce874726f25221e56b69d9b7..7ac4a59326fcc18858900c987284b490e336318b 100644
--- a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh
@@ -36,7 +36,7 @@ namespace Dumux
* \ingroup fluidmatrixinteractionsparams
*/
template <class ScalarT>
-class RegularizedParkerVanGen3PParams : public Dumux::ParkerVanGen3PParams<ScalarT>
+class RegularizedParkerVanGen3PParams : public ParkerVanGen3PParams<ScalarT>
{
typedef Dumux::ParkerVanGen3PParams<ScalarT> ParkerVanGen3PParams;
diff --git a/dumux/material/fluidstates/nonequilibrium.hh b/dumux/material/fluidstates/nonequilibrium.hh
index c5ff0033ea46c06c24e625b74c98013a3866d958..5289869f803b1c2eb7becc6add081937e2da59eb 100644
--- a/dumux/material/fluidstates/nonequilibrium.hh
+++ b/dumux/material/fluidstates/nonequilibrium.hh
@@ -68,20 +68,20 @@ public:
* on thermodynamic equilibrium required)
*****************************************************/
/*!
- * @copydoc Dumux::CompositionalFluidState::saturation()
+ * @copydoc CompositionalFluidState::saturation()
*/
Scalar saturation(int phaseIdx) const
{ return saturation_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::moleFraction()
+ * @copydoc CompositionalFluidState::moleFraction()
*/
Scalar moleFraction(int phaseIdx, int compIdx) const
{ return moleFraction_[phaseIdx][compIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::massFraction()
+ * @copydoc CompositionalFluidState::massFraction()
*/
Scalar massFraction(int phaseIdx, int compIdx) const
{
@@ -93,67 +93,67 @@ public:
}
/*!
- * @copydoc Dumux::CompositionalFluidState::averageMolarMass()
+ * @copydoc CompositionalFluidState::averageMolarMass()
*/
Scalar averageMolarMass(int phaseIdx) const
{ return averageMolarMass_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::molarity()
+ * @copydoc CompositionalFluidState::molarity()
*/
Scalar molarity(int phaseIdx, int compIdx) const
{ return molarDensity(phaseIdx)*moleFraction(phaseIdx, compIdx); }
/*!
- * @copydoc Dumux::CompositionalFluidState::fugacityCoefficient()
+ * @copydoc CompositionalFluidState::fugacityCoefficient()
*/
Scalar fugacityCoefficient(int phaseIdx, int compIdx) const
{ return fugacityCoefficient_[phaseIdx][compIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::fugacity()
+ * @copydoc CompositionalFluidState::fugacity()
*/
Scalar fugacity(int phaseIdx, int compIdx) const
{ return pressure_[phaseIdx]*fugacityCoefficient_[phaseIdx][compIdx]*moleFraction_[phaseIdx][compIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::molarVolume()
+ * @copydoc CompositionalFluidState::molarVolume()
*/
Scalar molarVolume(int phaseIdx) const
{ return 1/molarDensity(phaseIdx); }
/*!
- * @copydoc Dumux::CompositionalFluidState::density()
+ * @copydoc CompositionalFluidState::density()
*/
Scalar density(int phaseIdx) const
{ return density_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::molarDensity()
+ * @copydoc CompositionalFluidState::molarDensity()
*/
Scalar molarDensity(int phaseIdx) const
{ return density_[phaseIdx]/averageMolarMass(phaseIdx); }
/*!
- * @copydoc Dumux::CompositionalFluidState::temperature()
+ * @copydoc CompositionalFluidState::temperature()
*/
Scalar temperature(int phaseIdx) const
{ return temperature_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::pressure()
+ * @copydoc CompositionalFluidState::pressure()
*/
Scalar pressure(int phaseIdx) const
{ return pressure_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::enthalpy()
+ * @copydoc CompositionalFluidState::enthalpy()
*/
Scalar enthalpy(int phaseIdx) const
{ return enthalpy_[phaseIdx]; }
/*!
- * @copydoc Dumux::CompositionalFluidState::internalEnergy()
+ * @copydoc CompositionalFluidState::internalEnergy()
*/
Scalar internalEnergy(int phaseIdx) const
{
@@ -162,7 +162,7 @@ public:
}
/*!
- * @copydoc Dumux::CompositionalFluidState::viscosity()
+ * @copydoc CompositionalFluidState::viscosity()
*/
Scalar viscosity(int phaseIdx) const
{ return viscosity_[phaseIdx]; }
diff --git a/dumux/material/fluidstates/pseudo1p2c.hh b/dumux/material/fluidstates/pseudo1p2c.hh
index 3cb832e4c3ba347d3fd562e3e424ed034cd3ddf7..a964c37945b684cff378367ce26a05e1acedbf9c 100644
--- a/dumux/material/fluidstates/pseudo1p2c.hh
+++ b/dumux/material/fluidstates/pseudo1p2c.hh
@@ -37,7 +37,7 @@ namespace Dumux
* no information is stored but 0-values are returned to allow for general output
* methods.
* The "flash" calculation routines are in the sequential flash constrain solver, see
- * Dumux::CompositionalFlash .
+ * CompositionalFlash .
* \tparam TypeTag The property Type Tag
*/
template <class TypeTag>
diff --git a/dumux/material/fluidsystems/1p.hh b/dumux/material/fluidsystems/1p.hh
index 289824443446b521f6d642549b5be44ebd89d8d9..e012c776be8f44da26f3550e4871cd734730dc01 100644
--- a/dumux/material/fluidsystems/1p.hh
+++ b/dumux/material/fluidsystems/1p.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::OneP
+ * \brief @copybrief FluidSystems::OneP
*/
#ifndef DUMUX_1P_FLUIDSYSTEM_HH
#define DUMUX_1P_FLUIDSYSTEM_HH
@@ -52,8 +52,8 @@ namespace FluidSystems {
* \brief A fluid system for single phase models.
*
* The fluid is defined as a template parameter. For existing
- * components the Dumux::FluidSystems::LiquidPhase<Component> and
- * Dumux::FluidSystems::GasPhase<Component> may be used.
+ * components the FluidSystems::LiquidPhase<Component> and
+ * FluidSystems::GasPhase<Component> may be used.
*/
template <class Scalar, class Fluid>
class OneP
@@ -414,7 +414,7 @@ NEW_PROP_TAG(Fluid);
/*!
* \brief A pure single-phase fluid system.
*
- * This is an adapter to use Dumux::TwoPImmiscible<TypeTag>, as is
+ * This is an adapter to use TwoPImmiscible<TypeTag>, as is
* done with most other classes in Dumux and all template parameters
* are usually defined in the property system anyhow.
*/
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index 1c6d43d18f5d8d74b9bfe4c0a1b331b7ad400c0b..64d9cebb47544d2fa642a752f4cc8545093464a1 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::TwoPImmiscible
+ * \brief @copybrief FluidSystems::TwoPImmiscible
*/
#ifndef DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
#define DUMUX_2P_IMMISCIBLE_FLUID_SYSTEM_HH
@@ -47,12 +47,12 @@ namespace FluidSystems {
* The fluid phases are completely specified by means of their
* constituting components.
* The wetting and the non-wetting phase can be defined individually
- * via Dumux::FluidSystem::LiquidPhase<Component> and
- * Dumux::FluidSystem::GasPhase<Component>. These phases consist of one pure
+ * via FluidSystem::LiquidPhase<Component> and
+ * FluidSystem::GasPhase<Component>. These phases consist of one pure
* component. With the help of this adapter class, the phase
* properties can be accessed. This is suitable for pure two-phase
* systems without compositional effects.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*/
template <class Scalar, class WettingPhase, class NonwettingPhase>
@@ -453,7 +453,7 @@ NEW_PROP_TAG(NonwettingPhase);
/*!
* \brief A non-compositional twophase fluid system.
*
- * This is an adapter to use Dumux::TwoPImmiscible<TypeTag>, as is
+ * This is an adapter to use TwoPImmiscible<TypeTag>, as is
* done with most other classes in Dumux and all template parameters
* are usually defined in the property system anyhow.
*/
diff --git a/dumux/material/fluidsystems/base.hh b/dumux/material/fluidsystems/base.hh
index 287d54259191cb8fc9cf8b22b703ca28ce5f363c..13ab2346cd85031b4ed399cd1ec82901ff922996 100644
--- a/dumux/material/fluidsystems/base.hh
+++ b/dumux/material/fluidsystems/base.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::BaseFluidSystem
+ * \brief @copybrief FluidSystems::BaseFluidSystem
*/
#ifndef DUMUX_BASE_FLUID_SYSTEM_HH
#define DUMUX_BASE_FLUID_SYSTEM_HH
@@ -45,7 +45,7 @@ class BaseFluidSystem
{
public:
//! The type of parameter cache objects
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
/*!
* \brief Calculate the density \f$\mathrm{[kg/m^3]}\f$ of a fluid phase
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 0a5ac5ed7ce128da2d0cd131bc83ed32cd8bf66f..4bc21124b7d11083012f2a86e33bc008edeaa502 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::BrineAir
+ * \brief @copybrief FluidSystems::BrineAir
*/
#ifndef DUMUX_BRINE_AIR_SYSTEM_HH
#define DUMUX_BRINE_AIR_SYSTEM_HH
@@ -68,7 +68,7 @@ namespace FluidSystems
* {
* // e.g. to use a simple version of H2O
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- * typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ * typedef FluidSystems::H2OAir<Scalar, SimpleH2O<Scalar> > type;
* };
* \endcode
*
@@ -77,12 +77,12 @@ namespace FluidSystems
*
* This FluidSystem can be used without the PropertySystem that is applied in Dumux,
* as all Parameters are defined via template parameters. Hence it is in an
- * additional namespace Dumux::FluidSystem::.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * additional namespace FluidSystem::.
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*/
template <class Scalar,
- class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar>>,
+ class H2Otype = TabulatedComponent<Scalar, H2O<Scalar>>,
bool useComplexRelations=true>
class BrineAir
: public BaseFluidSystem<Scalar, BrineAir<Scalar, H2Otype, useComplexRelations>>
@@ -95,14 +95,14 @@ class BrineAir
public:
typedef H2Otype H2O;
- typedef Dumux::BinaryCoeff::H2O_Air H2O_Air;
+ typedef BinaryCoeff::H2O_Air H2O_Air;
typedef Dumux::Air<Scalar> Air;
- typedef Dumux::BinaryCoeff::Brine_Air<Scalar, Air> Brine_Air;
+ typedef BinaryCoeff::Brine_Air<Scalar, Air> Brine_Air;
typedef Dumux::Brine<Scalar, H2Otype> Brine;
typedef Dumux::NaCl<Scalar> NaCl;
// the type of parameter cache objects. this fluid system does not
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
/****************************************
* Fluid phase related static parameters
@@ -473,7 +473,7 @@ public:
if (compIdx == H2OIdx)
return Brine::vaporPressure(T)/p;
else if (compIdx == AirIdx)
- return Dumux::BinaryCoeff::H2O_Air::henry(T)/p;
+ return BinaryCoeff::H2O_Air::henry(T)/p;
else
return 1/p;
}
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 693e60a523ef5acae9f0a55c822eec94f4a86858..5af85887f74142931f99ee693078995cfb458786 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::BrineCO2
+ * \brief @copybrief FluidSystems::BrineCO2
*/
#ifndef DUMUX_BRINE_CO2_SYSTEM_HH
#define DUMUX_BRINE_CO2_SYSTEM_HH
@@ -60,9 +60,9 @@ namespace FluidSystems{
*/
template<class Scalar,
class CO2Table,
- class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> >,
- class BrineRawComponent = Dumux::Brine<Scalar, Dumux::H2O<Scalar> >,
- class Brinetype = Dumux::TabulatedComponent<Scalar, BrineRawComponent> >
+ class H2Otype = TabulatedComponent<Scalar, H2O<Scalar> >,
+ class BrineRawComponent = Brine<Scalar, H2O<Scalar> >,
+ class Brinetype = TabulatedComponent<Scalar, BrineRawComponent> >
class BrineCO2
: public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> >
{
@@ -70,13 +70,13 @@ class BrineCO2
typedef BaseFluidSystem <Scalar, ThisType> Base;
- typedef Dumux::BinaryCoeff::Brine_CO2<Scalar, CO2Table> Brine_CO2;
+ typedef BinaryCoeff::Brine_CO2<Scalar, CO2Table> Brine_CO2;
public:
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
typedef H2Otype H2O;
typedef Brinetype Brine;
- typedef typename Dumux::CO2<Scalar, CO2Table> CO2;
+ typedef Dumux::CO2<Scalar, CO2Table> CO2;
static const int numComponents = 2;
static const int numPhases = 2;
@@ -693,7 +693,7 @@ NEW_PROP_TAG(Scalar);
NEW_PROP_TAG(CO2Table);
NEW_PROP_TAG(ProblemSalinity);
// Set Co2 tables
-SET_TYPE_PROP(NumericModel, CO2Table, Dumux::CO2Tables);
+SET_TYPE_PROP(NumericModel, CO2Table, CO2Tables);
// Set salinity defaults
SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3);
}
@@ -715,13 +715,13 @@ SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3);
* {
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
* // Do not use the defaults that are the following
- * // typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
- * // typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> > BrineRawComponent;
- * // typedef Dumux::TabulatedComponent<Scalar,BrineRawComponent > Brine;
+ * // typedef TabulatedComponent<Scalar, H2O<Scalar> > H2O;
+ * // typedef Brine<Scalar, H2O<Scalar> > BrineRawComponent;
+ * // typedef TabulatedComponent<Scalar,BrineRawComponent > Brine;
*
* // Apply the following component classes:
* typedef Dumux::H2O<Scalar> H2O;
- * typedef Dumux::Brine<Scalar, H2O> BrineRawComponent;
+ * typedef Brine<Scalar, H2O> BrineRawComponent;
* typedef typename BrineRawComponent Brine;// all components have to be redefined,
* // the applied H2O and Brine implemementations.
* };
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index 5bb6a13bafcad6f08b578964a7920374200f391f..90e70ca2920dcfde6dcba844df6c72b0a6057fc8 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -63,7 +63,7 @@ private:
typedef Dumux::H2O<Scalar> H2O_IAPWS;
public:
- typedef Dumux::TabulatedComponent<Scalar, H2O_IAPWS> H2O;
+ typedef TabulatedComponent<Scalar, H2O_IAPWS> H2O;
typedef Dumux::N2<Scalar> N2;
typedef Dumux::O2<Scalar> O2;
typedef Dumux::H2<Scalar> H2;
@@ -71,7 +71,7 @@ public:
typedef Dumux::SimpleCO2<Scalar> SimpleCO2;
typedef Dumux::SimpleH2O<Scalar> SimpleH2O;
typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> > BrineRawComponent;
- typedef Dumux::TabulatedComponent<Scalar, BrineRawComponent > Brine;
+ typedef TabulatedComponent<Scalar, BrineRawComponent > Brine;
static void init()
{
diff --git a/dumux/material/fluidsystems/gasphase.hh b/dumux/material/fluidsystems/gasphase.hh
index fbc85303573cffbbf20ad9a8870f1a2e1fa85ced..a3a8e4c91b7900b1ee7f928307fe9095928cd13c 100644
--- a/dumux/material/fluidsystems/gasphase.hh
+++ b/dumux/material/fluidsystems/gasphase.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::GasPhase
+ * \brief @copybrief FluidSystems::GasPhase
*/
#ifndef DUMUX_GAS_PHASE_HH
#define DUMUX_GAS_PHASE_HH
@@ -51,7 +51,7 @@ class GasPhase
public:
typedef ComponentT Component;
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
/****************************************
* Fluid phase related static parameters
@@ -332,7 +332,7 @@ public:
*/
template <class Scalar, class ComponentT>
class
-DUNE_DEPRECATED_MSG("Class Dumux::GasPhase is deprecated. Use Dumux::FluidSystems::GasPhase instead.")
+DUNE_DEPRECATED_MSG("Class GasPhase is deprecated. Use FluidSystems::GasPhase instead.")
GasPhase
: public FluidSystems::GasPhase<Scalar, ComponentT>
{ };
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 522ae6acaaa8cc276cca01f74b17fb94262927ea..2768b4abb88d71fddd9745a145f9967107bb0ec9 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -20,7 +20,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2OAir
+ * \brief @copybrief FluidSystems::H2OAir
*/
#ifndef DUMUX_H2O_AIR_SYSTEM_HH
#define DUMUX_H2O_AIR_SYSTEM_HH
@@ -70,7 +70,7 @@ namespace FluidSystems
* {
* // e.g. to use a simple version of H2O
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- * typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ * typedef FluidSystems::H2OAir<Scalar, SimpleH2O<Scalar> > type;
* };
* \endcode
*
@@ -79,8 +79,8 @@ namespace FluidSystems
*
* This FluidSystem can be used without the PropertySystem that is applied in Dumux,
* as all Parameters are defined via template parameters. Hence it is in an
- * additional namespace Dumux::FluidSystem::.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * additional namespace FluidSystem::.
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*
* \note The template argument \p useComplexRelations can be used to switch from a complex
@@ -89,7 +89,7 @@ namespace FluidSystems
* effects are not considered.
*/
template <class Scalar,
- class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> >,
+ class H2Otype = TabulatedComponent<Scalar, H2O<Scalar> >,
bool useComplexRelations = true>
class H2OAir
: public BaseFluidSystem<Scalar, H2OAir<Scalar, H2Otype, useComplexRelations> >
@@ -541,7 +541,7 @@ public:
if (phaseIdx == wPhaseIdx) {
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
- return Dumux::BinaryCoeff::H2O_Air::henry(T)/p;
+ return BinaryCoeff::H2O_Air::henry(T)/p;
}
// for the gas phase, assume an ideal gas when it comes to
@@ -782,7 +782,7 @@ NEW_PROP_TAG(Components);
/*!
* \brief A two-phase fluid system with water and air as components.
*
- * This is an adapter to use Dumux::H2OAirFluidSystem<TypeTag>, as is
+ * This is an adapter to use H2OAirFluidSystem<TypeTag>, as is
* done with most other classes in Dumux.
* This fluidsystem is applied by default with the tabulated version of
* water of the IAPWS-formulation.
@@ -798,7 +798,7 @@ NEW_PROP_TAG(Components);
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
*
* // Do not use the defaults !
- * // typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
+ * // typedef TabulatedComponent<Scalar, H2O<Scalar> > H2O;
*
* // Apply e.g. untabulated water:
* typedef Dumux::H2O<Scalar> H2O;
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index d13370d5ce98187377b78c2cdae93a3d9cc5474e..f26eea56021281cce513f2463045aee57354952a 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2OAirMesitylene
+ * \brief @copybrief FluidSystems::H2OAirMesitylene
*/
#ifndef DUMUX_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
#define DUMUX_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
@@ -52,7 +52,7 @@ namespace FluidSystems
* It assumes all phases to be ideal mixtures.
*/
template <class Scalar,
- class H2OType = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > >
+ class H2OType = TabulatedComponent<Scalar, H2O<Scalar> > >
class H2OAirMesitylene
: public BaseFluidSystem<Scalar, H2OAirMesitylene<Scalar, H2OType> >
{
@@ -60,7 +60,7 @@ class H2OAirMesitylene
typedef BaseFluidSystem<Scalar, ThisType> Base;
public:
- typedef Dumux::Mesitylene<Scalar> NAPL;
+ typedef Mesitylene<Scalar> NAPL;
typedef Dumux::Air<Scalar> Air;
typedef H2OType H2O;
@@ -366,9 +366,9 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
if (phaseIdx==gPhaseIdx) {
- Scalar diffAC = Dumux::BinaryCoeff::Air_Mesitylene::gasDiffCoeff(temperature, pressure);
- Scalar diffWC = Dumux::BinaryCoeff::H2O_Mesitylene::gasDiffCoeff(temperature, pressure);
- Scalar diffAW = Dumux::BinaryCoeff::H2O_Air::gasDiffCoeff(temperature, pressure);
+ Scalar diffAC = BinaryCoeff::Air_Mesitylene::gasDiffCoeff(temperature, pressure);
+ Scalar diffWC = BinaryCoeff::H2O_Mesitylene::gasDiffCoeff(temperature, pressure);
+ Scalar diffAW = BinaryCoeff::H2O_Air::gasDiffCoeff(temperature, pressure);
const Scalar xga = fluidState.moleFraction(gPhaseIdx, airIdx);
const Scalar xgw = fluidState.moleFraction(gPhaseIdx, H2OIdx);
@@ -448,9 +448,9 @@ public:
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
else if (compIdx == airIdx)
- return Dumux::BinaryCoeff::H2O_Air::henry(T)/p;
+ return BinaryCoeff::H2O_Air::henry(T)/p;
else if (compIdx == NAPLIdx)
- return Dumux::BinaryCoeff::H2O_Mesitylene::henry(T)/p;
+ return BinaryCoeff::H2O_Mesitylene::henry(T)/p;
}
// for the NAPL phase, we assume currently that nothing is
@@ -588,7 +588,7 @@ namespace Properties {
/*!
* \brief A threephase fluid system with water, air and mesitylene as components.
*
- * This is an adapter to use Dumux::H2OAirMesityleneFluidSystem<TypeTag>, as is
+ * This is an adapter to use H2OAirMesityleneFluidSystem<TypeTag>, as is
* done with most other classes in Dumux.
* This fluidsystem is applied by default with the tabulated version of
* water of the IAPWS-formulation.
@@ -604,7 +604,7 @@ namespace Properties {
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
*
* // Do not use the defaults !
- * // typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
+ * // typedef TabulatedComponent<Scalar, H2O<Scalar> > H2O;
*
* // Apply e.g. untabulated water:
* typedef Dumux::H2O<Scalar> H2O;
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 31368d9fa6061dfcba08085251e7f07b03ab9baf..7b6b1c38d54e658e53ad9ea871714f81cdc4d9e7 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2OAirXylene
+ * \brief @copybrief FluidSystems::H2OAirXylene
*/
#ifndef DUMUX_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
#define DUMUX_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
@@ -50,7 +50,7 @@ namespace FluidSystems
* \note This fluid system assumes all phases to be ideal mixtures.
*/
template <class Scalar,
- class H2OType = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > >
+ class H2OType = TabulatedComponent<Scalar, H2O<Scalar> > >
class H2OAirXylene
: public BaseFluidSystem<Scalar, H2OAirXylene<Scalar, H2OType> >
{
@@ -59,7 +59,7 @@ class H2OAirXylene
public:
typedef H2OType H2O;
- typedef Dumux::Xylene<Scalar> NAPL;
+ typedef Xylene<Scalar> NAPL;
typedef Dumux::Air<Scalar> Air;
static const int numPhases = 3;
@@ -365,9 +365,9 @@ public:
Scalar temperature = fluidState.temperature(phaseIdx);
Scalar pressure = fluidState.pressure(phaseIdx);
if (phaseIdx==gPhaseIdx) {
- Scalar diffAC = Dumux::BinaryCoeff::Air_Xylene::gasDiffCoeff(temperature, pressure);
- Scalar diffWC = Dumux::BinaryCoeff::H2O_Xylene::gasDiffCoeff(temperature, pressure);
- Scalar diffAW = Dumux::BinaryCoeff::H2O_Air::gasDiffCoeff(temperature, pressure);
+ Scalar diffAC = BinaryCoeff::Air_Xylene::gasDiffCoeff(temperature, pressure);
+ Scalar diffWC = BinaryCoeff::H2O_Xylene::gasDiffCoeff(temperature, pressure);
+ Scalar diffAW = BinaryCoeff::H2O_Air::gasDiffCoeff(temperature, pressure);
const Scalar xga = fluidState.moleFraction(gPhaseIdx, airIdx);
const Scalar xgw = fluidState.moleFraction(gPhaseIdx, H2OIdx);
@@ -447,9 +447,9 @@ public:
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
else if (compIdx == airIdx)
- return Dumux::BinaryCoeff::H2O_Air::henry(T)/p;
+ return BinaryCoeff::H2O_Air::henry(T)/p;
else if (compIdx == NAPLIdx)
- return Dumux::BinaryCoeff::H2O_Xylene::henry(T)/p;
+ return BinaryCoeff::H2O_Xylene::henry(T)/p;
}
// for the NAPL phase, we assume currently that nothing is
@@ -587,7 +587,7 @@ namespace Properties {
/*!
* \brief A threephase fluid system with water, air and xylene as components.
*
- * This is an adapter to use Dumux::H2OAirXyleneFluidSystem<TypeTag>, as is
+ * This is an adapter to use H2OAirXyleneFluidSystem<TypeTag>, as is
* done with most other classes in Dumux.
* This fluidsystem is applied by default with the tabulated version of
* water of the IAPWS-formulation.
@@ -603,7 +603,7 @@ namespace Properties {
* typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
*
* // Do not use the defaults !
- * // typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
+ * // typedef TabulatedComponent<Scalar, H2O<Scalar> > H2O;
*
* // Apply e.g. untabulated water:
* typedef Dumux::H2O<Scalar> H2O;
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index 096d02a8d06479c6cad726094b4237055308d443..8a1aa3710dd4c6bb0d1f66df931eff6f868a20c5 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2ON2
+ * \brief @copybrief FluidSystems::H2ON2
*/
#ifndef DUMUX_H2O_N2_FLUID_SYSTEM_HH
#define DUMUX_H2O_N2_FLUID_SYSTEM_HH
@@ -57,8 +57,8 @@ namespace FluidSystems
*
* This FluidSystem can be used without the PropertySystem that is applied in Dumux,
* as all Parameters are defined via template parameters. Hence it is in an
- * additional namespace Dumux::FluidSystem::.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * additional namespace FluidSystem::.
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*/
template <class Scalar, bool useComplexRelations = true>
@@ -71,7 +71,7 @@ class H2ON2
// convenience typedefs
typedef Dumux::IdealGas<Scalar> IdealGas;
typedef Dumux::H2O<Scalar> IapwsH2O;
- typedef Dumux::TabulatedComponent<Scalar, IapwsH2O > TabulatedH2O;
+ typedef TabulatedComponent<Scalar, IapwsH2O > TabulatedH2O;
typedef Dumux::N2<Scalar> SimpleN2;
public:
@@ -501,7 +501,7 @@ public:
if (phaseIdx == wPhaseIdx) {
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
- return Dumux::BinaryCoeff::H2O_N2::henry(T)/p;
+ return BinaryCoeff::H2O_N2::henry(T)/p;
}
// for the gas phase, assume an ideal gas when it comes to
@@ -705,11 +705,11 @@ public:
else {
// assume an ideal gas for both components. See:
// http://en.wikipedia.org/wiki/Heat_capacity
- Scalar c_vN2molar = Dumux::Constants<Scalar>::R*2.39;
- Scalar c_pN2molar = Dumux::Constants<Scalar>::R + c_vN2molar;
+ Scalar c_vN2molar = Constants<Scalar>::R*2.39;
+ Scalar c_pN2molar = Constants<Scalar>::R + c_vN2molar;
- Scalar c_vH2Omolar = Dumux::Constants<Scalar>::R*3.37; // <- correct??
- Scalar c_pH2Omolar = Dumux::Constants<Scalar>::R + c_vH2Omolar;
+ Scalar c_vH2Omolar = Constants<Scalar>::R*3.37; // <- correct??
+ Scalar c_pH2Omolar = Constants<Scalar>::R + c_vH2Omolar;
c_pN2 = c_pN2molar/molarMass(N2Idx);
c_pH2O = c_pH2Omolar/molarMass(H2OIdx);
@@ -728,7 +728,7 @@ public:
/*!
* \brief A two-phase fluid system with water and nitrogen as components.
*
- * This is an adapter to use Dumux::H2ON2FluidSystem<TypeTag>, as is
+ * This is an adapter to use H2ON2FluidSystem<TypeTag>, as is
* done with most other classes in Dumux.
*/
template<class TypeTag>
diff --git a/dumux/material/fluidsystems/h2on2kinetic.hh b/dumux/material/fluidsystems/h2on2kinetic.hh
index 608d0c660e87649647b314cf48ec736de6f25854..ecba1cc670af1bcb2c89629f99ea6237c4533a49 100644
--- a/dumux/material/fluidsystems/h2on2kinetic.hh
+++ b/dumux/material/fluidsystems/h2on2kinetic.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2ON2Kinetic
+ * \brief @copybrief FluidSystems::H2ON2Kinetic
*/
#ifndef DUMUX_H2O_N2_FLUID_SYSTEM_KINETIC_HH
#define DUMUX_H2O_N2_FLUID_SYSTEM_KINETIC_HH
@@ -56,7 +56,7 @@ private:
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
//! The type of parameter cache objects
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
//! Index of the solid phase
static constexpr int sPhaseIdx = 2;
@@ -184,7 +184,7 @@ public:
case nCompIdx :
{
// wPhase, nComp comes in: we hand back the concentration in the other phase: nPhase, nComp
- const Scalar H = Dumux::BinaryCoeff::H2O_N2::henry(temperature) ; // Pa
+ const Scalar H = BinaryCoeff::H2O_N2::henry(temperature) ; // Pa
const Scalar xwn = fluidState.moleFraction(referencePhaseIdx, calcCompIdx) ; // known from reference phase
const Scalar xnn = H / pn * xwn; // mole fraction in the other phase
Valgrind::CheckDefined(xnn);
@@ -214,7 +214,7 @@ public:
case nCompIdx :
{
// nPhase, nComp comes in: we hand back the concentration in the other phase: wPhase, nComp
- const Scalar H = Dumux::BinaryCoeff::H2O_N2::henry(temperature) ; // Pa
+ const Scalar H = BinaryCoeff::H2O_N2::henry(temperature) ; // Pa
const Scalar xnn = fluidState.moleFraction(referencePhaseIdx, calcCompIdx) ;// known from reference phase
const Scalar xwn = pn / H * xnn ; // mole fraction in the other phase
Valgrind::CheckDefined(xwn);
@@ -276,7 +276,7 @@ public:
const Scalar temperature = fluidState.temperature(/*phaseIdx=*/0);
const Scalar pn = fluidState.pressure(nPhaseIdx);
const Scalar satVapPressure = ParentType::H2O::vaporPressure(temperature);
- const Scalar henry = Dumux::BinaryCoeff::H2O_N2::henry(temperature);
+ const Scalar henry = BinaryCoeff::H2O_N2::henry(temperature);
Scalar x[numPhases][numComponents] ;
x[nPhaseIdx][wCompIdx] = ( satVapPressure*(henry - pn) ) / ( pn*(henry-satVapPressure) ) ;
@@ -298,7 +298,7 @@ public:
*/
static Scalar henry(Scalar temperature)
{
- return Dumux::BinaryCoeff::H2O_N2::henry(temperature);
+ return BinaryCoeff::H2O_N2::henry(temperature);
}
/*!
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 40bf8dddb7e6fe1c8995c25ee30bc8ee19e5c5c4..fcea8fd545a617bada5b3669fc378a6aabbcf2a5 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -20,7 +20,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::H2ON2O2
+ * \brief @copybrief FluidSystems::H2ON2O2
*/
#ifndef DUMUX_H2O_N2_O2_FLUID_SYSTEM_HH
#define DUMUX_H2O_N2_O2_FLUID_SYSTEM_HH
@@ -66,8 +66,8 @@ namespace FluidSystems
* is not necessary for non-tabularized ones.
* This FluidSystem can be used without the PropertySystem that is applied in Dumux,
* as all Parameters are defined via template parameters. Hence it is in an
- * additional namespace Dumux::FluidSystem::.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * additional namespace FluidSystem::.
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*/
template <class Scalar, bool useComplexRelations = true>
@@ -80,7 +80,7 @@ class H2ON2O2
typedef Dumux::IdealGas<Scalar> IdealGas;
typedef Dumux::Constants<Scalar> Constants;
typedef Dumux::H2O<Scalar> IapwsH2O;
- typedef Dumux::TabulatedComponent<Scalar, IapwsH2O > TabulatedH2O;
+ typedef TabulatedComponent<Scalar, IapwsH2O > TabulatedH2O;
typedef Dumux::N2<Scalar> SimpleN2;
typedef Dumux::O2<Scalar> O2;
@@ -463,7 +463,7 @@ public:
// other
Scalar rho_gH2O = H2O::gasDensity(T, p*fluidState.moleFraction(nPhaseIdx, H2OIdx));
Scalar rho_gN2 = N2::gasDensity(T, p*fluidState.moleFraction(nPhaseIdx, N2Idx));
- Scalar rho_gO2 = Dumux::O2<Scalar>::gasDensity(T, p*fluidState.moleFraction(nPhaseIdx, O2Idx));
+ Scalar rho_gO2 = O2::gasDensity(T, p*fluidState.moleFraction(nPhaseIdx, O2Idx));
return (rho_gH2O + rho_gN2 + rho_gO2 ) / std::max(1e-5, sumMoleFrac);
}
@@ -565,8 +565,8 @@ public:
{
switch(compIdx){
case H2OIdx: return H2O::vaporPressure(T)/p;
- case N2Idx: return Dumux::BinaryCoeff::H2O_N2::henry(T)/p;
- case O2Idx: return Dumux::BinaryCoeff::H2O_O2::henry(T)/p;
+ case N2Idx: return BinaryCoeff::H2O_N2::henry(T)/p;
+ case O2Idx: return BinaryCoeff::H2O_O2::henry(T)/p;
};
}
@@ -810,14 +810,14 @@ public:
// assume an ideal gas for both components. See:
//
//http://en.wikipedia.org/wiki/Heat_capacity
- Scalar c_vN2molar = Dumux::Constants<Scalar>::R*2.39;
- Scalar c_pN2molar = Dumux::Constants<Scalar>::R + c_vN2molar;
+ Scalar c_vN2molar = Constants::R*2.39;
+ Scalar c_pN2molar = Constants::R + c_vN2molar;
- Scalar c_vO2molar = Dumux::Constants<Scalar>::R*2.43;
- Scalar c_pO2molar = Dumux::Constants<Scalar>::R + c_vO2molar;
+ Scalar c_vO2molar = Constants::R*2.43;
+ Scalar c_pO2molar = Constants::R + c_vO2molar;
- Scalar c_vH2Omolar = Dumux::Constants<Scalar>::R*3.37; // <- correct??
- Scalar c_pH2Omolar = Dumux::Constants<Scalar>::R + c_vH2Omolar;
+ Scalar c_vH2Omolar = Constants::R*3.37; // <- correct??
+ Scalar c_pH2Omolar = Constants::R + c_vH2Omolar;
c_pN2 = c_pN2molar/molarMass(N2Idx);
c_pO2 = c_pO2molar/molarMass(O2Idx);
@@ -840,7 +840,7 @@ public:
* \brief A two-phase (water and air) fluid system
* with water, nitrogen and oxygen as components.
*
- * This is an adapter to use Dumux::H2ON2O2<TypeTag>, as is
+ * This is an adapter to use H2ON2O2<TypeTag>, as is
* done with most other classes in Dumux.
*/
template<class TypeTag>
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index 8e399084f78e23f37f8cb9d6e47e3b3e88779f8c..37e0bdb748770faa1c64c1c2d179cb4c353972a3 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::LiquidPhase
+ * \brief @copybrief FluidSystems::LiquidPhase
*/
#ifndef DUMUX_LIQUID_PHASE_HH
#define DUMUX_LIQUID_PHASE_HH
@@ -50,7 +50,7 @@ class LiquidPhase
public:
typedef ComponentT Component;
- typedef Dumux::NullParameterCache ParameterCache;
+ typedef NullParameterCache ParameterCache;
/****************************************
* Fluid phase related static parameters
@@ -316,7 +316,7 @@ public:
*/
template <class Scalar, class ComponentT>
class
-DUNE_DEPRECATED_MSG("Class Dumux::LiquidPhase is deprecated. Use Dumux::FluidSystems::LiquidPhase instead.")
+DUNE_DEPRECATED_MSG("Class LiquidPhase is deprecated. Use FluidSystems::LiquidPhase instead.")
LiquidPhase
: public FluidSystems::LiquidPhase<Scalar, ComponentT>
{ };
diff --git a/dumux/material/fluidsystems/nullparametercache.hh b/dumux/material/fluidsystems/nullparametercache.hh
index d4884f03a75e312b17d069def6a955acaf7b2d03..34507eb2bd27a16629490980302dcf30fa4830c5 100644
--- a/dumux/material/fluidsystems/nullparametercache.hh
+++ b/dumux/material/fluidsystems/nullparametercache.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::NullParameterCache
+ * \brief @copybrief NullParameterCache
*/
#ifndef DUMUX_NULL_PARAMETER_CACHE_HH
#define DUMUX_NULL_PARAMETER_CACHE_HH
diff --git a/dumux/material/fluidsystems/parametercachebase.hh b/dumux/material/fluidsystems/parametercachebase.hh
index 96dd8bacc8f918c193349067fbf973048793de57..ba7d05a960e393d25a1f64ece0e6c6aca5cd66cb 100644
--- a/dumux/material/fluidsystems/parametercachebase.hh
+++ b/dumux/material/fluidsystems/parametercachebase.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::ParameterCacheBase
+ * \brief @copybrief ParameterCacheBase
*/
#ifndef DUMUX_PARAMETER_CACHE_BASE_HH
#define DUMUX_PARAMETER_CACHE_BASE_HH
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index f60089298c059d152284938a14453ef7e70cf473..d7036e73635e66915f8b73c544458503559ca2c9 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::PureWaterSimpleFluidSystem
+ * \brief @copybrief FluidSystems::PureWaterSimpleFluidSystem
*/
#ifndef DUMUX_PURE_WATER_FLUID_SYSTEM_HH
#define DUMUX_PURE_WATER_FLUID_SYSTEM_HH
@@ -57,8 +57,8 @@ namespace FluidSystems
*
* This FluidSystem can be used without the PropertySystem that is applied in Dumux,
* as all Parameters are defined via template parameters. Hence it is in an
- * additional namespace Dumux::FluidSystem::.
- * An adapter class using Dumux::FluidSystem<TypeTag> is also provided
+ * additional namespace FluidSystem::.
+ * An adapter class using FluidSystem<TypeTag> is also provided
* at the end of this file.
*/
template <class Scalar, bool useComplexRelations = false>
@@ -430,7 +430,7 @@ public:
{
if (compIdx == H2OIdx)
return H2O::vaporPressure(T)/p;
- return Dumux::BinaryCoeff::H2O_N2::henry(T)/p;
+ return BinaryCoeff::H2O_N2::henry(T)/p;
}
// for the gas phase, assume an ideal gas when it comes to
@@ -562,7 +562,7 @@ public:
/*!
* \brief A two-phase fluid system with water and nitrogen as components.
*
- * This is an adapter to use Dumux::H2ON2FluidSystem<TypeTag>, as is
+ * This is an adapter to use H2ON2FluidSystem<TypeTag>, as is
* done with most other classes in Dumux.
*/
template<class TypeTag>
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index 5bbcb95194160c45a8bf17d95f674ddd3b8cf7e4..4821932a12b07627e413343475b42a00701aa840 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::FluidSystems::Spe5
+ * \brief @copybrief FluidSystems::Spe5
*/
#ifndef DUMUX_SPE5_FLUID_SYSTEM_HH
#define DUMUX_SPE5_FLUID_SYSTEM_HH
@@ -55,13 +55,13 @@ namespace FluidSystems
template <class Scalar>
class Spe5
{
- typedef Dumux::FluidSystems::Spe5<Scalar> ThisType;
+ typedef FluidSystems::Spe5<Scalar> ThisType;
- typedef typename Dumux::PengRobinsonMixture<Scalar, ThisType> PengRobinsonMixture;
- typedef typename Dumux::PengRobinson<Scalar> PengRobinson;
+ typedef Dumux::PengRobinsonMixture<Scalar, ThisType> PengRobinsonMixture;
+ typedef Dumux::PengRobinson<Scalar> PengRobinson;
public:
- typedef Dumux::Spe5ParameterCache<Scalar, ThisType> ParameterCache;
+ typedef Spe5ParameterCache<Scalar, ThisType> ParameterCache;
/****************************************
* Fluid phase parameters
@@ -314,7 +314,7 @@ public:
*/
static void init()
{
- Dumux::PengRobinsonParamsMixture<Scalar, ThisType, gPhaseIdx, /*useSpe5=*/true> prParams;
+ PengRobinsonParamsMixture<Scalar, ThisType, gPhaseIdx, /*useSpe5=*/true> prParams;
// find envelopes of the 'a' and 'b' parameters for the range
// 273.15K <= T <= 373.15K and 10e3 Pa <= p <= 100e6 Pa. For
diff --git a/dumux/material/fluidsystems/spe5parametercache.hh b/dumux/material/fluidsystems/spe5parametercache.hh
index 54f6d22ee4f7ed030cd6e56548372f7fc7ae09a5..f4c53f8f447d73ed6dd3b3885454e11e4e77bc42 100644
--- a/dumux/material/fluidsystems/spe5parametercache.hh
+++ b/dumux/material/fluidsystems/spe5parametercache.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief @copybrief Dumux::Spe5ParameterCache
+ * \brief @copybrief Spe5ParameterCache
*/
#ifndef SPE5_PARAMETER_CACHE_HH
#define SPE5_PARAMETER_CACHE_HH
@@ -42,10 +42,10 @@ namespace Dumux
*/
template <class Scalar, class FluidSystem>
class Spe5ParameterCache
- : public Dumux::ParameterCacheBase<Spe5ParameterCache<Scalar, FluidSystem> >
+ : public ParameterCacheBase<Spe5ParameterCache<Scalar, FluidSystem> >
{
typedef Spe5ParameterCache<Scalar, FluidSystem> ThisType;
- typedef Dumux::ParameterCacheBase<ThisType> ParentType;
+ typedef ParameterCacheBase<ThisType> ParentType;
typedef Dumux::PengRobinson<Scalar> PengRobinson;
@@ -57,8 +57,8 @@ class Spe5ParameterCache
public:
// types of the parameter objects for each phase
- typedef Dumux::PengRobinsonParamsMixture<Scalar, FluidSystem, oPhaseIdx, /*useSpe5=*/true> OilPhaseParams;
- typedef Dumux::PengRobinsonParamsMixture<Scalar, FluidSystem, gPhaseIdx, /*useSpe5=*/true> GasPhaseParams;
+ typedef PengRobinsonParamsMixture<Scalar, FluidSystem, oPhaseIdx, /*useSpe5=*/true> OilPhaseParams;
+ typedef PengRobinsonParamsMixture<Scalar, FluidSystem, gPhaseIdx, /*useSpe5=*/true> GasPhaseParams;
/*!
* \brief The constructor
diff --git a/dumux/material/idealgas.hh b/dumux/material/idealgas.hh
index 1c4cd4d6fbcfc9da0afd22504ba7e33537c27cb1..a713b01907aa57d9866ca4cf91ad93729646817a 100644
--- a/dumux/material/idealgas.hh
+++ b/dumux/material/idealgas.hh
@@ -37,7 +37,7 @@ class IdealGas
{
public:
//! The ideal gas constant \f$\mathrm{[J/mol/K]}\f$
- static constexpr Scalar R = Dumux::Constants<Scalar>::R;
+ static constexpr Scalar R = Constants<Scalar>::R;
/*!
* \brief The density of the gas in \f$\mathrm{[kg/m^3]}\f$, depending on
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index 693f7933932f643f9c9cf48236ef64ba28c870dd..2fb76a3325bd3c79463e365e417646fec6e10b47 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -83,7 +83,7 @@ public:
*/
Scalar meanK(Scalar K1, Scalar K2) const
{
- const Scalar K = Dumux::harmonicMean(K1, K2);
+ const Scalar K = harmonicMean(K1, K2);
return K;
}
@@ -95,7 +95,7 @@ public:
*/
void meanK(DimWorldMatrix &result, Scalar K1, Scalar K2) const
{
- const Scalar K = Dumux::harmonicMean(K1, K2);
+ const Scalar K = harmonicMean(K1, K2);
for (int i = 0; i < dimWorld; ++i)
{
for (int j = 0; j < dimWorld; ++j)
diff --git a/dumux/material/spatialparams/implicit1p.hh b/dumux/material/spatialparams/implicit1p.hh
index 4b56416c9af02f226496ecb4d7d86c17c560932e..312dc3c0573ccbb8b04ddcb909622b49e11eae78 100644
--- a/dumux/material/spatialparams/implicit1p.hh
+++ b/dumux/material/spatialparams/implicit1p.hh
@@ -80,7 +80,7 @@ public:
Scalar K1,
Scalar K2) const
{
- const Scalar K = Dumux::harmonicMean(K1, K2);
+ const Scalar K = harmonicMean(K1, K2);
for (int i = 0; i < dimWorld; ++i) {
for (int j = 0; j < dimWorld; ++j)
result[i][j] = 0;
@@ -198,7 +198,7 @@ public:
return forchCoeff ;
}
- catch (Dumux::ParameterException &e) {
+ catch (ParameterException &e) {
std::cerr << e << ". Aborted in file "<< __FILE__ << "!\n";
exit(1) ;
}
diff --git a/dumux/multidomain/2cnistokes2p2cni/localoperator.hh b/dumux/multidomain/2cnistokes2p2cni/localoperator.hh
index 625f5a9b18f78780308a2352a53e4fc4087ad98e..8db004ebf0da080ce377b01a3f257a5cb7f77e6c 100644
--- a/dumux/multidomain/2cnistokes2p2cni/localoperator.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/localoperator.hh
@@ -201,7 +201,7 @@ public:
{ }
public:
- //! \copydoc Dumux::TwoCStokesTwoPTwoCLocalOperator::evalCoupling()
+ //! \copydoc TwoCStokesTwoPTwoCLocalOperator::evalCoupling()
template<typename LFSU1, typename LFSU2, typename RES1, typename RES2, typename CParams>
void evalCoupling(const LFSU1& lfsu1, const LFSU2& lfsu2,
const int vertInElem1, const int vertInElem2,
diff --git a/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh b/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh
index 51b47acc3f43a66d16c1216ff3c4007802269e0d..982860f27864b09379ff85b0565f7cbdaadf1ad2 100644
--- a/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh
+++ b/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh
@@ -53,7 +53,7 @@ public:
: ParentType(problem)
{ }
- //! \copydoc Dumux::NewtonController::newtonEndStep()
+ //! \copydoc NewtonController::newtonEndStep()
void newtonEndStep(SolutionVector &uCurrentIter, SolutionVector &uLastIter)
{
ParentType::newtonEndStep(uCurrentIter, uLastIter);
diff --git a/dumux/multidomain/2cstokes2p2c/propertydefaults.hh b/dumux/multidomain/2cstokes2p2c/propertydefaults.hh
index 51816bd4eed9161061a5dfd0175d15f15ea37ebf..78bec087087806735e7e363f471fcc4308b1a14e 100644
--- a/dumux/multidomain/2cstokes2p2c/propertydefaults.hh
+++ b/dumux/multidomain/2cstokes2p2c/propertydefaults.hh
@@ -48,7 +48,7 @@ SET_TYPE_PROP(TwoCStokesTwoPTwoC, SolutionVector,
typename GET_PROP_TYPE(TypeTag, MultiDomainGridOperator)::Traits::Domain);
// Specif the used Newton controller
-SET_TYPE_PROP(TwoCStokesTwoPTwoC, NewtonController, Dumux::TwoCStokesTwoPTwoCNewtonController<TypeTag>);
+SET_TYPE_PROP(TwoCStokesTwoPTwoC, NewtonController, TwoCStokesTwoPTwoCNewtonController<TypeTag>);
// Set this to one here (must fit to the structure of the coupled matrix which has block length 1)
SET_INT_PROP(TwoCStokesTwoPTwoC, NumEq, 1);
diff --git a/dumux/multidomain/convergencewriter.hh b/dumux/multidomain/convergencewriter.hh
index a06aef47106b46ca3e30331fcdfd72377c61885e..01c959c261f9e671ea9295aa94308e577903a1a1 100644
--- a/dumux/multidomain/convergencewriter.hh
+++ b/dumux/multidomain/convergencewriter.hh
@@ -56,8 +56,8 @@ struct MultiDomainConvergenceWriter
typedef typename GET_PROP_TYPE(SubDomain1TypeTag, SolutionVector) SolutionVector1;
typedef typename GET_PROP_TYPE(SubDomain2TypeTag, SolutionVector) SolutionVector2;
- typedef Dumux::VtkMultiWriter<GridView1> VtkMultiWriter1;
- typedef Dumux::VtkMultiWriter<GridView2> VtkMultiWriter2;
+ typedef VtkMultiWriter<GridView1> VtkMultiWriter1;
+ typedef VtkMultiWriter<GridView2> VtkMultiWriter2;
/*!
* \brief The constructor
diff --git a/dumux/multidomain/model.hh b/dumux/multidomain/model.hh
index e115df6b2df2be275ae5c97c0423fbe6e43444d6..5349abba2b4298833086a0ec772e16e95ad4060e 100644
--- a/dumux/multidomain/model.hh
+++ b/dumux/multidomain/model.hh
@@ -175,7 +175,7 @@ public:
const SubDomainModel2 &sdModel2() const
{ return sdProblem2().model(); }
- //! \copydoc Dumux::ImplicitModel::update()
+ //! \copydoc ImplicitModel::update()
bool update(NewtonMethod &solver,
NewtonController &controller)
{
@@ -202,11 +202,11 @@ public:
}
- //! \copydoc Dumux::ImplicitModel::checkPlausibility()
+ //! \copydoc ImplicitModel::checkPlausibility()
void checkPlausibility() const
{ }
- //! \copydoc Dumux::ImplicitModel::updateBegin()
+ //! \copydoc ImplicitModel::updateBegin()
void updateBegin()
{
sdModel1().updateBegin();
@@ -215,7 +215,7 @@ public:
SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
}
- //! \copydoc Dumux::ImplicitModel::updateSuccessful()
+ //! \copydoc ImplicitModel::updateSuccessful()
void updateSuccessful()
{
sdModel1().updateSuccessful();
@@ -238,7 +238,7 @@ public:
SplitAndMerge::mergeSolVectors(sdModel1().prevSol(), sdModel2().prevSol(), *uPrev_);
}
- //! \copydoc Dumux::ImplicitModel::updateFailed()
+ //! \copydoc ImplicitModel::updateFailed()
void updateFailed()
{
sdModel1().updateFailed();
@@ -274,7 +274,7 @@ public:
DUNE_THROW(Dune::NotImplemented, "");
}
- //! \copydoc Dumux::ImplicitModel::serialize()
+ //! \copydoc ImplicitModel::serialize()
template <class Restarter>
void serialize(Restarter &res)
{
@@ -282,7 +282,7 @@ public:
sdProblem2().serialize(res);
}
- //! \copydoc Dumux::ImplicitModel::deserialize()
+ //! \copydoc ImplicitModel::deserialize()
template <class Restarter>
void deserialize(Restarter &res)
{
@@ -291,7 +291,7 @@ public:
wasRestarted_ = true;
}
- //! \copydoc Dumux::ImplicitModel::resetJacobianAssembler()
+ //! \copydoc ImplicitModel::resetJacobianAssembler()
void resetJacobianAssembler()
{
jacAsm_.template reset<JacobianAssembler>(0);
diff --git a/dumux/multidomain/newtoncontroller.hh b/dumux/multidomain/newtoncontroller.hh
index 54837e4c6215596f607495bab348f39bca1982e9..e1844c17b068a68db8185ed13687215acc6e092d 100644
--- a/dumux/multidomain/newtoncontroller.hh
+++ b/dumux/multidomain/newtoncontroller.hh
@@ -126,7 +126,7 @@ public:
* \param x Vector of unknowns
* \param b Right hand side
*
- * Throws Dumux::NumericalProblem if the linear solver didn't
+ * Throws NumericalProblem if the linear solver didn't
* converge.
*/
template <class Matrix, class Vector>
@@ -171,7 +171,7 @@ public:
MPI_COMM_WORLD);
#endif
- Dumux::NumericalProblem p;
+ NumericalProblem p;
std::string msg;
std::ostringstream ms(msg);
ms << e.what() << "M=" << A.base()[e.r][e.c];
@@ -192,7 +192,7 @@ public:
MPI_COMM_WORLD);
#endif
- Dumux::NumericalProblem p;
+ NumericalProblem p;
p.message(e.what());
throw p;
}
diff --git a/dumux/multidomain/problem.hh b/dumux/multidomain/problem.hh
index 53a3f83c6e3353c992fb261fee8100771c5da2cc..4f0879ae1576dc0b9c0dc4f3b64c0e4bcbb938de 100644
--- a/dumux/multidomain/problem.hh
+++ b/dumux/multidomain/problem.hh
@@ -101,7 +101,7 @@ public:
maxTimeStepSize_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, MaxTimeStepSize);
}
- //! \copydoc Dumux::ImplicitProblem::init()
+ //! \copydoc ImplicitProblem::init()
void init()
{
// initialize the sub-problems
@@ -115,17 +115,17 @@ public:
asImp_().initMortarElements();
}
- //! \copydoc Dumux::ImplicitProblem::serialize()
+ //! \copydoc ImplicitProblem::serialize()
template <class Restarter>
void serialize(Restarter &res)
{
this->model().serialize(res);
}
- //! \copydoc Dumux::ImplicitProblem::serialize()
+ //! \copydoc ImplicitProblem::serialize()
void serialize()
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.serializeBegin(this->asImp_());
std::cout << "Serialize to file '" << res.fileName() << "'\n";
@@ -134,10 +134,10 @@ public:
res.serializeEnd();
}
- //! \copydoc Dumux::ImplicitProblem::restart()
+ //! \copydoc ImplicitProblem::restart()
void restart(Scalar tRestart)
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.deserializeBegin(this->asImp_(), tRestart);
std::cout << "Deserialize from file '" << res.fileName() << "'\n";
@@ -146,7 +146,7 @@ public:
res.deserializeEnd();
}
- //! \copydoc Dumux::ImplicitProblem::deserialize()
+ //! \copydoc ImplicitProblem::deserialize()
template <class Restarter>
void deserialize(Restarter &res)
{
@@ -168,7 +168,7 @@ public:
asImp_().sdProblem2().preTimeStep();
}
- //! \copydoc Dumux::ImplicitProblem::timeIntegration()
+ //! \copydoc ImplicitProblem::timeIntegration()
void timeIntegration()
{
const int maxFails =
@@ -205,13 +205,13 @@ public:
asImp_().sdProblem2().postTimeStep();
}
- //! \copydoc Dumux::ImplicitProblem::maxTimeStepSize()
+ //! \copydoc ImplicitProblem::maxTimeStepSize()
Scalar maxTimeStepSize() const
{
return maxTimeStepSize_;
}
- //! \copydoc Dumux::ImplicitProblem::nextTimeStepSize()
+ //! \copydoc ImplicitProblem::nextTimeStepSize()
Scalar nextTimeStepSize(const Scalar dt)
{
return newtonCtl_.suggestTimeStepSize(dt);
@@ -226,15 +226,15 @@ public:
model_.updateSuccessful();
}
- //! \copydoc Dumux::ImplicitProblem::shouldWriteOutput()
+ //! \copydoc ImplicitProblem::shouldWriteOutput()
bool shouldWriteOutput() const
{ return true; }
- //! \copydoc Dumux::ImplicitProblem::shouldWriteRestartFile()
+ //! \copydoc ImplicitProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{ return false; }
- //! \copydoc Dumux::ImplicitProblem::episodeEnd()
+ //! \copydoc ImplicitProblem::episodeEnd()
void episodeEnd()
{
std::cerr << "The end of an episode is reached, but the problem "
@@ -242,7 +242,7 @@ public:
<< "Doing nothing!\n";
}
- //! \copydoc Dumux::ImplicitProblem::advanceTimeLevel()
+ //! \copydoc ImplicitProblem::advanceTimeLevel()
void advanceTimeLevel()
{
asImp_().sdProblem1().advanceTimeLevel();
@@ -251,7 +251,7 @@ public:
model_.advanceTimeLevel();
}
- //! \copydoc Dumux::ImplicitProblem::writeOutput()
+ //! \copydoc ImplicitProblem::writeOutput()
void writeOutput()
{
// write the current result to disk
@@ -264,35 +264,35 @@ public:
// \}
- //! \copydoc Dumux::ImplicitProblem::name()
+ //! \copydoc ImplicitProblem::name()
const char *name() const
{ return simname_.c_str(); }
- //! \copydoc Dumux::ImplicitProblem::setName()
+ //! \copydoc ImplicitProblem::setName()
static void setName(const char *newName)
{ simname_ = newName; }
- //! \copydoc Dumux::ImplicitProblem::timeManager()
+ //! \copydoc ImplicitProblem::timeManager()
TimeManager &timeManager()
{ return timeManager_; }
- //! \copydoc Dumux::ImplicitProblem::timeManager()
+ //! \copydoc ImplicitProblem::timeManager()
const TimeManager &timeManager() const
{ return timeManager_; }
- //! \copydoc Dumux::ImplicitProblem::newtonController()
+ //! \copydoc ImplicitProblem::newtonController()
NewtonController &newtonController()
{ return newtonCtl_; }
- //! \copydoc Dumux::ImplicitProblem::newtonController()
+ //! \copydoc ImplicitProblem::newtonController()
const NewtonController &newtonController() const
{ return newtonCtl_; }
- //! \copydoc Dumux::ImplicitProblem::model()
+ //! \copydoc ImplicitProblem::model()
Model &model()
{ return model_; }
- //! \copydoc Dumux::ImplicitProblem::model()
+ //! \copydoc ImplicitProblem::model()
const Model &model() const
{ return model_; }
// \}
diff --git a/dumux/multidomain/subdomainpropertydefaults.hh b/dumux/multidomain/subdomainpropertydefaults.hh
index 6e2d40d263366af64f6d1807b69d7ee07d477ebb..394fc044a82529178c3e43ed021fe4d4d16cd795 100644
--- a/dumux/multidomain/subdomainpropertydefaults.hh
+++ b/dumux/multidomain/subdomainpropertydefaults.hh
@@ -61,7 +61,7 @@ SET_TYPE_PROP(SubDomain, BaseLocalResidual, BoxCouplingLocalResidual<TypeTag>);
// set the local operator used for submodels
SET_TYPE_PROP(SubDomain, LocalOperator,
- Dumux::PDELab::MultiDomainLocalOperator<TypeTag>);
+ PDELab::MultiDomainLocalOperator<TypeTag>);
// use the time manager for the coupled problem in the sub problems
SET_PROP(SubDomain, TimeManager)
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index dbeb48187fe6e9483dc77679193c73555eba2c5b..6f43f1b0fd2e456615b91efcbb107172158930d7 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -118,7 +118,7 @@ NEW_PROP_TAG(NewtonMaxSteps);
NEW_PROP_TAG(JacobianAssembler);
// set default values
-SET_TYPE_PROP(NewtonMethod, NewtonController, Dumux::NewtonController<TypeTag>);
+SET_TYPE_PROP(NewtonMethod, NewtonController, NewtonController<TypeTag>);
SET_BOOL_PROP(NewtonMethod, NewtonWriteConvergence, false);
SET_BOOL_PROP(NewtonMethod, NewtonUseLineSearch, false);
SET_BOOL_PROP(NewtonMethod, NewtonEnableShiftCriterion, true);
@@ -354,7 +354,7 @@ public:
/*!
* \brief Solve the linear system of equations \f$\mathbf{A}x - b = 0\f$.
*
- * Throws Dumux::NumericalProblem if the linear solver didn't
+ * Throws NumericalProblem if the linear solver didn't
* converge.
*
* \param A The matrix of the linear system of equations
@@ -397,7 +397,7 @@ public:
if (gridView_().comm().size() > 1)
converged = gridView_().comm().min(converged);
- Dumux::NumericalProblem p;
+ NumericalProblem p;
std::string msg;
std::ostringstream ms(msg);
ms << e.what() << "M=" << A[e.r][e.c];
@@ -410,7 +410,7 @@ public:
if (gridView_().comm().size() > 1)
converged = gridView_().comm().min(converged);
- Dumux::NumericalProblem p;
+ NumericalProblem p;
p.message(e.what());
throw p;
}
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index 96c4e96aafd9da2f6a7958716eb73d27ad11b2e9..55b5531036f4b9613929dd76505af9d57bc827b9 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -105,7 +105,7 @@ public:
try {
return execute_(ctl);
}
- catch (const Dumux::NumericalProblem &e) {
+ catch (const NumericalProblem &e) {
if (ctl.verbose())
std::cout << "Newton: Caught exception: \"" << e.what() << "\"\n";
ctl.newtonFail();
diff --git a/dumux/porousmediumflow/1p/implicit/model.hh b/dumux/porousmediumflow/1p/implicit/model.hh
index 075e2a45db1405017337ab41ec8987249c0dbb47..55561343dcc8327f4eac20907730425632abe8e4 100644
--- a/dumux/porousmediumflow/1p/implicit/model.hh
+++ b/dumux/porousmediumflow/1p/implicit/model.hh
@@ -70,7 +70,7 @@ class OnePModel : public GET_PROP_TYPE(TypeTag, BaseModel)
public:
/*!
- * \brief \copybrief Dumux::ImplicitModel::addOutputVtkFields
+ * \brief \copybrief ImplicitModel::addOutputVtkFields
*
* Specialization for the OnePModel, adding the pressure and
* the process rank to the VTK writer.
diff --git a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh b/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
index a92a2168ef7aefab10b336cdbc635defcb55da88..8a4b0c0988bc47043cfddae54638662eb2800a2f 100644
--- a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
@@ -82,13 +82,13 @@ SET_SCALAR_PROP(OneP, ImplicitMassUpwindWeight, 0.5);
SET_SCALAR_PROP(OneP, ImplicitMobilityUpwindWeight, 0.5);
//! The fluid system to use by default
-SET_TYPE_PROP(OneP, FluidSystem, Dumux::FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
+SET_TYPE_PROP(OneP, FluidSystem, FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
SET_PROP(OneP, Fluid)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
/*!
@@ -102,7 +102,7 @@ SET_PROP(OneP, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
};
// disable velocity output by default
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
index 753992fe9ce87946787ff718aa689dc5f77c022d..f905a8b35f0426131fe4eb8c66d9b8a5c9908e0e 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressureproperties.hh
@@ -71,9 +71,9 @@ namespace Properties
// Properties
//////////////////////////////////////////////////////////////////
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FVPressureOneP, Velocity, Dumux::FVVelocity1P<TypeTag> );
+SET_TYPE_PROP( FVPressureOneP, Velocity, FVVelocity1P<TypeTag> );
//! Set finite volume implementation of the one-phase pressure equation as default pressure model
-SET_TYPE_PROP(FVPressureOneP, PressureModel, Dumux::FVPressure1P<TypeTag>);
+SET_TYPE_PROP(FVPressureOneP, PressureModel, FVPressure1P<TypeTag>);
//! Allow assembling algorithm for the pressure matrix to assemble only from one side of a cell-cell interface
SET_BOOL_PROP(FVPressureOneP, VisitFacesOnlyOnce, true);
// \}
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocity.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocity.hh
index 8516e04ef8511b1c4b1ef7842353558d49df568c..5b822c8cbc69c01cca6d0421bcab37663e6b7dd4 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocity.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocity.hh
@@ -102,7 +102,7 @@ public:
{}
private:
- Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
+ FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
};
}
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
index fd08ddce2a5069a457035d68ad5b43e1866e300c..eaba8ee5fe2937eedeca81b013fa8fc7fbd24416 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
@@ -71,9 +71,9 @@ namespace Properties
// Properties
//////////////////////////////////////////////////////////////////
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FVPressureVelocityOneP, Velocity, Dumux::FVVelocity1P<TypeTag> );
+SET_TYPE_PROP( FVPressureVelocityOneP, Velocity, FVVelocity1P<TypeTag> );
//! Set finite volume implementation of the one-phase pressure equation as default pressure model
-SET_TYPE_PROP(FVPressureVelocityOneP, PressureModel, Dumux::FVPressureVelocity1P<TypeTag>);
+SET_TYPE_PROP(FVPressureVelocityOneP, PressureModel, FVPressureVelocity1P<TypeTag>);
//! Allow assembling algorithm for the pressure matrix to assemble only from one side of a cell-cell interface
SET_BOOL_PROP(FVPressureVelocityOneP, VisitFacesOnlyOnce, true);
// \}
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh b/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh
index ccf6f56dd04216d4dd0015e14fe01c854005ef3c..78f3e288b5a0ca9ee9abd5ad78a8461c0bc72d3a 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/problem.hh
@@ -233,7 +233,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh b/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
index 4c57e059ec47f077cd825526edbade2ed5e3e805..355dbc51ed7cf547c1c9cc862c63a14d578d22ce 100644
--- a/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
@@ -81,7 +81,7 @@ SET_PROP(OnePTwoC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! set default upwind weight to 1.0, i.e. fully upwind
diff --git a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
index 150a8cede283e16cbbbef3742dbd2cbee235a4cf..b4948d015bda9a8914ad844c007fe2f0557749c1 100644
--- a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
@@ -103,14 +103,14 @@ SET_PROP(TwoP, WettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(TwoP, NonwettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(TwoP, FluidSystem)
@@ -120,7 +120,7 @@ SET_PROP(TwoP, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
- typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ typedef FluidSystems::TwoPImmiscible<Scalar,
WettingPhase,
NonwettingPhase> type;
};
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
index 1c22f06e23b14fdb1a372884e877513570224d1d..f82a284ae079062f6e7de80ac8c60208173cdd46 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
@@ -554,7 +554,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
index 97fc8f91731407c4c11cf69cc74cb1cf214773fd..f1bcfdd2850c311bfd01ab1963cf5107f007af8f 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressureproperties.hh
@@ -71,9 +71,9 @@ namespace Properties
// Properties
//////////////////////////////////////////////////////////////////
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FVPressureTwoP, Velocity, Dumux::FVVelocity2P<TypeTag> );
+SET_TYPE_PROP( FVPressureTwoP, Velocity, FVVelocity2P<TypeTag> );
//! Set finite volume implementation of the two-phase pressure equation as default pressure model
-SET_TYPE_PROP(FVPressureTwoP, PressureModel, Dumux::FVPressure2P<TypeTag>);
+SET_TYPE_PROP(FVPressureTwoP, PressureModel, FVPressure2P<TypeTag>);
//! Allow assembling algorithm for the pressure matrix to assemble only from one side of a cell-cell interface
SET_BOOL_PROP(FVPressureTwoP, VisitFacesOnlyOnce, true);
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
index 4a0f014824941746bb75401aa89f89f7f1f0322c..a0ffb6267db89e82fec408af2fbc820c850894fb 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurepropertiesadaptive.hh
@@ -72,9 +72,9 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! Set velocity reconstruction implementation for grid-adaptive cell centered finite volume schemes as default
-SET_TYPE_PROP( FVPressureTwoPAdaptive, Velocity, Dumux::FVVelocity2PAdaptive<TypeTag> );
+SET_TYPE_PROP( FVPressureTwoPAdaptive, Velocity, FVVelocity2PAdaptive<TypeTag> );
//! Set finite volume implementation of the two-phase pressure equation which allows hanging nodes as default pressure model
-SET_TYPE_PROP(FVPressureTwoPAdaptive, PressureModel, Dumux::FVPressure2PAdaptive<TypeTag>);
+SET_TYPE_PROP(FVPressureTwoPAdaptive, PressureModel, FVPressure2PAdaptive<TypeTag>);
//! Allow assembling algorithm for the pressure matrix to assemble only from one side of a cell-cell interface
SET_BOOL_PROP(FVPressureTwoPAdaptive, VisitFacesOnlyOnce, true);
}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocity.hh
index d0ff3592e5e4ad6467c8619797de1b153c084106..69426627fb96b0e21e995bbb1e986b9e580e77a1 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocity.hh
@@ -91,7 +91,7 @@ public:
{}
private:
- Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
+ FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
};
}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
index 902f553e58b533f54db283207c057253e1ebadb5..76ce11411a62df6de2c442407793121c608f1da7 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressurevelocityproperties.hh
@@ -71,9 +71,9 @@ namespace Properties
// Properties
//////////////////////////////////////////////////////////////////
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FVPressureVelocityTwoP, Velocity, Dumux::FVVelocity2P<TypeTag> );
+SET_TYPE_PROP( FVPressureVelocityTwoP, Velocity, FVVelocity2P<TypeTag> );
//! Set finite volume implementation of the one-phase pressure equation as default pressure model
-SET_TYPE_PROP(FVPressureVelocityTwoP, PressureModel, Dumux::FVPressureVelocity2P<TypeTag>);
+SET_TYPE_PROP(FVPressureVelocityTwoP, PressureModel, FVPressureVelocity2P<TypeTag>);
//! Allow assembling algorithm for the pressure matrix to assemble only from one side of a cell-cell interface
SET_BOOL_PROP(FVPressureVelocityTwoP, VisitFacesOnlyOnce, true);
// \}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
index f450899a93da0066939e5de8c7d1fa443e8c97f5..5722ce28da61872dfa3b1b8dfc8e53021410b87c 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/localstiffness.hh
@@ -76,7 +76,7 @@ namespace Dumux
// types for matrics, vectors and boundary conditions
typedef Dune::FieldMatrix<Scalar,m,m> MBlockType; // one entry in the stiffness matrix
typedef Dune::FieldVector<Scalar,m> VBlockType; // one entry in the global vectors
- typedef std::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
+ typedef std::array<BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
virtual ~LocalStiffness ()
@@ -256,7 +256,7 @@ namespace Dumux
// types for matrics, vectors and boundary conditions
typedef Dune::FieldMatrix<Scalar,m,m> MBlockType; // one entry in the stiffness matrix
typedef Dune::FieldVector<Scalar,m> VBlockType; // one entry in the global vectors
- typedef std::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
+ typedef std::array<BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
/*! initialize local stiffness matrix */
LinearLocalStiffness ()
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
index 9c3444e5ef65ba2287cbdaec4b4ab7bc3714ad99..837e142b4b32a5b0df1aff7d905d594a50d58eaf 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
@@ -145,8 +145,8 @@ public:
* to calculated the transmissibility matrices of one MPFA interaction volume.
*
*/
- typedef Dumux::FVMPFALInteractionVolume<TypeTag> InteractionVolume;
- typedef Dumux::FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FVMPFALInteractionVolume<TypeTag> InteractionVolume;
+ typedef FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
private:
typedef std::vector<InteractionVolume> GlobalInteractionVolumeVector;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
index aa48172cd7ebe23f738e25f41747b639560192b5..92ca45d8c92605d4cab9b5dc3238690638fa5644 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
@@ -151,8 +151,8 @@ public:
* to calculated the transmissibility matrices of one MPFA interaction volume.
*
*/
- typedef Dumux::FVMPFALInteractionVolume<TypeTag> InteractionVolume;
- typedef Dumux::FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FVMPFALInteractionVolume<TypeTag> InteractionVolume;
+ typedef FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
private:
typedef std::vector<InteractionVolume> GlobalInteractionVolumeVector;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureproperties.hh
index 79f19ad3a0df6a555ce429bfe464864256646e89..0d37bb2617af4b33d9d8ca67b5103ab933c0a144 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureproperties.hh
@@ -46,9 +46,9 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(FvMpfaL2dPressureTwoP, PressureModel, Dumux::FvMpfaL2dPressureVelocity2p<TypeTag>);
+SET_TYPE_PROP(FvMpfaL2dPressureTwoP, PressureModel, FvMpfaL2dPressureVelocity2p<TypeTag>);
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FvMpfaL2dPressureTwoP, Velocity, Dumux::FvMpfaVelocityInTransport<TypeTag> );
+SET_TYPE_PROP( FvMpfaL2dPressureTwoP, Velocity, FvMpfaVelocityInTransport<TypeTag> );
}
}// end of Dune namespace
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurepropertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurepropertiesadaptive.hh
index f2d5338ae0acbdbf329633a781508aed20981b2d..2d4dcc27fcd19c2895d072df8dbc49218b3c4114 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurepropertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurepropertiesadaptive.hh
@@ -46,9 +46,9 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(FvMpfaL2dPressureTwoPAdaptive, PressureModel, Dumux::FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>);
+SET_TYPE_PROP(FvMpfaL2dPressureTwoPAdaptive, PressureModel, FvMpfaL2dPressureVelocity2pAdaptive<TypeTag>);
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FvMpfaL2dPressureTwoPAdaptive, Velocity, Dumux::FvMpfaVelocityInTransport<TypeTag> );
+SET_TYPE_PROP( FvMpfaL2dPressureTwoPAdaptive, Velocity, FvMpfaVelocityInTransport<TypeTag> );
}
}// end of Dune namespace
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh
index ab061dc244ee5a889957ee69db37e661ea76c636..e2443ccd6edf465dd666bf2c49fa4c8eb211d183 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dtransmissibilitycalculator.hh
@@ -57,7 +57,7 @@ class FvMpfaL2dTransmissibilityCalculator
typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef typename Dumux::FVMPFALInteractionVolume<TypeTag> InteractionVolume;
+ typedef FVMPFALInteractionVolume<TypeTag> InteractionVolume;
public:
typedef Dune::FieldMatrix<Scalar, dim, 2 * dim - dim + 1> TransmissibilityType;//!< Type of the transmissibility matrix
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
index b75effed29b3f56cc7755cba223a4e622de8cafa..e8207c6024706361c711035b192b5228e2f18f94 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
@@ -89,8 +89,8 @@ template<class TypeTag> class FvMpfaL2dVelocity2p
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
- typedef typename Dumux::FVMPFALInteractionVolume<TypeTag> InteractionVolume;
- typedef Dumux::FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FVMPFALInteractionVolume<TypeTag> InteractionVolume;
+ typedef FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
typedef std::vector<Dune::FieldVector<bool, 2 * dim> > InnerBoundaryVolumeFaces;
enum
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
index c1cfa2a6391d36df0f1c67a5d3bc54258c7aeeef..3ff8540e2f5c7ac807ff6d4bd1989cc7e4c3fcef 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocityadaptive.hh
@@ -86,9 +86,9 @@ template<class TypeTag> class FvMpfaL2dVelocity2pAdaptive : public FvMpfaL2dVelo
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
- typedef typename Dumux::FVMPFALInteractionVolume<TypeTag> InteractionVolume;
+ typedef FVMPFALInteractionVolume<TypeTag> InteractionVolume;
typedef std::vector<Dune::FieldVector<bool, 2 * dim> > InnerBoundaryVolumeFaces;
- typedef Dumux::FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
enum
{
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
index d950ade0f25a1760c8561f85fd884051fbececd5..a87057e68491ceec6d1bbf73572415547c6dca24 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
@@ -96,7 +96,7 @@ class FvMpfaL3dInteractionVolumeContainer
};
public:
- //! Type for storing an MPFA-interaction-volume. (Usually of type Dumux::FvMpfaL3dInteractionVolume or Dumux::FvMpfaL3dInteractionVolumeAdaptive)
+ //! Type for storing an MPFA-interaction-volume. (Usually of type FvMpfaL3dInteractionVolume or FvMpfaL3dInteractionVolumeAdaptive)
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
private:
@@ -354,7 +354,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const
* Stores information with respect to DUNE intersections, such as normals,
* in the interaction volumes. Assumes a local storage following the DUNE
* reference element index, which is performed by the function
- * Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
+ * FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
* std::vector < std::vector<int> >& elemVertMap).
*
* \param element A level 0 Entity of a DUNE grid
@@ -1322,7 +1322,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeIntersectionInfo(const E
* - flux face areas
*
* Assumes a local storage following the DUNE reference element index, which is performed by the
- * function Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
+ * function FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
* std::vector < std::vector<int> >& elemVertMap).
*
* \param interactionVolume An interaction volume object
@@ -1459,7 +1459,7 @@ void FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeInnerInteractionVolume(I
* editors, Simulation of Flow in Porous Media - Applications in Energy and Environment. De Gruyter.)
*
* Assumes a local storage following the DUNE reference element index, which is performed by the
- * function Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
+ * function FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements(const Element& element,
* std::vector < std::vector<int> >& elemVertMap).
*
* \param interactionVolume An interaction volume object
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
index aa342558f6c9373fc8753a192c0904ac5a729e23..32cff04d0a5be3f5c83604a4fcfddcf580165e97 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
@@ -82,7 +82,7 @@ class FvMpfaL3dInteractionVolumeContainerAdaptive: public FvMpfaL3dInteractionVo
public:
//! Type for storing an MPFA-interaction-volume.
- //! (Usually of type Dumux::FvMpfaL3dInteractionVolume or Dumux::FvMpfaL3dInteractionVolumeAdaptive)
+ //! (Usually of type FvMpfaL3dInteractionVolume or FvMpfaL3dInteractionVolumeAdaptive)
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
private:
@@ -127,7 +127,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
@@ -146,7 +146,7 @@ private:
*
* Assumes a local storage following the DUNE reference element index, which is
* performed by the function
- * Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
+ * FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
* (const Element& element, std::vector < std::vector<int> >& elemVertMap).
*
* In the case of an adaptive grids with hanging nodes it is important to notice,
@@ -179,7 +179,7 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInnerInteraction
// Generate and store the geometric information going from the coarsest to the finest level.
// For the calculation we take advantage from the fact that the ordering inside the interaction volume
// with respect to the DUNE reference element is known due to the storage process of the elements in
- // Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
+ // FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
// (const Element& element, std::vector < std::vector<int> >& elemVertMap)
for (int i = 0; i < 8; i++)
{
@@ -296,7 +296,7 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeInnerInteraction
*
* - missing cells: As hanging nodes cannot be accessed from a cell face using the DUNE reference element,
* the attached coarser cells do not appear in the interaction volume object after
- * execution of the function Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
+ * execution of the function FvMpfaL3dInteractionVolumeContainer<TypeTag>::storeSubVolumeElements
* (const Element& element, std::vector < std::vector<int> >& elemVertMap).
* We take advantage of this fact because it allows us to identify the type of hanging-node interaction volume.
* If, for example, only two cells are stored, we know that the interaction volume is of type 5 according to
@@ -335,7 +335,7 @@ void FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>::storeHangingNodeInter
// Generate and store the geometric information going from the coarsest to the finest level.
// For the calculation we take advantage from the fact that the ordering inside the interaction volume
// with respect to the DUNE reference element is known due to the storage process of the elements in
- // Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>::
+ // FvMpfaL3dInteractionVolumeContainer<TypeTag>::
// storeSubVolumeElements(const Element& element, std::vector < std::vector<int> >& elemVertMap)
for (int i = 0; i < 8; i++)
{
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
index d96ae57c0f3d048a4f84f1ee7e814c7377dcf8e0..53f31518fa2920572b5613ea779656314d9b1ab3 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressure.hh
@@ -148,7 +148,7 @@ class FvMpfaL3dPressure2p: public FVPressure<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolumeContainer) InteractionVolumeContainer;
- typedef Dumux::FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
public:
//! Type including methods for calculation of MPFA transmissibilities
typedef typename TransmissibilityCalculator::TransmissibilityType TransmissibilityType;
@@ -508,7 +508,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
index 37d58fa5bfe846f97bf9dae28643ba718f79bec7..cda27a8e0c967bcf9b4e458aa5e8924b40fb9a06 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureadaptive.hh
@@ -151,7 +151,7 @@ class FvMpfaL3dPressure2pAdaptive: public FvMpfaL3dPressure2p<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolumeContainer) InteractionVolumeContainer;
- typedef Dumux::FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
public:
//! Type including methods for calculation of MPFA transmissibilities
typedef typename TransmissibilityCalculator::TransmissibilityType TransmissibilityType;
@@ -191,7 +191,7 @@ public:
ParentType::initialize();
}
- //! updates the pressure field (analog to update function in Dumux::IMPET)
+ //! updates the pressure field (analog to update function in IMPET)
void update()
{
int size = problem_.gridView().size(0);
@@ -249,7 +249,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh
index bfd3f53598c76425fbee60a739a5d36000ac563b..bca93c3cfe391d7b83c2043af827d6aa667d6a25 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressureproperties.hh
@@ -45,10 +45,10 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(FvMpfaL3dPressureTwoP, MPFAInteractionVolume, Dumux::FvMpfaL3dInteractionVolume<TypeTag>);
-SET_TYPE_PROP(FvMpfaL3dPressureTwoP, MPFAInteractionVolumeContainer, Dumux::FvMpfaL3dInteractionVolumeContainer<TypeTag>);
-SET_TYPE_PROP(FvMpfaL3dPressureTwoP, PressureModel, Dumux::FvMpfaL3dPressureVelocity2p<TypeTag>);
-SET_TYPE_PROP( FvMpfaL3dPressureTwoP, Velocity, Dumux::FvMpfaVelocityInTransport<TypeTag> );
+SET_TYPE_PROP(FvMpfaL3dPressureTwoP, MPFAInteractionVolume, FvMpfaL3dInteractionVolume<TypeTag>);
+SET_TYPE_PROP(FvMpfaL3dPressureTwoP, MPFAInteractionVolumeContainer, FvMpfaL3dInteractionVolumeContainer<TypeTag>);
+SET_TYPE_PROP(FvMpfaL3dPressureTwoP, PressureModel, FvMpfaL3dPressureVelocity2p<TypeTag>);
+SET_TYPE_PROP( FvMpfaL3dPressureTwoP, Velocity, FvMpfaVelocityInTransport<TypeTag> );
}
}// end of Dune namespace
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurepropertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurepropertiesadaptive.hh
index 1c49f675a18022c3202122dda2ec13514902db81..6f65354f7cd54ecf57c8682b382c21b421677c30 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurepropertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurepropertiesadaptive.hh
@@ -46,10 +46,10 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, MPFAInteractionVolume, Dumux::FvMpfaL3dInteractionVolumeAdaptive<TypeTag>);
-SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, MPFAInteractionVolumeContainer, Dumux::FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>);
-SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, PressureModel, Dumux::FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>);
-SET_TYPE_PROP( FvMpfaL3dPressureTwoPAdaptive, Velocity, Dumux::FvMpfaVelocityInTransport<TypeTag> );
+SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, MPFAInteractionVolume, FvMpfaL3dInteractionVolumeAdaptive<TypeTag>);
+SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, MPFAInteractionVolumeContainer, FvMpfaL3dInteractionVolumeContainerAdaptive<TypeTag>);
+SET_TYPE_PROP(FvMpfaL3dPressureTwoPAdaptive, PressureModel, FvMpfaL3dPressureVelocity2pAdaptive<TypeTag>);
+SET_TYPE_PROP( FvMpfaL3dPressureTwoPAdaptive, Velocity, FvMpfaVelocityInTransport<TypeTag> );
}
}// end of Dune namespace
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
index 907f252f47d5d2d31036dee480f0ed30f2793d47..9562bf224d452fda3eb1c0ee0f8ca9d19c639819 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocity.hh
@@ -90,7 +90,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2p
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolumeContainer) InteractionVolumeContainer;
- typedef Dumux::FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
typedef typename TransmissibilityCalculator::TransmissibilityType TransmissibilityType;
enum
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
index 6d600397d959edc9edf6d4a5c8bd88e776812d32..2c0d17cc898851f4e8ded1cf205815a3cc904196 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dvelocityadaptive.hh
@@ -89,7 +89,7 @@ template<class TypeTag> class FvMpfaL3dVelocity2pAdaptive: public FvMpfaL3dVeloc
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolumeContainer) InteractionVolumeContainer;
- typedef Dumux::FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL3dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
typedef typename TransmissibilityCalculator::TransmissibilityType TransmissibilityType;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
index 23a4cc1c294e2c942509ead6f2135b8dae486da9..5d51d70fb071535b42c4141f4288c71f136e09ff 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
@@ -132,7 +132,7 @@ class FvMpfaO2dPressure2p: public FVPressure<TypeTag>
typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef Dumux::FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
+ typedef FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
typedef std::vector<InteractionVolume> GlobalInteractionVolumeVector;
typedef std::vector<Dune::FieldVector<bool, 2 * dim> > InnerBoundaryVolumeFaces;
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressureproperties.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressureproperties.hh
index d3b46ed1caf065d97644626bcd968d76fc35576e..948b340d708c5f46f1bdfcb18da97e416f69a3f6 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressureproperties.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressureproperties.hh
@@ -46,9 +46,9 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(FvMpfaO2dPressureTwoP, PressureModel, Dumux::FvMpfaO2dPressureVelocity2p<TypeTag>);
+SET_TYPE_PROP(FvMpfaO2dPressureTwoP, PressureModel, FvMpfaO2dPressureVelocity2p<TypeTag>);
//! Set velocity reconstruction implementation standard cell centered finite volume schemes as default
-SET_TYPE_PROP( FvMpfaO2dPressureTwoP, Velocity, Dumux::FvMpfaVelocityInTransport<TypeTag> );
+SET_TYPE_PROP( FvMpfaO2dPressureTwoP, Velocity, FvMpfaVelocityInTransport<TypeTag> );
}
}// end of Dune namespace
#endif
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
index 06b6061a286d8764d98730539782b09ef374e3c5..1fe33cf2afae93ac42b589459459000edaca2326 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
@@ -72,7 +72,7 @@ template<class TypeTag> class FvMpfaO2dPressureVelocity2p: public FvMpfaO2dPress
typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- typedef Dumux::FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
+ typedef FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
index 30f054984cf20756b016a9f7710911137211a343..5d411f3043c381767f78cd230314f933cbb341a1 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
@@ -88,7 +88,7 @@ template<class TypeTag> class FvMpfaO2dVelocity2P
typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
- typedef typename Dumux::FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
+ typedef FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
typedef std::vector<Dune::FieldVector<bool, 2 * dim> > InnerBoundaryVolumeFaces;
enum
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh b/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh
index 20ab800ceb4fa6089a25f49879f2249dca82b32f..889e088e8cdd4130c50981d554e671c030f78d05 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/problem.hh
@@ -230,7 +230,7 @@ public:
PressureModel &pressureModel()
{ return *pressModel_; }
- //! \copydoc Dumux::IMPETProblem::pressureModel()
+ //! \copydoc IMPETProblem::pressureModel()
const PressureModel &pressureModel() const
{ return *pressModel_; }
@@ -241,7 +241,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/2p/sequential/impes/propertiesadaptive.hh b/dumux/porousmediumflow/2p/sequential/impes/propertiesadaptive.hh
index 5d4231b1312e37b41a71133f9ca9199cee66f0de..694ec7decb1b503513ef0759d3f23c9a1e282d1f 100644
--- a/dumux/porousmediumflow/2p/sequential/impes/propertiesadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/impes/propertiesadaptive.hh
@@ -66,9 +66,9 @@ namespace Properties
//! Enable adaptive grid
SET_BOOL_PROP(IMPESTwoPAdaptive, AdaptiveGrid, true);
//! Set variable class for adaptive impet schemes
-SET_TYPE_PROP(IMPESTwoPAdaptive, Variables, Dumux::VariableClassAdaptive<TypeTag>);
+SET_TYPE_PROP(IMPESTwoPAdaptive, Variables, VariableClassAdaptive<TypeTag>);
//! Set cell data class for adaptive two-phase IMPES schemes
-SET_TYPE_PROP(IMPESTwoPAdaptive, CellData, Dumux::CellData2PAdaptive<TypeTag>);
+SET_TYPE_PROP(IMPESTwoPAdaptive, CellData, CellData2PAdaptive<TypeTag>);
//! Set the standard indicator class of two-phase models for adaption or coarsening
SET_TYPE_PROP(IMPESTwoPAdaptive, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
//!Set default class for adaptation initialization indicator
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh
index 8f691b88fbc26ede5899116e1963d28a36a8d5d5..5afdb6cbb8559bd884892d4b7886c9d5a5bb70be 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/properties.hh
@@ -69,7 +69,7 @@ SET_TYPE_PROP(FVTransportTwoP, GravityFlux, ConvectivePart<TypeTag>);
//! \brief Set PrecomputedConstRels flag <tt>true</tt> as default
SET_BOOL_PROP( FVTransportTwoP, PrecomputedConstRels, true);
//! Set finite volume implementation of the two-phase saturation equation as default saturation model
-SET_TYPE_PROP(FVTransportTwoP, TransportModel, Dumux::FVSaturation2P<TypeTag>);
+SET_TYPE_PROP(FVTransportTwoP, TransportModel, FVSaturation2P<TypeTag>);
}
}
diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
index 09cbcb93ffe2a8f265c7dcb513fa40b46bc7f91b..75adb9acb36af0763ab992477e770263e9e28574 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh
@@ -494,7 +494,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/2p/sequential/transport/problem.hh b/dumux/porousmediumflow/2p/sequential/transport/problem.hh
index 373594998a3c4ba245fb952e26179d3932f38c91..2c5be220c6162c8393a5ecd37e534d485c9b1374 100644
--- a/dumux/porousmediumflow/2p/sequential/transport/problem.hh
+++ b/dumux/porousmediumflow/2p/sequential/transport/problem.hh
@@ -234,7 +234,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/2p2c/implicit/fluxvariables.hh b/dumux/porousmediumflow/2p2c/implicit/fluxvariables.hh
index a7b920c898af54e9126a23a04de5784d70fbb494..c5fbbb1165cce05ae34fd1357e1c8150eac98d63 100644
--- a/dumux/porousmediumflow/2p2c/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/fluxvariables.hh
@@ -197,7 +197,7 @@ class TwoPTwoCFluxVariables : public GET_PROP_TYPE(TypeTag, BaseFluxVariables)
if (sat <= 0)
return 0;
- static const Dumux::Spline<Scalar> sp(0, eps, // x0, x1
+ static const Spline<Scalar> sp(0, eps, // x0, x1
0, 0.5, // y0, y1
0, 0); // m0, m1
return sp.eval(sat);
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 391543ea9faabd4601f9b83ba1d96c45de2b2aa0..efbd00e4d23138d1e4001fa605c4dc7d99c343cd 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -512,7 +512,7 @@ public:
}
succeeded = 1;
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "\n"
<< "Rank " << this->problem_().gridView().comm().rank()
diff --git a/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh b/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh
index db9579b3c227d226d621e428bad11e9623c3d2dd..9fb6c536649af7b72c0e4e5df16a8bb25ec340bb 100644
--- a/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh
@@ -71,7 +71,7 @@ public:
if (this->gridView_().comm().size() > 1)
succeeded = this->gridView_().comm().min(succeeded);
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "rank " << this->problem_().gridView().comm().rank()
<< " caught an exception while updating:" << e.what()
diff --git a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
index 4cf0e7e13269b980175c7d6abc550be8c0738d68..032145d8647f9b28492f8078ed6d7f6f04097a42 100644
--- a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
@@ -96,7 +96,7 @@ SET_PROP(TwoPTwoC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Set the number of equations to 2
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldata.hh b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
index 63921ce557db9f6e617895cf3b4c5a4c39fb4907..4d16cdfcac14711d2d1de99d02ef2645d9b63daa 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldata.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldata.hh
@@ -146,7 +146,7 @@ public:
{
return massConcentration_[compIdx];
}
- //! \copydoc Dumux::CellData2P2C::totalConcentration()
+ //! \copydoc CellData2P2C::totalConcentration()
const Scalar massConcentration(int compIdx) const
{
return massConcentration_[compIdx];
@@ -162,7 +162,7 @@ public:
{
massConcentration_[compIdx] = value;
}
- //! \copydoc Dumux::CellData2P2C::setTotalConcentration()
+ //! \copydoc CellData2P2C::setTotalConcentration()
void setMassConcentration(int compIdx, Scalar value)
{
massConcentration_[compIdx] = value;
@@ -279,23 +279,23 @@ public:
/*** b) from fluidstate ***/
- //! \copydoc Dumux::TwoPTwoCFluidState::setSaturation()
+ //! \copydoc TwoPTwoCFluidState::setSaturation()
void setSaturation(int phaseIdx, Scalar value)
{
fluidState_->setSaturation(phaseIdx, value);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::saturation()
+ //! \copydoc TwoPTwoCFluidState::saturation()
const Scalar saturation(int phaseIdx) const
{
return fluidState_->saturation(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::setViscosity()
+ //! \copydoc TwoPTwoCFluidState::setViscosity()
void setViscosity(int phaseIdx, Scalar value)
{
fluidState_->setViscosity(phaseIdx, value);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::viscosity()
+ //! \copydoc TwoPTwoCFluidState::viscosity()
const Scalar viscosity(int phaseIdx) const
{
return fluidState_->viscosity(phaseIdx);
@@ -309,31 +309,31 @@ public:
return fluidState_->pressure(nPhaseIdx) - fluidState_->pressure(wPhaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::density()
+ //! \copydoc TwoPTwoCFluidState::density()
const Scalar density(int phaseIdx) const
{
return (fluidState_->density(phaseIdx));
}
- //! \copydoc Dumux::TwoPTwoCFluidState::massFraction()
+ //! \copydoc TwoPTwoCFluidState::massFraction()
const Scalar massFraction(int phaseIdx, int compIdx) const
{
return fluidState_->massFraction(phaseIdx, compIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::moleFraction()
+ //! \copydoc TwoPTwoCFluidState::moleFraction()
const Scalar moleFraction(int phaseIdx, int compIdx) const
{
return fluidState_->moleFraction(phaseIdx, compIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::temperature()
+ //! \copydoc TwoPTwoCFluidState::temperature()
const Scalar temperature(int phaseIdx) const
{
return fluidState_->temperature(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::phaseMassFraction()
+ //! \copydoc TwoPTwoCFluidState::phaseMassFraction()
const Scalar phaseMassFraction(int phaseIdx) const
{
return fluidState_->phaseMassFraction(phaseIdx);
diff --git a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
index 2f691010fa6ccce7e9c7ad9c28f642ab8b22cda6..ae112de9bbcd1c6a6ac5585173a804e952a43bb7 100644
--- a/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/celldatamultiphysics.hh
@@ -75,7 +75,7 @@ public:
/*! \name Acess to primary variables */
//@{
- //! \copydoc Dumux::TwoPTwoCFluidState::pressure()
+ //! \copydoc TwoPTwoCFluidState::pressure()
Scalar pressure(int phaseIdx)
{
if(fluidStateType_ == simple)
@@ -85,7 +85,7 @@ public:
else
return this->fluidState_->pressure(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::pressure()
+ //! \copydoc TwoPTwoCFluidState::pressure()
const Scalar pressure(int phaseIdx) const
{
if(fluidStateType_ == simple)
@@ -95,7 +95,7 @@ public:
else
return this->fluidState_->pressure(phaseIdx);
}
- //! \copydoc Dumux::CellData2P2C::setPressure()
+ //! \copydoc CellData2P2C::setPressure()
void setPressure(int phaseIdx, Scalar value)
{
if(fluidStateType_ == simple)
@@ -138,7 +138,7 @@ public:
/*! \name Acess to secondary variables */
//@{
- //! \copydoc Dumux::TwoPTwoCFluidState::setSaturation()
+ //! \copydoc TwoPTwoCFluidState::setSaturation()
void setSaturation(int phaseIdx, Scalar value)
{
if(fluidStateType_ == simple)
@@ -149,7 +149,7 @@ public:
else
manipulateFluidState().setSaturation(phaseIdx, value);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::saturation()
+ //! \copydoc TwoPTwoCFluidState::saturation()
const Scalar saturation(int phaseIdx) const
{
if(fluidStateType_ == simple)
@@ -160,7 +160,7 @@ public:
return this->fluidState_->saturation(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::setViscosity()
+ //! \copydoc TwoPTwoCFluidState::setViscosity()
void setViscosity(int phaseIdx, Scalar value)
{
if(fluidStateType_ == simple)
@@ -171,7 +171,7 @@ public:
else
manipulateFluidState().setViscosity(phaseIdx, value);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::viscosity()
+ //! \copydoc TwoPTwoCFluidState::viscosity()
const Scalar viscosity(int phaseIdx) const
{
if(fluidStateType_ == simple)
@@ -185,7 +185,7 @@ public:
}
- //! \copydoc Dumux::TwoPTwoCFluidState::capillaryPressure()
+ //! \copydoc TwoPTwoCFluidState::capillaryPressure()
const Scalar capillaryPressure() const
{
if(fluidStateType_ == simple)
@@ -194,7 +194,7 @@ public:
return this->fluidState_->pressure(nPhaseIdx) - this->fluidState_->pressure(wPhaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::density()
+ //! \copydoc TwoPTwoCFluidState::density()
const Scalar density(int phaseIdx) const
{
if(fluidStateType_ == simple)
@@ -205,7 +205,7 @@ public:
return this->fluidState_->density(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::massFraction()
+ //! \copydoc TwoPTwoCFluidState::massFraction()
const Scalar massFraction(int phaseIdx, int compIdx) const
{
if(fluidStateType_ == simple)
@@ -216,7 +216,7 @@ public:
return this->fluidState_->massFraction(phaseIdx, compIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::moleFraction()
+ //! \copydoc TwoPTwoCFluidState::moleFraction()
const Scalar moleFraction(int phaseIdx, int compIdx) const
{
if(fluidStateType_ == simple)
@@ -226,7 +226,7 @@ public:
else
return this->fluidState_->moleFraction(phaseIdx, compIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::temperature()
+ //! \copydoc TwoPTwoCFluidState::temperature()
const Scalar temperature(int phaseIdx) const
{
if(fluidStateType_ == simple)
@@ -237,7 +237,7 @@ public:
return this->fluidState_->temperature(phaseIdx);
}
- //! \copydoc Dumux::TwoPTwoCFluidState::phaseMassFraction()
+ //! \copydoc TwoPTwoCFluidState::phaseMassFraction()
const Scalar phaseMassFraction(int phaseIdx) const
{
if(fluidStateType_ == simple)
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh
index 8c85d225f23f0b656a63e921c38fb0d162851e25..6687303926e623904b0ea7dd4994742ccf0d57eb 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv2dpressureadaptive.hh
@@ -117,7 +117,7 @@ template<class TypeTag> class FV2dPressure2P2CAdaptive
// the typenames used for the stiffness matrix and solution vector
typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
- typedef Dumux::FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
+ typedef FvMpfaL2dTransmissibilityCalculator<TypeTag> TransmissibilityCalculator;
protected:
Problem& problem()
{
@@ -188,7 +188,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
@@ -543,7 +543,7 @@ void FV2dPressure2P2CAdaptive<TypeTag>::getMpfaFlux(const IntersectionIterator&
// compute vectorized permeabilities
DimMatrix meanPermeability(0);
- Dumux::harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
+ harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitDistVec, permeability);
@@ -1179,7 +1179,7 @@ int FV2dPressure2P2CAdaptive<TypeTag>::transmissibilityAdapter_(const Intersecti
/**** end find 4 faces **/
// create Interaction Volume object
- Dumux::FVMPFALInteractionVolume<TypeTag> interactionVolume;
+ FVMPFALInteractionVolume<TypeTag> interactionVolume;
interactionVolume.setCenterPosition(corner1234);
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh
index f7a6b1cc7f182cf441099ce76bb0eb7475835dff..977fbd80869a25a0852a1fef08eada9e3dcd252f 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv2dtransportadaptive.hh
@@ -106,7 +106,7 @@ public:
/*!
* The compositional transport scheme can not be applied with a global pressure / total velocity
* formulation. This is a 2D-specific implementation! In case of 3d, use the class
- * Dumux::FV3dTransport2P2CAdaptive
+ * FV3dTransport2P2CAdaptive
*
* \param problem a problem class object
*/
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
index bb3c76aad9de295d7c54eb370b2fd192e3ba17cd..bb3c32c376b791f813abdd93c8333721fb8e05d7 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
@@ -46,8 +46,8 @@ namespace Dumux
{
namespace Properties
{
-SET_TYPE_PROP(SequentialTwoPTwoCAdaptive, MPFAInteractionVolume, Dumux::FvMpfaL3dInteractionVolumeAdaptive<TypeTag>);
-SET_TYPE_PROP(SequentialTwoPTwoCAdaptive, MPFAInteractionVolumeContainer, Dumux::FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>);
+SET_TYPE_PROP(SequentialTwoPTwoCAdaptive, MPFAInteractionVolume, FvMpfaL3dInteractionVolumeAdaptive<TypeTag>);
+SET_TYPE_PROP(SequentialTwoPTwoCAdaptive, MPFAInteractionVolumeContainer, FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>);
}
//! The finite volume model for the solution of the compositional pressure equation
@@ -263,7 +263,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
@@ -308,7 +308,7 @@ protected:
//! A pointer to the adaptive interaction volumes container
InteractionVolumeContainer* interactionVolumesContainer_;
//! The common implementation to calculate the Transmissibility with the mpfa-L-method
- Dumux::FvMpfaL3dTransmissibilityCalculator<TypeTag> mpfal3DTransmissibilityCalculator_;
+ FvMpfaL3dTransmissibilityCalculator<TypeTag> mpfal3DTransmissibilityCalculator_;
};
//! \copydoc FV2dPressure2P2CAdaptive::initializeMatrix()
@@ -826,7 +826,7 @@ void FV3dPressure2P2CAdaptive<TypeTag>::getMpfaFlux(const IntersectionIterator&
// compute vectorized permeabilities
DimMatrix meanPermeability(0);
- Dumux::harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
+ harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitDistVec, permeability);
@@ -1313,7 +1313,7 @@ void FV3dPressure2P2CAdaptive<TypeTag>::updateMaterialLaws(bool fromPostTimestep
* by the common mpfa-l--implementation of the 2p models. The latter is established via the
* protected method FV3dPressure2P2CAdaptive::transmissibilityAdapter_().
* The calculated Transmissivity Matrices are (along with some geometric information)
- * stored for later use in Dumux::Variableclass2p2cadaptive .
+ * stored for later use in Variableclass2p2cadaptive .
*
* \param isIt Iterator to the current intersection
* \param T Transmissitivity matrix of the first unique interaction volume
@@ -1799,7 +1799,7 @@ int FV3dPressure2P2CAdaptive<TypeTag>::computeTransmissibilities(const Intersect
//! Adapter to use the general implementation of the mpfa-l for the compositional models
/*! Depending on the subVolumeFaceIdx, the appropriate method in
- * Dumux::FvMpfaL2dTransmissibilityCalculator (potentially specifying certain cases)
+ * FvMpfaL2dTransmissibilityCalculator (potentially specifying certain cases)
* gets called and the transmissibility and geometric information of the applied additional
* cells of the interaction regions are passed back.
*
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
index 5a231b0682c9124e998e22f23122f1e27db44c33..07e80e4c90159e60da11d2a7380ed9e0d30806d9 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv3dtransportadaptive.hh
@@ -114,7 +114,7 @@ public:
/*!
* The compositional transport scheme can not be applied with a global pressure / total velocity
* formulation. This is a 3D-specific implementation! In case of 2d, use the class
- * Dumux::FV2dTransport2P2CAdaptive
+ * FV2dTransport2P2CAdaptive
*
* \param problem a problem class object
*/
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
index 1709240f73db5e9b45a1e2f2aeee96c5a07d5b87..6885ce4e1dce2f910e511de31d4e77df43697df7 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvmpfal3dinteractionvolumecontaineradaptive.hh
@@ -93,7 +93,7 @@ class FvMpfaL3d2P2CInteractionVolumeContainerAdaptive : public FvMpfaL3dInteract
};
public:
- //! Type for storing an MPFA-interaction-volume. (Usually of type Dumux::FvMpfaL3dInteractionVolume or Dumux::FvMpfaL3dInteractionVolumeAdaptive)
+ //! Type for storing an MPFA-interaction-volume. (Usually of type FvMpfaL3dInteractionVolume or FvMpfaL3dInteractionVolumeAdaptive)
typedef typename GET_PROP_TYPE(TypeTag, MPFAInteractionVolume) InteractionVolume;
typedef std::vector<InteractionVolume> GlobalInteractionVolumeVector;
@@ -124,7 +124,7 @@ private:
Problem& problem_;
};
-/*! \brief Overwrites the method from the base class Dumux::FvMpfaL3dInteractionVolumeContainerAdaptive
+/*! \brief Overwrites the method from the base class FvMpfaL3dInteractionVolumeContainerAdaptive
* On each boundary, a TPFA is used in compositional models. Therefore we do not need to store interaction
* volume containers on the boundary cells.
*/
@@ -138,16 +138,16 @@ void FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::storeBoundaryInte
*
* The MPFA is about to be calculated through an intersection, and to do so, its place in the
* local indexing scheme, i.e. its subVolumeFaceIdx, has to be found. This method
- * investigates the case (see Dumux::FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
+ * investigates the case (see FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
* 8 cells are present in the current interaction region: A Interaction region where the non-adaptive
* MPFA-model is applied.
* This requires a local Index of the "large" cell (where the hanging node rests) to get the right
* subVolumeFaceIdx.
* \param isIt The iterator of the intersection the mpfa should be calculated for
* \param localIdxLarge The (local) Index of the large cell (on which the hanging node lives)
- * \param interactionVolume The interaction volume (Dumux::FvMpfaL3dInteractionVolumeAdaptive) of interest
+ * \param interactionVolume The interaction volume (FvMpfaL3dInteractionVolumeAdaptive) of interest
* \param properFluxDirection Indicates whether the flux through the intersection aligns with its normal
- * \return The Subvolume Face Idx required by the methods in Dumux::FvMpfaL3dTransmissibilityCalculator
+ * \return The Subvolume Face Idx required by the methods in FvMpfaL3dTransmissibilityCalculator
*/
template<class TypeTag>
inline int FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::getMpfaCase8cells(const IntersectionIterator& isIt,
@@ -277,12 +277,12 @@ inline int FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::getMpfaCase
*
* The MPFA is about to be calculated through an intersection, and to do so, its place in the
* local indexing scheme, i.e. its subVolumeFaceIdx, has to be found. This method
- * investigates the case (see Dumux::FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
+ * investigates the case (see FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
* 6 cells are present in the current interaction region.
* \param isIt The iterator of the intersection the mpfa should be calculated for
- * \param interactionVolume The interaction volume (Dumux::FvMpfaL3dInteractionVolumeAdaptive) of interest
+ * \param interactionVolume The interaction volume (FvMpfaL3dInteractionVolumeAdaptive) of interest
* \param properFluxDirection Indicates whether the flux through the intersection aligns with its normal
- * \return The Subvolume Face Idx required by the methods in Dumux::FvMpfaL3dTransmissibilityCalculator
+ * \return The Subvolume Face Idx required by the methods in FvMpfaL3dTransmissibilityCalculator
*/
template<class TypeTag>
inline int FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::getMpfaCase6cells(const IntersectionIterator& isIt,
@@ -415,12 +415,12 @@ inline int FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::getMpfaCase
*
* The MPFA is about to be calculated through an intersection, and to do so, its place in the
* local indexing scheme, i.e. its subVolumeFaceIdx, has to be found. This method
- * investigates the case (see Dumux::FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
+ * investigates the case (see FvMpfaL3dInteractionVolumeAdaptive.HangingNodeTypes ) if
* 2 or 4 cells are present in the current interaction region.
* \param isIt The iterator of the intersection the mpfa should be calculated for
- * \param interactionVolume The interaction volume (Dumux::FvMpfaL3dInteractionVolumeAdaptive) of interest
+ * \param interactionVolume The interaction volume (FvMpfaL3dInteractionVolumeAdaptive) of interest
* \param properFluxDirection Indicates whether the flux through the intersection aligns with its normal
- * \return The Subvolume Face Idx required by the methods in Dumux::FvMpfaL3dTransmissibilityCalculator
+ * \return The Subvolume Face Idx required by the methods in FvMpfaL3dTransmissibilityCalculator
*/
template<class TypeTag>
inline int FvMpfaL3d2P2CInteractionVolumeContainerAdaptive<TypeTag>::getMpfaCase2or4cells(const IntersectionIterator& isIt,
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
index 4b6bd2f23180feb8e10ad174c5e0201ca0d270eb..201edfd2d6cdca328c3d3e1e1092fb77e2dd7b7a 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressure.hh
@@ -190,7 +190,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
};
@@ -402,7 +402,7 @@ void FVPressure2P2C<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& entries,
// compute vectorized permeabilities
DimMatrix meanPermeability(0);
- Dumux::harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
+ harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitDistVec, permeability);
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
index d9dcc42b7f1e6b3efe4d226e0749aaeb96d16be1..8bf70f9bdf07a2d912a6e15a74da31dde916e899 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressurecompositional.hh
@@ -388,7 +388,7 @@ protected:
Problem& problem_;
//! output for the initialization procedure
- Dumux::VtkMultiWriter<GridView> initializationOutputWriter_;
+ VtkMultiWriter<GridView> initializationOutputWriter_;
Scalar maxError_; //!< Maximum volume error of all cells
Scalar incp_; //!< Increment for the volume derivative w.r.t pressure
@@ -412,7 +412,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
};
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
index de1bb96d5f5a859fc66e3407d7f785d672588167..30f237550b14f49b1c80a416521ccb986d1ef75a 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvpressuremultiphysics.hh
@@ -546,7 +546,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::get1pFlux(Dune::FieldVector<Scalar, 2>
// compute vectorized permeabilities
DimMatrix meanPermeability(0);
- Dumux::harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
+ harmonicMeanMatrix(meanPermeability, permeabilityI, permeabilityJ);
Dune::FieldVector<Scalar, dim> permeability(0);
meanPermeability.mv(unitDistVec, permeability);
diff --git a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
index 1c4e028280773e13b9b1acb46c10cd6bc02bf20b..0f602cc5166fde0c7ee9a15ca1e8d892d5b04c2f 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fvtransport.hh
@@ -152,7 +152,7 @@ public:
//! Set the initial values before the first pressure equation
/*!
- * This method is called before first pressure equation is solved from Dumux::IMPET.
+ * This method is called before first pressure equation is solved from IMPET.
*/
void initialize()
{
@@ -333,7 +333,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! @copydoc Dumux::IMPETProblem::asImp_()
+ //! @copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
};
@@ -645,7 +645,7 @@ void FVTransport2P2C<TypeTag>::getFlux(ComponentVector& fluxEntries,
// compute mean permeability
DimMatrix meanK_(0.);
- Dumux::harmonicMeanMatrix(meanK_,
+ harmonicMeanMatrix(meanK_,
K_I,
problem().spatialParams().intrinsicPermeability(neighbor));
Dune::FieldVector<Scalar,dim> K(0);
diff --git a/dumux/porousmediumflow/2p2c/sequential/problem.hh b/dumux/porousmediumflow/2p2c/sequential/problem.hh
index 3293b2f29a8abcb2fe5e5cd537ca74f1f0845266..aba849c3575517e75c9ca3dc11d1e000eb682a03 100644
--- a/dumux/porousmediumflow/2p2c/sequential/problem.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/problem.hh
@@ -94,7 +94,7 @@ public:
{ }
/*!
- * \brief Called by Dumux::TimeManager just before the time
+ * \brief Called by TimeManager just before the time
* integration.
*
* In compositional/compressible models, the secondary variables
@@ -179,7 +179,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
index 6e94e19364097b683d022a39de0ea631f11ad34f..4cf126de98bd001d5f7d20f0d0e1c0dbcbd63491 100644
--- a/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pdfm/implicit/fluxvariables.hh
@@ -49,7 +49,7 @@ template <class TypeTag>
class TwoPDFMFluxVariables : public ImplicitDarcyFluxVariables<TypeTag>
{
friend class ImplicitDarcyFluxVariables<TypeTag>; // be friends with parent
- typedef Dumux::ImplicitDarcyFluxVariables<TypeTag> ParentType;
+ typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
@@ -153,7 +153,7 @@ public:
KFj = 0;
}
- KFracture = Dumux::harmonicMean(KFi, KFj);
+ KFracture = harmonicMean(KFi, KFj);
// temporary vector for the Darcy velocity
Scalar vDarcyFracture = 0;
diff --git a/dumux/porousmediumflow/2pdfm/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pdfm/implicit/propertydefaults.hh
index 90973ad7247c8edff512646a6caf6f5b26b4915d..e24a4342ece87a93ade40463e4f876dfb34915bd 100644
--- a/dumux/porousmediumflow/2pdfm/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pdfm/implicit/propertydefaults.hh
@@ -103,14 +103,14 @@ SET_PROP(TwoPDFM, WettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(TwoPDFM, NonwettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
SET_PROP(TwoPDFM, FluidSystem)
@@ -120,7 +120,7 @@ SET_PROP(TwoPDFM, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
- typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ typedef FluidSystems::TwoPImmiscible<Scalar,
WettingPhase,
NonwettingPhase> type;
};
diff --git a/dumux/porousmediumflow/2pminc/implicit/localresidual.hh b/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
index 95636d78b02cf8307915448be63bc40b5fa58cb9..5718dbe0f23b6b1f7b28d25c33d6ff3779479496 100644
--- a/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2pminc/implicit/localresidual.hh
@@ -42,7 +42,7 @@ template<class TypeTag>
class TwoPMincLocalResidual : public TwoPLocalResidual<TypeTag>
{
protected:
- typedef typename Dumux::TwoPLocalResidual<TypeTag> ParentType;
+ typedef TwoPLocalResidual<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
diff --git a/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
index 47890564cd3cfc2055fee3ed43b612c7bf242a18..65e7295b32c61e71d90b7ddd273106196dbc990f 100644
--- a/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/fluxvariables.hh
@@ -192,7 +192,7 @@ protected:
if (sat <= 0)
return 0;
- static const Dumux::Spline<Scalar> sp(0, eps, // x0, x1
+ static const Spline<Scalar> sp(0, eps, // x0, x1
0, 0.5, // y0, y1
0, 0); // m0, m1
return sp.eval(sat);
@@ -239,7 +239,7 @@ protected:
{
auto porousDiffI = volVarsI.porosity() * volVarsI.saturation(phaseIdx) * tauI * volVarsI.diffCoeff(phaseIdx, compIdx);
auto porousDiffJ = volVarsJ.porosity() * volVarsJ.saturation(phaseIdx) * tauJ * volVarsJ.diffCoeff(phaseIdx, compIdx);
- porousDiffCoeff_[phaseIdx][compIdx] = Dumux::harmonicMean(porousDiffI, porousDiffJ);
+ porousDiffCoeff_[phaseIdx][compIdx] = harmonicMean(porousDiffI, porousDiffJ);
}
}
}
diff --git a/dumux/porousmediumflow/2pnc/implicit/newtoncontroller.hh b/dumux/porousmediumflow/2pnc/implicit/newtoncontroller.hh
index d5a41740fc432890e191f0fb09a3194239f3e1c8..c3cea6b7173c67c57265583be12cc9fd39f1bf39 100644
--- a/dumux/porousmediumflow/2pnc/implicit/newtoncontroller.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/newtoncontroller.hh
@@ -72,7 +72,7 @@ public:
if (this->gridView_().comm().size() > 1)
succeeded = this->gridView_().comm().min(succeeded);
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "rank " << this->problem_().gridView().comm().rank()
<< " caught an exception while updating:" << e.what()
diff --git a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
index 33e94d6f27493ebef01741f5461d7f51b27a46fc..1006e7c0c1e7b4f5516890b01df0196048fa3983 100644
--- a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
@@ -123,7 +123,7 @@ SET_PROP(TwoPNC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Set the default formulation to pl-Sg: This can be over written in the problem.
diff --git a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
index b0b1ac992ce0171949c296681a144930581f790d..e3d0940813ee845e782989d44b3e362194d44457 100644
--- a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
@@ -230,7 +230,7 @@ public:
if (formulation == plSg) {
fluidState.setPressure(wPhaseIdx, priVars[pressureIdx]);
if (priVars[pressureIdx] + pc < 0.0)
- DUNE_THROW(Dumux::NumericalProblem,"Capillary pressure is too low");
+ DUNE_THROW(NumericalProblem,"Capillary pressure is too low");
fluidState.setPressure(nPhaseIdx, priVars[pressureIdx] + pc);
}
else if (formulation == pgSl) {
@@ -239,7 +239,7 @@ public:
if (priVars[pressureIdx] - pc < 0.0)
{
std::cout<< "p_g: "<< priVars[pressureIdx]<<" Cap_press: "<< pc << std::endl;
- DUNE_THROW(Dumux::NumericalProblem,"Capillary pressure is too high");
+ DUNE_THROW(NumericalProblem,"Capillary pressure is too high");
}
fluidState.setPressure(wPhaseIdx, priVars[pressureIdx] - pc);
}
diff --git a/dumux/porousmediumflow/2pncmin/implicit/fluxvariables.hh b/dumux/porousmediumflow/2pncmin/implicit/fluxvariables.hh
index 43a598f72cec27338ee1630c86f86b29cc0382bc..f96bedaba1863fe67d78e886b4f1a67c855efdb0 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/fluxvariables.hh
@@ -50,8 +50,8 @@ class TwoPNCMinFluxVariables : public TwoPNCFluxVariables<TypeTag>
friend typename GET_PROP_TYPE(TypeTag, BaseFluxVariables); // be friends with base class
friend class TwoPNCFluxVariables<TypeTag>; // be friends with parent class
- typedef Dumux::TwoPNCFluxVariables<TypeTag> ParentType;
- typedef Dumux::TwoPNCMinFluxVariables<TypeTag> ThisType;
+ typedef TwoPNCFluxVariables<TypeTag> ParentType;
+ typedef TwoPNCMinFluxVariables<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index 3b9e31c0aa296be2e623b29c1a3a7abeeb65bd4e..55758e6d4ac41508d2ffe2ed3aba2faf9b06e54c 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -110,8 +110,8 @@ namespace Dumux
template<class TypeTag>
class TwoPNCMinModel: public TwoPNCModel<TypeTag>
{
- typedef Dumux::TwoPNCMinModel<TypeTag> ThisType;
- typedef Dumux::TwoPNCModel<TypeTag> ParentType;
+ typedef TwoPNCMinModel<TypeTag> ThisType;
+ typedef TwoPNCModel<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
@@ -123,7 +123,7 @@ class TwoPNCMinModel: public TwoPNCModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef Dumux::Constants<Scalar> Constant;
+ typedef Constants<Scalar> Constant;
enum {
dim = GridView::dimension,
diff --git a/dumux/porousmediumflow/2pncmin/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pncmin/implicit/propertydefaults.hh
index d863d51ad71cd6d85d0dc01bf000224030139e36..b5228ad6100f5b92ec3f5a69485ef2921de76264 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/propertydefaults.hh
@@ -105,7 +105,7 @@ SET_PROP(TwoPNCMin, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Use the 2pncmin local residual operator
diff --git a/dumux/porousmediumflow/3p3c/implicit/fluxvariables.hh b/dumux/porousmediumflow/3p3c/implicit/fluxvariables.hh
index d3b5709a64fdee078418088ee4f4cd4acd168d30..97bcb7252c2b4736afd416ef5c4454e73c4552d5 100644
--- a/dumux/porousmediumflow/3p3c/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/fluxvariables.hh
@@ -248,7 +248,7 @@ private:
if (sat <= 0)
return 0;
- static const Dumux::Spline<Scalar> sp(0, eps, // x0, x1
+ static const Spline<Scalar> sp(0, eps, // x0, x1
0, 0.5, // y0, y1
0, 0); // m0, m1
return sp.eval(sat);
diff --git a/dumux/porousmediumflow/3p3c/implicit/model.hh b/dumux/porousmediumflow/3p3c/implicit/model.hh
index ba335420e8b63a157296482beb1bf140066d5e0d..ff78a61f8fce83f6273d7f0157f7a463799bdd42 100644
--- a/dumux/porousmediumflow/3p3c/implicit/model.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/model.hh
@@ -499,7 +499,7 @@ public:
}
succeeded = 1;
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "\n"
<< "Rank " << this->problem_().gridView().comm().rank()
diff --git a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
index 685ddafb7967324c91530d184dd846e22fe6c743..020072e7800e0c94a057511536a5711536af1597 100644
--- a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
@@ -97,7 +97,7 @@ SET_PROP(ThreePThreeC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
SET_INT_PROP(ThreePThreeC, NumEq, 3); //!< set the number of equations to 2
diff --git a/dumux/porousmediumflow/co2/implicit/model.hh b/dumux/porousmediumflow/co2/implicit/model.hh
index 7994eb2b45492768300abc98dbdaa74daee37546..04e787bbb995e85580ee0bd915998f65452449c3 100644
--- a/dumux/porousmediumflow/co2/implicit/model.hh
+++ b/dumux/porousmediumflow/co2/implicit/model.hh
@@ -138,7 +138,7 @@ public:
}
succeeded = 1;
}
- catch (Dumux::NumericalProblem &e)
+ catch (NumericalProblem &e)
{
std::cout << "\n"
<< "Rank " << this->problem_().gridView().comm().rank()
diff --git a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
index 7130a45b06d10d1348d87c5b88c3c35deaa6e25e..812ed0895395c1914466224644b6116e6ce6e6a3 100644
--- a/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/forchheimerfluxvariables.hh
@@ -81,7 +81,7 @@ class ImplicitForchheimerFluxVariables
: public ImplicitDarcyFluxVariables<TypeTag>
{
friend class ImplicitDarcyFluxVariables<TypeTag>; // be friends with parent
- typedef Dumux::ImplicitDarcyFluxVariables<TypeTag> ParentType;
+ typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
diff --git a/dumux/porousmediumflow/mpnc/implicit/energy/localresidualkinetic.hh b/dumux/porousmediumflow/mpnc/implicit/energy/localresidualkinetic.hh
index 437a506612ba28b14f5cdcedffdddf255523291a..9ad5c9afb853389c4782c2af83c33c69e139deaa 100644
--- a/dumux/porousmediumflow/mpnc/implicit/energy/localresidualkinetic.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/energy/localresidualkinetic.hh
@@ -242,13 +242,13 @@ public:
const Scalar iPorosity = iVolVar.porosity();
const Scalar kPorosity = kVolVar.porosity();
- const Scalar barPorosity = Dumux::harmonicMean(iPorosity, kPorosity);
+ const Scalar barPorosity = harmonicMean(iPorosity, kPorosity);
const Scalar ilambda = iVolVar.thermalConductivity(phaseIdx);
const Scalar klambda = kVolVar.thermalConductivity(phaseIdx);
// Using a harmonic average is justified by its properties: if one phase does not conduct energy, there is no transfer
- const Scalar barLambda = Dumux::harmonicMean(ilambda, klambda) ;
+ const Scalar barLambda = harmonicMean(ilambda, klambda) ;
const Scalar gradientNormal = fluxVars.fluxVarsEnergy().temperatureGradient(phaseIdx)
* fluxVars.face().normal ;
@@ -260,7 +260,7 @@ public:
else if (phaseIdx == wPhaseIdx or phaseIdx == nPhaseIdx){
const Scalar iSaturation = iFluidState.saturation(phaseIdx);
const Scalar kSaturation = kFluidState.saturation(phaseIdx);
- const Scalar barSaturation = Dumux::harmonicMean(iSaturation, kSaturation);
+ const Scalar barSaturation = harmonicMean(iSaturation, kSaturation);
flux[energyEq0Idx + phaseIdx] -= barLambda * gradientNormal * barPorosity * barSaturation ;
}
else
@@ -292,9 +292,9 @@ public:
const Scalar lambdaSolid = volVars.thermalConductivity(sPhaseIdx);
// Using a harmonic average is justified by its properties: if one phase does not conduct energy, there is no transfer
- const Scalar lambdaWN = Dumux::harmonicMean(lambdaWetting, lambdaNonWetting);
- const Scalar lambdaWS = Dumux::harmonicMean(lambdaWetting, lambdaSolid);
- const Scalar lambdaNS = Dumux::harmonicMean(lambdaNonWetting, lambdaSolid);
+ const Scalar lambdaWN = harmonicMean(lambdaWetting, lambdaNonWetting);
+ const Scalar lambdaWS = harmonicMean(lambdaWetting, lambdaSolid);
+ const Scalar lambdaNS = harmonicMean(lambdaNonWetting, lambdaSolid);
// |------------------------------------------------------|
// | | |
// | | |
@@ -310,7 +310,7 @@ public:
const Scalar characteristicLength = volVars.characteristicLength() ;
const Scalar factorEnergyTransfer = volVars.factorEnergyTransfer() ;
- const Scalar nusseltWN = Dumux::harmonicMean(volVars.nusseltNumber(wPhaseIdx), volVars.nusseltNumber(nPhaseIdx));
+ const Scalar nusseltWN = harmonicMean(volVars.nusseltNumber(wPhaseIdx), volVars.nusseltNumber(nPhaseIdx));
const Scalar nusseltWS = volVars.nusseltNumber(wPhaseIdx);
const Scalar nusseltNS = volVars.nusseltNumber(nPhaseIdx);
@@ -602,7 +602,7 @@ public:
const Scalar iPorosity = iVolVar.porosity();
const Scalar kPorosity = kVolVar.porosity();
- const Scalar barPorosity = Dumux::harmonicMean(iPorosity, kPorosity);
+ const Scalar barPorosity = harmonicMean(iPorosity, kPorosity);
const Scalar iSolidLambda = iVolVar.thermalConductivity(sPhaseIdx);
const Scalar kSolidLambda = kVolVar.thermalConductivity(sPhaseIdx);
diff --git a/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh b/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
index 455c5a7dd2347742dc0d72d859b6bd9e78874b7c..9145ea9a0664df38fc7304e1f9676fa359530109 100644
--- a/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/mass/localresidual.hh
@@ -138,7 +138,7 @@ if (!std::isfinite(volumeFlux))
const Scalar mobConUp = mobUp*conUp;
const Scalar mobConDn = mobDn*conDn;
- const Scalar meanMobCon = Dumux::harmonicMean(mobConUp, mobConDn);
+ const Scalar meanMobCon = harmonicMean(mobConUp, mobConDn);
const Scalar x = std::abs(kGradPNormal);
const Scalar sign = (kGradPNormal > 0)?-1:1;
diff --git a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
index 0b408ba491be2aa2ba4b9e1a2ac028f29238ccf7..90e0cf4cd9492e2b7fc21cfb89ea88d0b5ac803a 100644
--- a/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/mpnc/implicit/propertydefaults.hh
@@ -114,7 +114,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type;
+ typedef CompositionFromFugacities<Scalar, FluidSystem> type;
};
@@ -223,7 +223,7 @@ SET_PROP(MPNC, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
//! Set the default pressure formulation to the pressure of the (most) wetting phase
diff --git a/dumux/porousmediumflow/richards/implicit/fluxvariables.hh b/dumux/porousmediumflow/richards/implicit/fluxvariables.hh
index 6824aa26793f9cf6048cd852884a69005a544e07..6bf355a36dfb9004b372422339bbf6565a5d1954 100644
--- a/dumux/porousmediumflow/richards/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/richards/implicit/fluxvariables.hh
@@ -42,7 +42,7 @@ template <class TypeTag>
class RichardsFluxVariables : public ImplicitDarcyFluxVariables<TypeTag>
{
friend class ImplicitDarcyFluxVariables<TypeTag>; // be friends with parent
- typedef Dumux::ImplicitDarcyFluxVariables<TypeTag> ParentType;
+ typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/porousmediumflow/richards/implicit/model.hh b/dumux/porousmediumflow/richards/implicit/model.hh
index 48eedcbfd68a282bce18cbf5f44c76897ecbff5b..89a26369fbdc1a4afbc6c402e27d36efb8bf7085 100644
--- a/dumux/porousmediumflow/richards/implicit/model.hh
+++ b/dumux/porousmediumflow/richards/implicit/model.hh
@@ -131,7 +131,7 @@ public:
* solution to an ouput writer.
*
* \param sol The current solution which ought to be written to disk
- * \param writer The Dumux::VtkMultiWriter which is be used to write the data
+ * \param writer The VtkMultiWriter which is be used to write the data
*/
template <class MultiWriter>
void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer)
diff --git a/dumux/porousmediumflow/richards/implicit/problem.hh b/dumux/porousmediumflow/richards/implicit/problem.hh
index 19637600fd4a5a19f41bc3296bfda49f22634a82..ed4f76a9e0dd98434dd60e3bc5def1b6ee66cb93 100644
--- a/dumux/porousmediumflow/richards/implicit/problem.hh
+++ b/dumux/porousmediumflow/richards/implicit/problem.hh
@@ -34,7 +34,7 @@ namespace Dumux
* \ingroup ImplicitBaseProblems
* \brief Base class for all fully implicit Richards problems
*
- * For a description of the Richards model, see Dumux::RichardsModel
+ * For a description of the Richards model, see RichardsModel
*/
template<class TypeTag>
class RichardsProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/dumux/porousmediumflow/richards/implicit/propertydefaults.hh b/dumux/porousmediumflow/richards/implicit/propertydefaults.hh
index 4f526868798a7df0db8bdf857669f7fa75f22500..dbcd17d4749f334cd2f68d4b833bd5119429e94e 100644
--- a/dumux/porousmediumflow/richards/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/richards/implicit/propertydefaults.hh
@@ -116,7 +116,7 @@ SET_PROP(Richards, WettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
};
/*!
@@ -131,7 +131,7 @@ SET_PROP(Richards, NonwettingPhase)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::GasPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+ typedef FluidSystems::GasPhase<Scalar, NullComponent<Scalar> > type;
};
/*!
@@ -150,7 +150,7 @@ SET_PROP(Richards, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
- typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
+ typedef FluidSystems::TwoPImmiscible<Scalar,
WettingPhase,
NonwettingPhase> type;
};
@@ -166,7 +166,7 @@ SET_PROP(Richards, FluidState){
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
};
// disable velocity output by default
diff --git a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
index 6d3122b42a162fa2535873c6085d5f9e48e5e335..c4e91581ac91493dd91c87e039db381eb804814c 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/mpfa/linteractionvolume3dadaptive.hh
@@ -272,7 +272,7 @@ public:
//! Store the type of hanging-node-interaction volume
/*!
- * \param hNType the type of hanging-node-interaction volume of type Dumux::FvMpfaL3dInteractionVolumeAdaptive<TypeTag>::HangingNodeTypes
+ * \param hNType the type of hanging-node-interaction volume of type FvMpfaL3dInteractionVolumeAdaptive<TypeTag>::HangingNodeTypes
*/
void setHangingNodeType(int hNType)
{
@@ -313,7 +313,7 @@ public:
return hangingNodeType_ != noHangingNode;
}
- //! The type of the interaction volume as type of Dumux::FvMpfaL3dInteractionVolumeAdaptive<TypeTag>::HangingNodeTypes
+ //! The type of the interaction volume as type of FvMpfaL3dInteractionVolumeAdaptive<TypeTag>::HangingNodeTypes
int getHangingNodeType()
{
return hangingNodeType_;
diff --git a/dumux/porousmediumflow/sequential/cellcentered/pressure.hh b/dumux/porousmediumflow/sequential/cellcentered/pressure.hh
index afdec6a7887fa13e4836ee19e9f39403c89962f7..83a8652b4648eb8ecc56d2fb95286d07f37a0025 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/pressure.hh
@@ -308,7 +308,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this);}
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this);}
diff --git a/dumux/porousmediumflow/sequential/cellcentered/transport.hh b/dumux/porousmediumflow/sequential/cellcentered/transport.hh
index e44196cab71f1e965ef101f0a83e262155af4121..574a810346e4b7a52b4e330e973ef594b59a137a 100644
--- a/dumux/porousmediumflow/sequential/cellcentered/transport.hh
+++ b/dumux/porousmediumflow/sequential/cellcentered/transport.hh
@@ -238,7 +238,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/sequential/impetproblem.hh b/dumux/porousmediumflow/sequential/impetproblem.hh
index 76852766b41e8e976cdcc304ef853ca68fd7da0e..571de05e9e0a57b56d57024c445465722c1a15cc 100644
--- a/dumux/porousmediumflow/sequential/impetproblem.hh
+++ b/dumux/porousmediumflow/sequential/impetproblem.hh
@@ -312,7 +312,7 @@ public:
}
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*/
void init()
@@ -325,7 +325,7 @@ public:
}
/*!
- * \brief Called by Dumux::TimeManager just before the time
+ * \brief Called by TimeManager just before the time
* integration.
*/
void preTimeStep()
@@ -338,7 +338,7 @@ public:
}
/*!
- * \brief Called by Dumux::TimeManager in order to do a time
+ * \brief Called by TimeManager in order to do a time
* integration on the model.
*
* \note \a timeStepSize and \a nextStepSize are references and may
@@ -398,7 +398,7 @@ public:
}
/*!
- * \brief Called by Dumux::TimeManager whenever a solution for a
+ * \brief Called by TimeManager whenever a solution for a
* timestep has been computed and the simulation time has
* been updated.
*
@@ -429,7 +429,7 @@ public:
{ timeManager().setTimeStepSize(dt); }
/*!
- * \brief Called by Dumux::TimeManager whenever a solution for a
+ * \brief Called by TimeManager whenever a solution for a
* timestep has been computed and the simulation time has
* been updated.
*/
@@ -662,7 +662,7 @@ public:
TimeManager &timeManager()
{ return *timeManager_; }
- //! \copydoc Dumux::IMPETProblem::timeManager()
+ //! \copydoc IMPETProblem::timeManager()
const TimeManager &timeManager() const
{ return *timeManager_; }
@@ -675,7 +675,7 @@ public:
Variables& variables ()
{ return variables_; }
- //! \copydoc Dumux::IMPETProblem::variables ()
+ //! \copydoc IMPETProblem::variables ()
const Variables& variables () const
{ return variables_; }
@@ -685,7 +685,7 @@ public:
IMPETModel &model()
{ return *model_; }
- //! \copydoc Dumux::IMPETProblem::model()
+ //! \copydoc IMPETProblem::model()
const IMPETModel &model() const
{ return *model_; }
@@ -695,7 +695,7 @@ public:
PressureModel &pressureModel()
{ return *pressModel_; }
- //! \copydoc Dumux::IMPETProblem::pressureModel()
+ //! \copydoc IMPETProblem::pressureModel()
const PressureModel &pressureModel() const
{ return *pressModel_; }
@@ -705,7 +705,7 @@ public:
TransportModel &transportModel()
{ return *transportModel_; }
- //! \copydoc Dumux::IMPETProblem::transportModel()
+ //! \copydoc IMPETProblem::transportModel()
const TransportModel &transportModel() const
{ return *transportModel_; }
// \}
@@ -722,11 +722,11 @@ public:
* The file will start with the prefix returned by the name()
* method, has the current time of the simulation clock in it's
* name and uses the extension <tt>.drs</tt>. (Dumux ReStart
- * file.) See Dumux::Restart for details.
+ * file.) See Restart for details.
*/
void serialize()
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.serializeBegin(asImp_());
@@ -763,7 +763,7 @@ public:
model().initialize();
}
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.deserializeBegin(asImp_(), tRestart);
@@ -820,7 +820,7 @@ protected:
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
return *resultWriter_;
}
- //! \copydoc Dumux::IMPETProblem::resultWriter()
+ //! \copydoc IMPETProblem::resultWriter()
VtkMultiWriter& resultWriter() const
{
if (!resultWriter_)
@@ -833,7 +833,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \copydoc Dumux::IMPETProblem::asImp_()
+ //! \copydoc IMPETProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh
index cc4a7675bb737aeb13a2b822b75b851dcd2a62df..388accd44833237acc2e932bfaff9033e9fc8a5a 100644
--- a/dumux/porousmediumflow/sequential/onemodelproblem.hh
+++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh
@@ -86,7 +86,7 @@ public:
//! Constructs an object of type OneModelProblemProblem
/*!
* \tparam TypeTag The TypeTag
- * \tparam verbose Output level for Dumux::TimeManager
+ * \tparam verbose Output level for TimeManager
*/
OneModelProblem(const GridView &gridView, bool verbose = true)
: gridView_(gridView),
@@ -112,7 +112,7 @@ public:
//! Constructs an object of type OneModelProblemProblem
/*!
* \tparam TypeTag The TypeTag
- * \tparam verbose Output level for Dumux::TimeManager
+ * \tparam verbose Output level for TimeManager
*/
OneModelProblem(TimeManager &timeManager, const GridView &gridView)
: gridView_(gridView),
@@ -312,7 +312,7 @@ public:
}
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*/
void init()
@@ -323,21 +323,21 @@ public:
}
/*!
- * \brief Called by Dumux::TimeManager just before the time
+ * \brief Called by TimeManager just before the time
* integration.
*/
void preTimeStep()
{}
/*!
- * \brief Called by Dumux::TimeManager in order to do a time
+ * \brief Called by TimeManager in order to do a time
* integration on the model.
*/
void timeIntegration()
{}
/*!
- * \brief Called by Dumux::TimeManager whenever a solution for a
+ * \brief Called by TimeManager whenever a solution for a
* timestep has been computed and the simulation time has
* been updated.
*
@@ -378,7 +378,7 @@ public:
{ timeManager().setTimeStepSize(dt); }
/*!
- * \brief Called by Dumux::TimeManager whenever a solution for a
+ * \brief Called by TimeManager whenever a solution for a
* timestep has been computed and the simulation time has
* been updated.
*/
@@ -545,7 +545,7 @@ public:
{ return *timeManager_; }
/*!
- * \brief \copybrief Dumux::OneModelProblem::timeManager()
+ * \brief \copybrief OneModelProblem::timeManager()
*/
const TimeManager &timeManager() const
{ return *timeManager_; }
@@ -557,7 +557,7 @@ public:
{ return variables_; }
/*!
- * \brief \copybrief Dumux::OneModelProblem::variables()
+ * \brief \copybrief OneModelProblem::variables()
*/
const Variables& variables () const
{ return variables_; }
@@ -569,7 +569,7 @@ public:
{ return *model_; }
/*!
- * \brief \copybrief Dumux::OneModelProblem::model()
+ * \brief \copybrief OneModelProblem::model()
*/
const Model &model() const
{ return *model_; }
@@ -588,11 +588,11 @@ public:
* The file will start with the prefix returned by the name()
* method, has the current time of the simulation clock in it's
* name and uses the extension <tt>.drs</tt>. (Dumux ReStart
- * file.) See Dumux::Restart for details.
+ * file.) See Restart for details.
*/
void serialize()
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.serializeBegin(asImp_());
@@ -613,7 +613,7 @@ public:
*/
void restart(double tRestart)
{
- typedef Dumux::Restart Restarter;
+ typedef Restart Restarter;
Restarter res;
res.deserializeBegin(asImp_(), tRestart);
@@ -648,7 +648,7 @@ private:
Implementation &asImp_()
{ return *static_cast<Implementation *>(this); }
- //! \brief \copybrief Dumux::OneModelProblem::asImp_()
+ //! \brief \copybrief OneModelProblem::asImp_()
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
diff --git a/dumux/porousmediumflow/sequential/pressureproperties.hh b/dumux/porousmediumflow/sequential/pressureproperties.hh
index c67611799c554588a7985cd9fd4dfcf120d6714d..668ed17b82bded003dcf8e9bea27ce2eb908a163 100644
--- a/dumux/porousmediumflow/sequential/pressureproperties.hh
+++ b/dumux/porousmediumflow/sequential/pressureproperties.hh
@@ -97,7 +97,7 @@ public:
SET_TYPE_PROP(Pressure, PressureSolutionVector, typename GET_PROP(TypeTag, SolutionTypes)::ScalarSolution);
// use the stabilized BiCG solver preconditioned by the ILU-0 by default
-SET_TYPE_PROP(Pressure, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(Pressure, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
//! set the default for the reduction of the initial residual
SET_SCALAR_PROP(Pressure, LinearSolverResidualReduction, 1e-13);
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 3555b66464c583ef793f9df78b21d27be044d99c..458c0f7e041937caf9653c97aa692753514e3444 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -173,7 +173,7 @@ SET_TYPE_PROP(SequentialModel, Variables, VariableClass<TypeTag>);
SET_TYPE_PROP(SequentialModel, PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables);
//! Set the default type for the time manager
-SET_TYPE_PROP(SequentialModel, TimeManager, Dumux::TimeManager<TypeTag>);
+SET_TYPE_PROP(SequentialModel, TimeManager, TimeManager<TypeTag>);
/*!
* \brief Boundary types at a single degree of freedom.
@@ -182,7 +182,7 @@ SET_PROP(SequentialModel, BoundaryTypes)
{ private:
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
public:
- typedef Dumux::BoundaryTypes<numEq> type;
+ typedef BoundaryTypes<numEq> type;
};
//Set default class for adaptation initialization indicator
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 208dc41105b6a9b5bf1fc5ab45646b628b9a4d53..0cdb37a23a87bb3b74e64f20f7c9fbc6d20d5b86 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -64,7 +64,7 @@ NEW_PROP_TAG(ProblemBaseClass);
SET_TYPE_PROP(GeneralLensProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(GeneralLensProblem, Problem, Dumux::GeneralLensProblem<TypeTag>);
+SET_TYPE_PROP(GeneralLensProblem, Problem, GeneralLensProblem<TypeTag>);
// Set the wetting phase
SET_PROP(GeneralLensProblem, WettingPhase)
@@ -72,7 +72,7 @@ SET_PROP(GeneralLensProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -81,7 +81,7 @@ SET_PROP(GeneralLensProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
///////////////////////////////////////////////////
@@ -91,10 +91,10 @@ public:
NEW_TYPE_TAG(BoxGeneralLensProblem, INHERITS_FROM(BoxTwoP, GeneralLensProblem));
// Set the problem property
-SET_TYPE_PROP(BoxGeneralLensProblem, ProblemBaseClass, Dumux::ImplicitPorousMediaProblem<TypeTag>);
+SET_TYPE_PROP(BoxGeneralLensProblem, ProblemBaseClass, ImplicitPorousMediaProblem<TypeTag>);
// Set the problem property
-SET_TYPE_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatialParams<TypeTag>);
+SET_TYPE_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass,ImplicitSpatialParams<TypeTag>);
///////////////////////////////////////////////////
@@ -104,10 +104,10 @@ SET_TYPE_PROP(BoxGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpati
NEW_TYPE_TAG(CCGeneralLensProblem, INHERITS_FROM(CCTwoP, GeneralLensProblem));
// Set the problem property
-SET_TYPE_PROP(CCGeneralLensProblem, ProblemBaseClass, Dumux::ImplicitPorousMediaProblem<TypeTag>);
+SET_TYPE_PROP(CCGeneralLensProblem, ProblemBaseClass, ImplicitPorousMediaProblem<TypeTag>);
// Set the problem property
-SET_TYPE_PROP(CCGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatialParams<TypeTag>);
+SET_TYPE_PROP(CCGeneralLensProblem, SpatialParamsBaseClass,ImplicitSpatialParams<TypeTag>);
///////////////////////////////////////////////////
@@ -117,10 +117,10 @@ SET_TYPE_PROP(CCGeneralLensProblem, SpatialParamsBaseClass,Dumux::ImplicitSpatia
NEW_TYPE_TAG(SequentialGeneralLensProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, GeneralLensProblem));
// Set the problem property
-SET_TYPE_PROP(SequentialGeneralLensProblem, ProblemBaseClass, Dumux::IMPESProblem2P<TypeTag>);
+SET_TYPE_PROP(SequentialGeneralLensProblem, ProblemBaseClass, IMPESProblem2P<TypeTag>);
// Set the problem property
-SET_TYPE_PROP(SequentialGeneralLensProblem, SpatialParamsBaseClass, Dumux::FVSpatialParams<TypeTag>);
+SET_TYPE_PROP(SequentialGeneralLensProblem, SpatialParamsBaseClass, FVSpatialParams<TypeTag>);
SET_INT_PROP(SequentialGeneralLensProblem, Formulation,
SequentialTwoPCommonIndices::pwsn);
diff --git a/test/common/generalproblem/generallensspatialparams.hh b/test/common/generalproblem/generallensspatialparams.hh
index 92b2ca8cfdc9b3195b432d2de60bb72a4cca204f..52ed7036d19fb5d30c24b98e054b69ad464e01ce 100644
--- a/test/common/generalproblem/generallensspatialparams.hh
+++ b/test/common/generalproblem/generallensspatialparams.hh
@@ -47,7 +47,7 @@ NEW_TYPE_TAG(GeneralLensSpatialParams);
NEW_PROP_TAG(SpatialParamsBaseClass);
// Set the spatial parameters
-SET_TYPE_PROP(GeneralLensSpatialParams, SpatialParams, Dumux::GeneralLensSpatialParams<TypeTag>);
+SET_TYPE_PROP(GeneralLensSpatialParams, SpatialParams, GeneralLensSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(GeneralLensSpatialParams, MaterialLaw)
diff --git a/test/freeflow/navierstokes/navierstokestestproblem.hh b/test/freeflow/navierstokes/navierstokestestproblem.hh
index 3b884acb4cf984fdeaef5141860f4389e3440eed..afe4ef91d06cd15185355d80111a591b17cf91b4 100644
--- a/test/freeflow/navierstokes/navierstokestestproblem.hh
+++ b/test/freeflow/navierstokes/navierstokestestproblem.hh
@@ -43,15 +43,15 @@ namespace Dumux
Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
- SET_TYPE_PROP(NavierStokesTestProblem, Problem, Dumux::NavierStokesTestProblem<TypeTag>);
+ SET_TYPE_PROP(NavierStokesTestProblem, Problem, NavierStokesTestProblem<TypeTag>);
// Set calculation to Navier-Stokes, not Stokes
SET_BOOL_PROP(NavierStokesTestProblem, EnableNavierStokes, true);
// Use nitrogen with a constant viscosity as gas phase
SET_TYPE_PROP(NavierStokesTestProblem, Fluid,
- Dumux::FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::Constant<TypeTag, typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ Constant<TypeTag, typename GET_PROP_TYPE(TypeTag, Scalar)> >);
}
/*!
diff --git a/test/freeflow/stokes/stokestestproblem.hh b/test/freeflow/stokes/stokestestproblem.hh
index 4a115ddc97f2ad51fcfc4ffa4e507e89ec815289..6a36015c2e0d041dc6e4b875925b0014220fc650 100644
--- a/test/freeflow/stokes/stokestestproblem.hh
+++ b/test/freeflow/stokes/stokestestproblem.hh
@@ -45,12 +45,12 @@ NEW_TYPE_TAG(StokesTestProblem, INHERITS_FROM(BoxStokes));
SET_TYPE_PROP(StokesTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(StokesTestProblem, Problem, Dumux::StokesTestProblem<TypeTag>);
+SET_TYPE_PROP(StokesTestProblem, Problem, StokesTestProblem<TypeTag>);
// Use nitrogen as gas phase
SET_TYPE_PROP(StokesTestProblem, Fluid,
- Dumux::FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::N2<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ N2<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
}
/*!
diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 768bbee5120d92a63aa7ae64c599355aec6b0935..81a61c6fcb62fca4cf715113b5c263383be38ec7 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -44,11 +44,11 @@ NEW_TYPE_TAG(Stokes2cTestProblem, INHERITS_FROM(BoxStokesnc));
SET_TYPE_PROP(Stokes2cTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(Stokes2cTestProblem, Problem, Dumux::Stokes2cTestProblem<TypeTag>);
+SET_TYPE_PROP(Stokes2cTestProblem, Problem, Stokes2cTestProblem<TypeTag>);
// Select the fluid system
SET_TYPE_PROP(Stokes2cTestProblem, FluidSystem,
- Dumux::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
}
/*!
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index f4dd73d526f66f28019a5cff1d8d4ee1c21dbc2b..1e6fe9953485f271edf2a09929107ff0ea41ce98 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -52,7 +52,7 @@ SET_TYPE_PROP(Stokes2cniTestProblem, Problem, Stokes2cniTestProblem<TypeTag>);
// Select the fluid system
SET_TYPE_PROP(Stokes2cniTestProblem, FluidSystem,
- Dumux::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Use Pardiso as linear solver, if available
#if HAVE_PARDISO
diff --git a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
index abeb5618f6ea4d8ecd931f7685068a95f741f93f..bc794d5a1a9e1d7db43bf215359af8e0128d55cb 100644
--- a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
@@ -43,12 +43,12 @@ NEW_TYPE_TAG(ZeroEqChannelTestProblem, INHERITS_FROM(BoxZeroEq));
SET_TYPE_PROP(ZeroEqChannelTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ZeroEqChannelTestProblem, Problem, Dumux::ZeroEqChannelTestProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEqChannelTestProblem, Problem, ZeroEqChannelTestProblem<TypeTag>);
// Set the air as the gas phase
SET_TYPE_PROP(ZeroEqChannelTestProblem, Fluid,
- Dumux::FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::Air<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ Air<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Disable gravity
SET_BOOL_PROP(ZeroEqChannelTestProblem, ProblemEnableGravity, false);
diff --git a/test/freeflow/zeroeq/zeroeqtestproblem.hh b/test/freeflow/zeroeq/zeroeqtestproblem.hh
index d9d899fb0c36ae6c43eef0a2472db71ce3e5901d..137ee962d7498bc72fc0b140d9662ccb2a84dba8 100644
--- a/test/freeflow/zeroeq/zeroeqtestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqtestproblem.hh
@@ -46,12 +46,12 @@ NEW_TYPE_TAG(ZeroEqTestProblem, INHERITS_FROM(BoxZeroEq));
SET_TYPE_PROP(ZeroEqTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ZeroEqTestProblem, Problem, Dumux::ZeroEqTestProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEqTestProblem, Problem, ZeroEqTestProblem<TypeTag>);
// Set the air as the gas phase
SET_TYPE_PROP(ZeroEqTestProblem, Fluid,
- Dumux::FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::Air<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::GasPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ Air<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Disable gravity
SET_BOOL_PROP(ZeroEqTestProblem, ProblemEnableGravity, false);
diff --git a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
index a690e851fe41d2c2f1174922cbb528b4cd0d6692..b0b0b38b571a15a039c78b70883123f1745d257e 100644
--- a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
+++ b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
@@ -43,11 +43,11 @@ NEW_TYPE_TAG(ZeroEq2cTestProblem, INHERITS_FROM(BoxZeroEqnc));
SET_TYPE_PROP(ZeroEq2cTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ZeroEq2cTestProblem, Problem, Dumux::ZeroEq2cTestProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEq2cTestProblem, Problem, ZeroEq2cTestProblem<TypeTag>);
// Select the fluid system
SET_TYPE_PROP(ZeroEq2cTestProblem, FluidSystem,
- Dumux::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Disable gravity
SET_BOOL_PROP(ZeroEq2cTestProblem, ProblemEnableGravity, false);
diff --git a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
index 20408ae30921af7f661f14ef8a106ab98eee3c7c..a3b1f19fc2ae6c1be9fbf4a45c24040af32f8fcf 100644
--- a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
+++ b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
@@ -43,11 +43,11 @@ NEW_TYPE_TAG(ZeroEq2cniTestProblem, INHERITS_FROM(BoxZeroEqncni));
SET_TYPE_PROP(ZeroEq2cniTestProblem, Grid, Dune::YaspGrid<2>);
//Set the problem property
-SET_TYPE_PROP(ZeroEq2cniTestProblem, Problem, Dumux::ZeroEq2cniTestProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEq2cniTestProblem, Problem, ZeroEq2cniTestProblem<TypeTag>);
// Select the fluid system
SET_TYPE_PROP(ZeroEq2cniTestProblem, FluidSystem,
- Dumux::FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Disable gravity
SET_BOOL_PROP(ZeroEq2cniTestProblem, ProblemEnableGravity, false);
diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh
index 36e0ff9882ef3d17aef759d6b666cd6ed375d01c..741662f4f574638d301def3040d13e2351686e1e 100644
--- a/test/geomechanics/el1p2c/el1p2cproblem.hh
+++ b/test/geomechanics/el1p2c/el1p2cproblem.hh
@@ -46,18 +46,18 @@ namespace Dumux
SET_TYPE_PROP(El1P2CProblem, Grid, Dune::YaspGrid<3>);
// Set the problem property
- SET_TYPE_PROP(El1P2CProblem, Problem, Dumux::El1P2CProblem<TTAG(El1P2CProblem)>);
+ SET_TYPE_PROP(El1P2CProblem, Problem, El1P2CProblem<TTAG(El1P2CProblem)>);
// Set fluid configuration
SET_PROP(El1P2CProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::H2ON2<Scalar, false> type;
+ typedef FluidSystems::H2ON2<Scalar, false> type;
};
// Set the soil properties
- SET_TYPE_PROP(El1P2CProblem, SpatialParams, Dumux::El1P2CSpatialParams<TypeTag>);
+ SET_TYPE_PROP(El1P2CProblem, SpatialParams, El1P2CSpatialParams<TypeTag>);
//Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(El1P2CProblem, UseMoles, false);
@@ -66,7 +66,7 @@ namespace Dumux
SET_BOOL_PROP(El1P2CProblem, ImplicitWithStabilization, true);
// use the algebraic multigrid
- SET_TYPE_PROP(El1P2CProblem, LinearSolver, Dumux::AMGBackend<TypeTag> );
+ SET_TYPE_PROP(El1P2CProblem, LinearSolver, AMGBackend<TypeTag> );
}
/*!
diff --git a/test/geomechanics/el1p2c/el1p2cspatialparams.hh b/test/geomechanics/el1p2c/el1p2cspatialparams.hh
index 7492583b354590147b28e497e6a26c1d4e57e0ab..ecfdf5bd69398510ce309ee3ceff5450771cca9d 100644
--- a/test/geomechanics/el1p2c/el1p2cspatialparams.hh
+++ b/test/geomechanics/el1p2c/el1p2cspatialparams.hh
@@ -43,7 +43,7 @@ namespace Properties
NEW_TYPE_TAG(El1P2CSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(El1P2CSpatialParams, SpatialParams, Dumux::El1P2CSpatialParams<TypeTag>);
+SET_TYPE_PROP(El1P2CSpatialParams, SpatialParams, El1P2CSpatialParams<TypeTag>);
}
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 58b334306570587c25b695551e440b9cc303dc78..614fea99c26a71c2f9e91a836d1d54d42dae0a6f 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -81,11 +81,11 @@ SET_TYPE_PROP(El2P_TestProblem, Problem, El2P_TestProblem<TypeTag>);
// Set fluid configuration
SET_PROP(El2P_TestProblem, FluidSystem)
{
- typedef Dumux::BrineCO2FluidSystem<TypeTag> type;
+ typedef BrineCO2FluidSystem<TypeTag> type;
};
// Set the CO2 table to be used; in this case not the the default table
-SET_TYPE_PROP(El2P_TestProblem, CO2Table, Dumux::El2P::CO2Tables);
+SET_TYPE_PROP(El2P_TestProblem, CO2Table, El2P::CO2Tables);
// Set the salinity mass fraction of the brine in the reservoir
SET_SCALAR_PROP(El2P_TestProblem, ProblemSalinity, 1e-1);
@@ -100,7 +100,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum{dim = GridView::dimension};
public:
- typedef Dumux::InitialDisplacement<TypeTag, dim> type;
+ typedef InitialDisplacement<TypeTag, dim> type;
};
// Set the initial pressure and saturation function
@@ -110,13 +110,13 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
- typedef Dumux::InitialPressSat<TypeTag> type;
+ typedef InitialPressSat<TypeTag> type;
};
SET_SCALAR_PROP(El2P_TestProblem, NewtonMaxRelativeShift, 1e-5);
// use the algebraic multigrid
-SET_TYPE_PROP(El2P_TestProblem, LinearSolver, Dumux::El2PAMGBackend<TypeTag>);
+SET_TYPE_PROP(El2P_TestProblem, LinearSolver, El2PAMGBackend<TypeTag>);
// central differences to calculate the jacobian by default
SET_INT_PROP(El2P_TestProblem, ImplicitNumericDifferenceMethod, 0);
diff --git a/test/geomechanics/el2p/el2pspatialparams.hh b/test/geomechanics/el2p/el2pspatialparams.hh
index daf321cb1549fae92b24b4df8c3e76c56e3c1406..d8c2cd1caaa782afe3a1f151076aa8f77d26278a 100644
--- a/test/geomechanics/el2p/el2pspatialparams.hh
+++ b/test/geomechanics/el2p/el2pspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(El2PSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(El2PSpatialParams, SpatialParams, Dumux::El2PSpatialParams<TypeTag>);
+SET_TYPE_PROP(El2PSpatialParams, SpatialParams, El2PSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(El2PSpatialParams, MaterialLaw)
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
index 7c6b13ab3eb942e4550c73bd10a4cca12d1107a4..6894378c11ba6083c0e5389bda9ac462d225a981 100644
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ b/test/geomechanics/elastic/elasticmatrixproblem.hh
@@ -43,7 +43,7 @@ NEW_TYPE_TAG(ElasticMatrixProblem, INHERITS_FROM(BoxElastic,ElSpatialParams));
SET_TYPE_PROP(ElasticMatrixProblem, Grid, Dune::YaspGrid<3>);
// Set the problem property
-SET_TYPE_PROP(ElasticMatrixProblem, Problem, Dumux::ElasticMatrixProblem<TypeTag>);
+SET_TYPE_PROP(ElasticMatrixProblem, Problem, ElasticMatrixProblem<TypeTag>);
}
diff --git a/test/geomechanics/elastic/elasticspatialparams.hh b/test/geomechanics/elastic/elasticspatialparams.hh
index 11bff53d07550492d9eb8a073248a8ff6963eb91..2095de3e7794b7c0e0f711d16505f7f16c6739a1 100644
--- a/test/geomechanics/elastic/elasticspatialparams.hh
+++ b/test/geomechanics/elastic/elasticspatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(ElSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ElSpatialParams, SpatialParams, Dumux::ElSpatialParams<TypeTag>);
+SET_TYPE_PROP(ElSpatialParams, SpatialParams, ElSpatialParams<TypeTag>);
}
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
index 28ce18cc5aa2c25483811dce8d54bb13b5bb5237..1aed848bb245bb881952a32302ab103425f90f72 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
@@ -47,10 +47,10 @@ NEW_TYPE_TAG(ThermalConductivityJohansenProblem, INHERITS_FROM(BoxModel, TwoPTwo
SET_TYPE_PROP(ThermalConductivityJohansenProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ThermalConductivityJohansenProblem, Problem, Dumux::ThermalConductivityJohansenProblem<TypeTag>);
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, Problem, ThermalConductivityJohansenProblem<TypeTag>);
// Set the wetting phase
-SET_TYPE_PROP(ThermalConductivityJohansenProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set thermal conductivity law
SET_TYPE_PROP(ThermalConductivityJohansenProblem, ThermalConductivityModel,
@@ -135,7 +135,7 @@ public:
{ return "test_thermalconductivityjohansen"; }
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
@@ -150,7 +150,7 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -158,14 +158,14 @@ public:
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::ImplicitProblem::neumann()
+ //! \copydoc ImplicitProblem::neumann()
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
@@ -184,14 +184,14 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
+ //! \copydoc InjectionProblem::initialPhasePresence()
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
index 2fc820f82884a641096d94057519853507536a5e..2e75c79ed79a8beb3acd0ae016296fdd3d48f56a 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
@@ -47,10 +47,10 @@ NEW_TYPE_TAG(ThermalConductivitySomertonProblem, INHERITS_FROM(BoxModel, TwoPTwo
SET_TYPE_PROP(ThermalConductivitySomertonProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ThermalConductivitySomertonProblem, Problem, Dumux::ThermalConductivitySomertonProblem<TypeTag>);
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, Problem, ThermalConductivitySomertonProblem<TypeTag>);
// Set the wetting phase
-SET_TYPE_PROP(ThermalConductivitySomertonProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set thermal conductivity law
SET_TYPE_PROP(ThermalConductivitySomertonProblem, ThermalConductivityModel,
@@ -135,7 +135,7 @@ public:
{ return "test_thermalconductivitysomerton"; }
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
@@ -150,7 +150,7 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -158,14 +158,14 @@ public:
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::ImplicitProblem::neumann()
+ //! \copydoc ImplicitProblem::neumann()
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
@@ -184,14 +184,14 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
+ //! \copydoc InjectionProblem::initialPhasePresence()
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
index fd335ed399b800cc27dad0e207b39483174cb9c0..357047a60586bd5a518201da6c6ecdbd2f4a6a67 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
@@ -44,7 +44,7 @@ namespace Properties
NEW_TYPE_TAG(ThermalConductivitySpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ThermalConductivitySpatialParams, SpatialParams, Dumux::ThermalConductivitySpatialParams<TypeTag>);
+SET_TYPE_PROP(ThermalConductivitySpatialParams, SpatialParams, ThermalConductivitySpatialParams<TypeTag>);
// Set the material law parameterized by absolute saturations
SET_TYPE_PROP(ThermalConductivitySpatialParams,
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
index 3c6ad884022e6f2444f259a372733cc76eda2b09..b0fccd9a908a3d157922d80ccc5303acfce581ad 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -47,10 +47,10 @@ NEW_TYPE_TAG(EffectiveDiffusivityConstantTauProblem, INHERITS_FROM(BoxModel, Two
SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, Problem, Dumux::EffectiveDiffusivityConstantTauProblem<TypeTag>);
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, Problem, EffectiveDiffusivityConstantTauProblem<TypeTag>);
// Set the wetting phase
-SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set thermal conductivity law
SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, EffectiveDiffusivityModel,
@@ -135,7 +135,7 @@ public:
{ return "test_effectivediffusivity_ct"; }
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
@@ -150,7 +150,7 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -158,14 +158,14 @@ public:
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::ImplicitProblem::neumann()
+ //! \copydoc ImplicitProblem::neumann()
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
@@ -184,14 +184,14 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
+ //! \copydoc InjectionProblem::initialPhasePresence()
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
index 4131a81ef59b70821ab850f9c9292fe1df43643c..089f0481c5f0256e62a97b2209c547bc73c226a9 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
@@ -47,10 +47,10 @@ NEW_TYPE_TAG(EffectiveDiffusivityMillingtonQuirkProblem, INHERITS_FROM(BoxModel,
SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, Problem, Dumux::EffectiveDiffusivityMillingtonQuirkProblem<TypeTag>);
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, Problem, EffectiveDiffusivityMillingtonQuirkProblem<TypeTag>);
// Set the wetting phase
-SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set thermal conductivity law
SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, EffectiveDiffusivityModel,
@@ -135,7 +135,7 @@ public:
{ return "test_effectivediffusivity_mq"; }
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
@@ -150,7 +150,7 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -158,14 +158,14 @@ public:
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::ImplicitProblem::neumann()
+ //! \copydoc ImplicitProblem::neumann()
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
@@ -184,14 +184,14 @@ public:
// \{
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
+ //! \copydoc InjectionProblem::initialPhasePresence()
int initialPhasePresence(const Vertex &vertex,
int &vIdxGlobal,
const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh b/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh
index 2920d7e0eead23fb4935c76ea7354f4a19a6c149..72f2a5b31124462a70350ca551ad18441a0393d1 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh
@@ -44,7 +44,7 @@ namespace Properties
NEW_TYPE_TAG(EffectiveDiffusivitySpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(EffectiveDiffusivitySpatialParams, SpatialParams, Dumux::EffectiveDiffusivitySpatialParams<TypeTag>);
+SET_TYPE_PROP(EffectiveDiffusivitySpatialParams, SpatialParams, EffectiveDiffusivitySpatialParams<TypeTag>);
// Set the material law parameterized by absolute saturations
SET_TYPE_PROP(EffectiveDiffusivitySpatialParams,
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 3f521a1f7e33d150cdea43bd4f107ab01d1cdeac..2bce457de282868467c16000af1f5065dad9bd06 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -66,7 +66,7 @@ namespace Dumux
/*! \brief This fluid state ensures that only the allowed quantities
* are accessed
*/
-template<class Scalar, class FluidSystem, class BaseFluidState = Dumux::CompositionalFluidState<Scalar, FluidSystem> >
+template<class Scalar, class FluidSystem, class BaseFluidState = CompositionalFluidState<Scalar, FluidSystem> >
class HairSplittingFluidState: protected BaseFluidState
{
public:
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 864f50feca9eef6d3b4010fb82ef1c58f2a02994..c449cc59d62973ed43df2dc933e11e85da99611d 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, Problem, TwoCNIStokesTwoPTwoCNI
// Set the local coupling operator
SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, MultiDomainCouplingLocalOperator,
- Dumux::TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
+ TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
// Set the two sub-problems of the global problem
SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, SubDomain1TypeTag, TTAG(Stokes2cniSubProblem));
@@ -81,12 +81,12 @@ SET_TYPE_PROP(Stokes2cniSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCNISubPro
SET_TYPE_PROP(TwoPTwoCNISubProblem, OtherSubDomainTypeTag, TTAG(Stokes2cniSubProblem));
// Set the spatial parameters used for the problems
-SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, Dumux::TwoCNIStokesTwoPTwoCNISpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, TwoCNIStokesTwoPTwoCNISpatialParams<TypeTag>);
// Set the fluid system to use complex relations (last argument)
SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true>);
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true>);
#ifdef HAVE_PARDISO
SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, LinearSolver, PardisoBackend<TypeTag>);
diff --git a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
index 216e3bf2c9e4df0a24db0b7362260c69d981c6a4..c0e5d186e237593e74f18bd6b9c01e6ecec3d1e8 100644
--- a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
@@ -203,11 +203,11 @@ public:
}
// functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc Dumux::ImplicitProblem::bBoxMin()
+ //! \copydoc ImplicitProblem::bBoxMin()
const GlobalPosition &bBoxMin() const
{ return bBoxMin_; }
- //! \copydoc Dumux::ImplicitProblem::bBoxMax()
+ //! \copydoc ImplicitProblem::bBoxMax()
const GlobalPosition &bBoxMax() const
{ return bBoxMax_; }
@@ -225,7 +225,7 @@ public:
{ return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*
* If you overload this method don't forget to call
@@ -448,7 +448,7 @@ private:
Scalar initializationTime_;
std::ofstream outfile;
- Dumux::GnuplotInterface<Scalar> gnuplot_;
+ GnuplotInterface<Scalar> gnuplot_;
std::ofstream evaporationFile;
bool liveEvaporationRates_;
};
diff --git a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
index 42fe8826eda3dd351cf6d14ed66e9cd6339122e0..2af195129031641182cfdf2c0b070febdd88da4e 100644
--- a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
@@ -43,7 +43,7 @@ NEW_TYPE_TAG(Stokes2cniSubProblem,
INHERITS_FROM(BoxStokesncni, SubDomain));
// Set the problem property
-SET_TYPE_PROP(Stokes2cniSubProblem, Problem, Dumux::Stokes2cniSubProblem<TypeTag>);
+SET_TYPE_PROP(Stokes2cniSubProblem, Problem, Stokes2cniSubProblem<TypeTag>);
// Use the Stokes2cniCouplingLocalResidual for the computation of the local residual in the Stokes domain
SET_TYPE_PROP(Stokes2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
@@ -172,11 +172,11 @@ public:
}
// functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc Dumux::ImplicitProblem::bBoxMin()
+ //! \copydoc ImplicitProblem::bBoxMin()
const GlobalPosition &bBoxMin() const
{ return bBoxMin_; }
- //! \copydoc Dumux::ImplicitProblem::bBoxMax()
+ //! \copydoc ImplicitProblem::bBoxMax()
const GlobalPosition &bBoxMax() const
{ return bBoxMax_; }
diff --git a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
index a0e06382afd7f36506ea95bc90f810ad720df476..d03d10fa0168bd6f643d4330ad4c60483087bdb8 100644
--- a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
@@ -53,7 +53,7 @@ SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, Problem, TwoCNIZeroEqTwoPTwoCNI
// Set the local coupling operator
SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, MultiDomainCouplingLocalOperator,
- Dumux::TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
+ TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
// Set the two sub-problems of the global problem
SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, SubDomain1TypeTag, TTAG(ZeroEq2cniSubProblem));
@@ -68,12 +68,12 @@ SET_TYPE_PROP(ZeroEq2cniSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCNISubPro
SET_TYPE_PROP(TwoPTwoCNISubProblem, OtherSubDomainTypeTag, TTAG(ZeroEq2cniSubProblem));
// Set the same spatial parameters for both sub-problems
-SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, Dumux::TwoCNIZeroEqTwoPTwoCNISpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, TwoCNIZeroEqTwoPTwoCNISpatialParams<TypeTag>);
// Set the fluid system to use complex relations (last argument)
SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true>);
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true>);
// If SuperLU is not available, the UMFPack solver is used:
#ifdef HAVE_SUPERLU
@@ -182,11 +182,11 @@ public:
gridinfo(this->sdGrid2());
}
- //! \copydoc Dumux::ImplicitProblem::episodeEnd()
+ //! \copydoc ImplicitProblem::episodeEnd()
void episodeEnd()
{ this->timeManager().startNextEpisode(episodeLength_); }
- //! \copydoc Dumux::ImplicitProblem::shouldWriteRestartFile()
+ //! \copydoc ImplicitProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{
return (((this->timeManager().timeStepIndex() > 0)
@@ -195,7 +195,7 @@ public:
|| this->timeManager().willBeFinished());
}
- //! \copydoc Dumux::ImplicitProblem::shouldWriteOutput()
+ //! \copydoc ImplicitProblem::shouldWriteOutput()
bool shouldWriteOutput() const
{
return (this->timeManager().timeStepIndex() % freqOutput_ == 0
diff --git a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
index c6fc61a2b32fa36424af5bc9f186cc051a379e0a..ca86d4ff0a37581f223b7c994837d33b663e27a4 100644
--- a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
@@ -195,11 +195,11 @@ public:
}
// functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc Dumux::ImplicitProblem::bBoxMin()
+ //! \copydoc ImplicitProblem::bBoxMin()
const GlobalPosition &bBoxMin() const
{ return bBoxMin_; }
- //! \copydoc Dumux::ImplicitProblem::bBoxMax()
+ //! \copydoc ImplicitProblem::bBoxMax()
const GlobalPosition &bBoxMax() const
{ return bBoxMax_; }
@@ -208,11 +208,11 @@ public:
*/
// \{
- //! \copydoc Dumux::ImplicitProblem::name()
+ //! \copydoc ImplicitProblem::name()
const std::string &name() const
{ return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
- //! \copydoc Dumux::ImplicitProblem::init()
+ //! \copydoc ImplicitProblem::init()
void init()
{
ParentType::init();
@@ -226,7 +226,7 @@ public:
*/
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -244,13 +244,13 @@ public:
}
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
}
- //! \copydoc Dumux::ImplicitProblem::neumannAtPos()
+ //! \copydoc ImplicitProblem::neumannAtPos()
void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
values = 0.;
@@ -262,13 +262,13 @@ public:
* \name Volume terms
*/
// \{
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
values = 0.;
}
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
diff --git a/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh b/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh
index 1ee01339a7702691092a2b16684d525a8ca9fb6b..aa1297d854021ab0ae5fe47c86c0915e60985265 100644
--- a/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh
@@ -40,7 +40,7 @@ NEW_TYPE_TAG(ZeroEq2cniSubProblem,
INHERITS_FROM(BoxZeroEqncni, SubDomain));
// Set the problem property
-SET_TYPE_PROP(ZeroEq2cniSubProblem, Problem, Dumux::ZeroEq2cniSubProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEq2cniSubProblem, Problem, ZeroEq2cniSubProblem<TypeTag>);
// Use the StokesncniCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
SET_TYPE_PROP(ZeroEq2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
@@ -169,11 +169,11 @@ public:
}
// functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc Dumux::ImplicitProblem::bBoxMin()
+ //! \copydoc ImplicitProblem::bBoxMin()
const GlobalPosition &bBoxMin() const
{ return bBoxMin_; }
- //! \copydoc Dumux::ImplicitProblem::bBoxMax()
+ //! \copydoc ImplicitProblem::bBoxMax()
const GlobalPosition &bBoxMax() const
{ return bBoxMax_; }
@@ -182,7 +182,7 @@ public:
*/
// \{
- //! \copydoc Dumux::ImplicitProblem::name()
+ //! \copydoc ImplicitProblem::name()
const std::string &name() const
{ return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NameFF); }
@@ -193,7 +193,7 @@ public:
*/
// \{
- //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ //! \copydoc ImplicitProblem::boundaryTypesAtPos()
void boundaryTypesAtPos(BoundaryTypes &values,
const GlobalPosition &globalPos) const
{
@@ -244,7 +244,7 @@ public:
}
}
- //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ //! \copydoc ImplicitProblem::dirichletAtPos()
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
values = 0.0;
@@ -257,13 +257,13 @@ public:
values[temperatureIdx] = refTemperature();
}
- //! \copydoc Dumux::ImplicitProblem::neumannAtPos()
+ //! \copydoc ImplicitProblem::neumannAtPos()
void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
values = 0.;
}
- //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ //! \copydoc ImplicitProblem::sourceAtPos()
void sourceAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
@@ -272,7 +272,7 @@ public:
values = 0.0;
}
- //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ //! \copydoc ImplicitProblem::initialAtPos()
void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
{
initial_(values, globalPos);
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
index 53273c1688d5c984f816f6b4a693ab996cad50b8..88c4fc92ed84c5007f633769e6b06b59cd4b1d78 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
@@ -62,11 +62,11 @@ NEW_TYPE_TAG(TwoCStokesTwoPTwoCTestProblem, INHERITS_FROM(TwoCStokesTwoPTwoC));
SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the global problem
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, Problem, Dumux::TwoCStokesTwoPTwoCTestProblem<TypeTag>);
+SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, Problem, TwoCStokesTwoPTwoCTestProblem<TypeTag>);
// Set the local coupling operator
SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, MultiDomainCouplingLocalOperator,
- Dumux::TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
+ TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
// Set the two sub-problems of the global problem
SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, SubDomain1TypeTag, TTAG(Stokes2cSubProblem));
@@ -81,12 +81,12 @@ SET_TYPE_PROP(Stokes2cSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCSubProblem
SET_TYPE_PROP(TwoPTwoCSubProblem, OtherSubDomainTypeTag, TTAG(Stokes2cSubProblem));
// Set the spatial parameters used for the problems
-SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, Dumux::TwoCStokesTwoPTwoCSpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, TwoCStokesTwoPTwoCSpatialParams<TypeTag>);
// Set the fluid system to use simple relations (last argument)
SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false>);
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false>);
// if you do not have PARDISO, the SuperLU solver is used:
#ifdef HAVE_PARDISO
diff --git a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
index 97fb3d109a50b6665a45c72b635ae2fd9a3663d7..2d2698bb98d661956f959b9bba3969f6909cb2d8 100644
--- a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
@@ -196,7 +196,7 @@ public:
{ return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*
* If you overload this method don't forget to call
diff --git a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
index cb9245a02614cb5799363446da4d085dbd6092a8..1916ad4cc2b31c014363726715e7672e2a6997b8 100644
--- a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
+++ b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
@@ -40,7 +40,7 @@ NEW_TYPE_TAG(Stokes2cSubProblem,
INHERITS_FROM(BoxStokesnc, SubDomain));
// Set the problem property
-SET_TYPE_PROP(Stokes2cSubProblem, Problem, Dumux::Stokes2cSubProblem<TypeTag>);
+SET_TYPE_PROP(Stokes2cSubProblem, Problem, Stokes2cSubProblem<TypeTag>);
// Use the local residual extended for the coupling the local residual extended for the coupling
SET_TYPE_PROP(Stokes2cSubProblem, LocalResidual, StokesncCouplingLocalResidual<TypeTag>);
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
index e28dc6a2c8f53b015032a7d187d1bf971b3cc6ba..7ea688265c45f99dff78df2822a5db76db832e8f 100644
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
+++ b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
@@ -57,7 +57,7 @@ SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, SubDomain2TypeTag, TTAG(TwoPTwoCSub
// Set the local coupling operator
SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, MultiDomainCouplingLocalOperator,
- Dumux::TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
+ TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
// Set the global problem in the context of the two sub-problems
SET_TYPE_PROP(ZeroEq2cSubProblem, MultiDomainTypeTag, TTAG(TwoCZeroEqTwoPTwoCTestProblem));
@@ -68,12 +68,12 @@ SET_TYPE_PROP(ZeroEq2cSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCSubProblem
SET_TYPE_PROP(TwoPTwoCSubProblem, OtherSubDomainTypeTag, TTAG(ZeroEq2cSubProblem));
// Set the same spatial parameters for both sub-problems
-SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, Dumux::TwoCZeroEqTwoPTwoCSpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, TwoCZeroEqTwoPTwoCSpatialParams<TypeTag>);
// Set the fluid system to use simple relations (last argument)
SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false>);
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false>);
// If SuperLU is not available, the UMFPack solver is used:
#ifdef HAVE_SUPERLU
@@ -188,7 +188,7 @@ public:
void episodeEnd()
{ this->timeManager().startNextEpisode(episodeLength_); }
- //! \copydoc Dumux::ImplicitProblem::shouldWriteRestartFile()
+ //! \copydoc ImplicitProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{
return ( ((this->timeManager().timeStepIndex() > 0)
@@ -198,7 +198,7 @@ public:
|| this->timeManager().willBeFinished());
}
- //! \copydoc Dumux::ImplicitProblem::shouldWriteOutput()
+ //! \copydoc ImplicitProblem::shouldWriteOutput()
bool shouldWriteOutput() const
{
return (this->timeManager().timeStepIndex() % freqOutput_ == 0
diff --git a/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh b/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh
index 4bf1c105e8060718f6f7d284b19c7f9b28329f23..4eb4ce1e948daf839a4256d4b6ee21c044e2603b 100644
--- a/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh
+++ b/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh
@@ -194,7 +194,7 @@ public:
{ return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
/*!
- * \brief Called by the Dumux::TimeManager in order to
+ * \brief Called by the TimeManager in order to
* initialize the problem.
*
* If you overload this method don't forget to call
diff --git a/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh b/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh
index dcad6889d6ffbbfbd7095923da93974c4046a712..6d8851e1d96bc1d15e7aaed48155703cedbfa3ef 100644
--- a/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh
+++ b/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh
@@ -40,7 +40,7 @@ NEW_TYPE_TAG(ZeroEq2cSubProblem,
INHERITS_FROM(BoxZeroEqnc, SubDomain));
// Set the problem property
-SET_TYPE_PROP(ZeroEq2cSubProblem, Problem, Dumux::ZeroEq2cSubProblem<TypeTag>);
+SET_TYPE_PROP(ZeroEq2cSubProblem, Problem, ZeroEq2cSubProblem<TypeTag>);
// Use the StokencCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
SET_TYPE_PROP(ZeroEq2cSubProblem, LocalResidual,
diff --git a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
index 6a218895d75b2d1e27209e13020730dd7e02abb1..ae4a37cfe8008b82077f8b54dc2df555c9fe946a 100644
--- a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
@@ -50,17 +50,17 @@ SET_TYPE_PROP(OnePNIConductionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(OnePNIConductionProblem, Problem,
- Dumux::OnePNIConductionProblem<TypeTag>);
+ OnePNIConductionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(OnePNIConductionProblem, Fluid,
- Dumux::FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
SET_TYPE_PROP(OnePNIConductionProblem,
SpatialParams,
- Dumux::OnePNISpatialParams<TypeTag>);
+ OnePNISpatialParams<TypeTag>);
}
diff --git a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
index c49fd593a20e4cc50c2c45658181d6cff7871dc8..4d78eff5f897521d1e62dfd0ab2efdfb0b8e4c11 100644
--- a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
@@ -50,17 +50,17 @@ SET_TYPE_PROP(OnePNIConvectionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(OnePNIConvectionProblem, Problem,
- Dumux::OnePNIConvectionProblem<TypeTag>);
+ OnePNIConvectionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(OnePNIConvectionProblem, Fluid,
- Dumux::FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
- Dumux::H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+ FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
+ H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
SET_TYPE_PROP(OnePNIConvectionProblem,
SpatialParams,
- Dumux::OnePNISpatialParams<TypeTag>);
+ OnePNISpatialParams<TypeTag>);
}
@@ -104,7 +104,7 @@ class OnePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel) ThermalConductivityModel;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef Dumux::H2O<Scalar> IapwsH2O;
+ typedef H2O<Scalar> IapwsH2O;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index 9ad2ad894ae8546dc16bc6508f2016df6db00317..2e6dfbe302555864e47a4b7331aebd4e781cfcfd 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -50,7 +50,7 @@ SET_PROP(OnePTestProblem, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the grid type
@@ -59,19 +59,19 @@ SET_TYPE_PROP(OnePTestProblem, Grid, Dune::YaspGrid<2>);
//SET_TYPE_PROP(OnePTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
// Set the problem property
-SET_TYPE_PROP(OnePTestProblem, Problem, Dumux::OnePTestProblem<TypeTag> );
+SET_TYPE_PROP(OnePTestProblem, Problem, OnePTestProblem<TypeTag> );
// Set the spatial parameters
-SET_TYPE_PROP(OnePTestProblem, SpatialParams, Dumux::OnePTestSpatialParams<TypeTag> );
+SET_TYPE_PROP(OnePTestProblem, SpatialParams, OnePTestSpatialParams<TypeTag> );
// Linear solver settings
-SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(OnePTestProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
NEW_TYPE_TAG(OnePTestBoxProblemWithAMG, INHERITS_FROM(OnePTestBoxProblem));
NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
// Solver settings for the tests using AMG
-SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
-SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag> );
+SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, AMGBackend<TypeTag> );
+SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, AMGBackend<TypeTag> );
// if FoamGrid is available, test for dim < dimWorld
#if HAVE_DUNE_FOAMGRID
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
index f8d85926caecd0dec4ec16936e41d6b0668db241..f881fd6b4450f6eb1936cb4d87d669d58ebe5b22 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
@@ -48,7 +48,7 @@ SET_PROP(OnePSingularityProblem, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the grid type
@@ -56,13 +56,13 @@ SET_TYPE_PROP(OnePSingularityProblem, Grid,
Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
-SET_TYPE_PROP(OnePSingularityProblem, Problem, Dumux::OnePSingularityProblem<TypeTag> );
+SET_TYPE_PROP(OnePSingularityProblem, Problem, OnePSingularityProblem<TypeTag> );
// Set the spatial parameters
-SET_TYPE_PROP(OnePSingularityProblem, SpatialParams, Dumux::OnePSingularitySpatialParams<TypeTag> );
+SET_TYPE_PROP(OnePSingularityProblem, SpatialParams, OnePSingularitySpatialParams<TypeTag> );
// Linear solver settings
-SET_TYPE_PROP(OnePSingularityProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(OnePSingularityProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
// Enable gravity
SET_BOOL_PROP(OnePSingularityProblem, ProblemEnableGravity, false);
@@ -221,7 +221,7 @@ public:
* \brief Applies a vector of point sources. The point sources
* are possibly solution dependent.
*
- * \param pointSources A vector of Dumux::PointSource s that contain
+ * \param pointSources A vector of PointSource s that contain
source values for all phases and space positions.
*
* For this method, the \a values method of the point source
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
index d22bd5d81c4f5e738d460a15808e56abe4689d4c..ba46a7c015739506a80ef0770a48bdef22aa869d 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
@@ -42,10 +42,10 @@ namespace Properties
NEW_TYPE_TAG(OnePSingularityProblemTimeDependent, INHERITS_FROM(OnePSingularityCCProblem));
// Set the problem property
-SET_TYPE_PROP(OnePSingularityProblemTimeDependent, Problem, Dumux::OnePSingularityProblemTimeDependent<TypeTag>);
+SET_TYPE_PROP(OnePSingularityProblemTimeDependent, Problem, OnePSingularityProblemTimeDependent<TypeTag>);
// point source
-SET_TYPE_PROP(OnePSingularityProblemTimeDependent, PointSource, Dumux::TimeDependentPointSource<TypeTag>);
+SET_TYPE_PROP(OnePSingularityProblemTimeDependent, PointSource, TimeDependentPointSource<TypeTag>);
}
/*!
@@ -91,7 +91,7 @@ public:
* \brief Applies a vector of point sources. The point sources
* are possibly solution dependent.
*
- * \param pointSources A vector of Dumux::PointSource s that contain
+ * \param pointSources A vector of PointSource s that contain
source values for all phases and space positions.
*
* For this method, the \a values method of the point source
diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
index 7c3b99cf013a7c26398605add6bf23ad2915ec10..2533b5f75ce8f0fa660b4bebecc7745db4eb7a68 100644
--- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
@@ -55,14 +55,14 @@ SET_PROP(TestProblemOneP, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the spatial parameters
-SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestProblemOneP, SpatialParams, TestOnePSpatialParams<TypeTag>);
//Set the problem
-SET_TYPE_PROP(TestProblemOneP, Problem, Dumux::TestProblemOneP<TypeTag>);
+SET_TYPE_PROP(TestProblemOneP, Problem, TestProblemOneP<TypeTag>);
}
/*!
@@ -255,7 +255,7 @@ private:
}
double delta_;
- Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
+ FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
};
} //end namespace
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
index 8164b9a80badc3c8183435100acd81d97a1851f5..e304f030d1c714663d626a97a9f5959af032966b 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
@@ -80,13 +80,13 @@ namespace Properties
{
//// set the types for the 2PFA FV method
NEW_TYPE_TAG(FVVelocity2PTestProblem, INHERITS_FROM(FVPressureTwoP, TestDiffusionSpatialParams));
-SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
+SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
SET_TYPE_PROP(FVVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(FVVelocity2PTestProblem, GridCreator,
- Dumux::UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
+ UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
// Set the wetting phase
SET_PROP(FVVelocity2PTestProblem, WettingPhase)
@@ -94,7 +94,7 @@ SET_PROP(FVVelocity2PTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the non-wetting phase
@@ -103,7 +103,7 @@ SET_PROP(FVVelocity2PTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Enable gravity
@@ -112,15 +112,15 @@ SET_BOOL_PROP(FVVelocity2PTestProblem, ProblemEnableGravity, false);
// set the types for the MPFA-O FV method
NEW_TYPE_TAG(FVMPFAOVelocity2PTestProblem, INHERITS_FROM(FvMpfaO2dPressureTwoP, TestDiffusionSpatialParams));
-//SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::ILUnBiCGSTABBackend<TypeTag>);
-SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, Dumux::SSORBiCGSTABBackend<TypeTag>);
+//SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, ILUnBiCGSTABBackend<TypeTag>);
+SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, SSORBiCGSTABBackend<TypeTag>);
SET_INT_PROP(FVMPFAOVelocity2PTestProblem, LinearSolverPreconditionerIterations, 2);
-SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
+SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, GridCreator,
- Dumux::UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
+ UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
// Set the wetting phase
SET_PROP(FVMPFAOVelocity2PTestProblem, WettingPhase)
@@ -128,7 +128,7 @@ SET_PROP(FVMPFAOVelocity2PTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the non-wetting phase
@@ -137,7 +137,7 @@ SET_PROP(FVMPFAOVelocity2PTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Enable gravity
@@ -145,13 +145,13 @@ SET_BOOL_PROP(FVMPFAOVelocity2PTestProblem, ProblemEnableGravity, false);
// set the types for the mimetic FD method
NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(MimeticPressureTwoP, TestDiffusionSpatialParams));
-SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, Dumux::TestDiffusionProblem<TypeTag>);
+SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
SET_TYPE_PROP(MimeticPressure2PTestProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(MimeticPressure2PTestProblem, GridCreator,
- Dumux::UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
+ UnitCubeGridCreator<typename GET_PROP_TYPE(TypeTag, Grid)>);
// Set the wetting phase
@@ -160,7 +160,7 @@ SET_PROP(MimeticPressure2PTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the non-wetting phase
@@ -169,7 +169,7 @@ SET_PROP(MimeticPressure2PTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Enable gravity
@@ -390,7 +390,7 @@ private:
}
Scalar delta_;
- Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
+ FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
};
} //end namespace
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index 810937e275222a9afe64688559e23fbeab719ff6..fe4450d93c842655c1cbeee1f237afd239133003 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -57,7 +57,7 @@ SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::UGGrid<3>);
SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::YaspGrid<3>);
#endif
-SET_TYPE_PROP(DiffusionTestProblem, Problem, Dumux::TestDiffusion3DProblem<TypeTag>);
+SET_TYPE_PROP(DiffusionTestProblem, Problem, TestDiffusion3DProblem<TypeTag>);
// Set the wetting phase
SET_PROP(DiffusionTestProblem, WettingPhase)
@@ -65,7 +65,7 @@ SET_PROP(DiffusionTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the non-wetting phase
@@ -74,13 +74,13 @@ SET_PROP(DiffusionTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
#if HAVE_SUPERLU
-SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, Dumux::SuperLUBackend<TypeTag>);
+SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, SuperLUBackend<TypeTag>);
#else
-SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, Dumux::ILUnRestartedGMResBackend<TypeTag>);
+SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, ILUnRestartedGMResBackend<TypeTag>);
SET_INT_PROP(DiffusionTestProblem, LinearSolverGMResRestart, 80);
SET_INT_PROP(DiffusionTestProblem, LinearSolverMaxIterations, 1000);
SET_SCALAR_PROP(DiffusionTestProblem, LinearSolverResidualReduction, 1e-8);
@@ -258,7 +258,7 @@ public:
}
private:
- Dumux::FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
+ FVVelocity<TypeTag, typename GET_PROP_TYPE(TypeTag, Velocity) > velocity_;
static constexpr Scalar eps_ = 1e-4;
};
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
index 0e4345b730d8fe25f0eed792a3b17fae43f1c541..a6caea6e4afb67db2cdd83bf60752c128a7123fc 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams.hh
@@ -42,7 +42,7 @@ namespace Properties
NEW_TYPE_TAG(TestDiffusionSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParams, Dumux::TestDiffusionSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParams, TestDiffusionSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestDiffusionSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
index b72f3b5b0d5ed29733d95db6aef524ac8a674835..6cf94c8b6af171dadb428b2ae156f880d96cc5bd 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionspatialparams3d.hh
@@ -41,7 +41,7 @@ namespace Properties
NEW_TYPE_TAG(TestDiffusionSpatialParams3d);
// Set the spatial parameters
-SET_TYPE_PROP(TestDiffusionSpatialParams3d, SpatialParams, Dumux::TestDiffusionSpatialParams3d<TypeTag>);
+SET_TYPE_PROP(TestDiffusionSpatialParams3d, SpatialParams, TestDiffusionSpatialParams3d<TypeTag>);
// Set the material law
SET_PROP(TestDiffusionSpatialParams3d, MaterialLaw)
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
index 3065e429cc54e89084c34392e699f9873538be39..0ed78b339c641277293ca523a09eb7837206aeb8 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
@@ -51,17 +51,17 @@ SET_TYPE_PROP(OnePTwoCNIConductionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(OnePTwoCNIConductionProblem, Problem,
- Dumux::OnePTwoCNIConductionProblem<TypeTag>);
+ OnePTwoCNIConductionProblem<TypeTag>);
// Set fluid configuration
SET_TYPE_PROP(OnePTwoCNIConductionProblem,
FluidSystem,
- Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
+ FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
// Set the spatial parameters
SET_TYPE_PROP(OnePTwoCNIConductionProblem,
SpatialParams,
- Dumux::OnePTwoCNISpatialParams<TypeTag>);
+ OnePTwoCNISpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(OnePTwoCNIConductionProblem, UseMoles, true);
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
index e43f564d7e5540057790653ad9170c563b6e23b2..83b0dad6ea43414781af5f858885101c7953dd6a 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
@@ -50,17 +50,17 @@ SET_TYPE_PROP(OnePTwoCNIConvectionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(OnePTwoCNIConvectionProblem, Problem,
- Dumux::OnePTwoCNIConvectionProblem<TypeTag>);
+ OnePTwoCNIConvectionProblem<TypeTag>);
// Set fluid configuration
SET_TYPE_PROP(OnePTwoCNIConvectionProblem,
FluidSystem,
- Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
+ FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
// Set the spatial parameters
SET_TYPE_PROP(OnePTwoCNIConvectionProblem,
SpatialParams,
- Dumux::OnePTwoCNISpatialParams<TypeTag>);
+ OnePTwoCNISpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true);
@@ -108,7 +108,7 @@ class OnePTwoCNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel) ThermalConductivityModel;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef Dumux::H2O<Scalar> IapwsH2O;
+ typedef H2O<Scalar> IapwsH2O;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
diff --git a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
index a57fd329e54b1af8df1dd0505badffd0748d5918..126f5e82227c6547b7161355e4d0548ad9018baa 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
@@ -58,17 +58,17 @@ SET_TYPE_PROP(OnePTwoCOutflowProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(OnePTwoCOutflowProblem, Problem, Dumux::OnePTwoCOutflowProblem<TypeTag>);
+SET_TYPE_PROP(OnePTwoCOutflowProblem, Problem, OnePTwoCOutflowProblem<TypeTag>);
// Set fluid configuration
SET_TYPE_PROP(OnePTwoCOutflowProblem,
FluidSystem,
- Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+ FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set the spatial parameters
SET_TYPE_PROP(OnePTwoCOutflowProblem,
SpatialParams,
- Dumux::OnePTwoCOutflowSpatialParams<TypeTag>);
+ OnePTwoCOutflowSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(OnePTwoCOutflowProblem, UseMoles, true);
diff --git a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
index 2d5da78db2814963384aedac90e624e45505faa6..e6f35521c2f66dcecbfa7f4e400d0ddc95f694e8 100644
--- a/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
+++ b/test/porousmediumflow/2p/implicit/cc2pcornerpointproblem.hh
@@ -49,10 +49,10 @@ NEW_TYPE_TAG(CC2PCornerPointProblem, INHERITS_FROM(CCTwoP, CC2PCornerPointSpatia
SET_TYPE_PROP(CC2PCornerPointProblem, Grid, Dune::CpGrid);
// Set the problem property
-SET_TYPE_PROP(CC2PCornerPointProblem, Problem, Dumux::CC2PCornerPointProblem<TypeTag>);
+SET_TYPE_PROP(CC2PCornerPointProblem, Problem, CC2PCornerPointProblem<TypeTag>);
// Set the grid creator
-SET_TYPE_PROP(CC2PCornerPointProblem, GridCreator, Dumux::CpGridCreator<TypeTag>);
+SET_TYPE_PROP(CC2PCornerPointProblem, GridCreator, CpGridCreator<TypeTag>);
// Set properties that are specific for CpGrid
SET_TYPE_PROP(CC2PCornerPointProblem, ElementVolumeVariables, CpElementVolumeVariables<TypeTag>);
@@ -65,7 +65,7 @@ SET_PROP(CC2PCornerPointProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -74,7 +74,7 @@ SET_PROP(CC2PCornerPointProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
}
diff --git a/test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh b/test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh
index e302e85219e39ee504b4580f729be14fdfbeb3b0..99f4276a600ae3f7b8c057be9f8e36297c94f0df 100644
--- a/test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/cc2pcornerpointspatialparams.hh
@@ -38,7 +38,7 @@ namespace Properties
NEW_TYPE_TAG(CC2PCornerPointSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(CC2PCornerPointSpatialParams, SpatialParams, Dumux::CC2PCornerPointSpatialParams<TypeTag>);
+SET_TYPE_PROP(CC2PCornerPointSpatialParams, SpatialParams, CC2PCornerPointSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(CC2PCornerPointSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
index 16702de8bf485ce27686309f04e40b8c68cebc3f..1125ced35e1daada47ed903de2031eaa5e312e6e 100644
--- a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
+++ b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
@@ -49,7 +49,7 @@ NEW_TYPE_TAG(GeneralizedDirichletProblem, INHERITS_FROM(BoxTwoP, GeneralizedDiri
// Set the "Problem" property
SET_PROP(GeneralizedDirichletProblem, Problem)
-{ typedef Dumux::GeneralizedDirichletProblem<TypeTag> type;};
+{ typedef GeneralizedDirichletProblem<TypeTag> type;};
// Set grid to be used
SET_TYPE_PROP(GeneralizedDirichletProblem, Grid, Dune::YaspGrid<1>);
@@ -58,14 +58,14 @@ SET_TYPE_PROP(GeneralizedDirichletProblem, Grid, Dune::YaspGrid<1>);
SET_PROP(GeneralizedDirichletProblem, WettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type;
+public: typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type;
};
// Set the non-wetting phase
SET_PROP(GeneralizedDirichletProblem, NonwettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type;
+public: typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type;
};
SET_INT_PROP(GeneralizedDirichletProblem, Formulation, TwoPFormulation::pnsw);
diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
index e14746a7ac7bb39c611e334734d428ddf64e4af0..e8933cf258d6ee6073f3a7b3777e211cbc5d3291 100644
--- a/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
@@ -45,7 +45,7 @@ NEW_TYPE_TAG(GeneralizedDirichletSpatialParams);
// Set the spatial parameters
SET_TYPE_PROP(GeneralizedDirichletSpatialParams, SpatialParams,
- Dumux::GeneralizedDirichletSpatialParams<TypeTag>);
+ GeneralizedDirichletSpatialParams<TypeTag>);
// Set the material law
SET_PROP(GeneralizedDirichletSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh b/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
index 4ec1d5c1e937968fd2feb4ff0ddf9f416b414322..91521b5250fbabb10c21d7564cb2278240f6274c 100644
--- a/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
+++ b/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
@@ -63,7 +63,7 @@ SET_TYPE_PROP(InjectionProblem2PNI, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(InjectionProblem2PNI, Problem, Dumux::InjectionProblem2PNI<TypeTag>);
+SET_TYPE_PROP(InjectionProblem2PNI, Problem, InjectionProblem2PNI<TypeTag>);
// Use the same fluid system as the 2p2c injection problem
SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
@@ -72,14 +72,14 @@ SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GE
// Set the wetting phase
// SET_TYPE_PROP(InjectionProblem2PNI,
// WettingPhase,
-// Dumux::FluidSystems::LiquidPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
-// Dumux::SimpleH2O<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
+// FluidSystems::LiquidPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
+// SimpleH2O<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
// Set the non-wetting phase
// SET_TYPE_PROP(InjectionProblem2PNI,
// NonwettingPhase,
-// Dumux::FluidSystems::GasPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
-// Dumux::N2<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
+// FluidSystems::GasPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
+// N2<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
}
/*!
diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
index 4210c75a223144fcd17af27b3624e7f0b1d6a5c3..fd64d71f2293eba4f1f2f107401bd29b5fc0cfae 100644
--- a/test/porousmediumflow/2p/implicit/lensproblem.hh
+++ b/test/porousmediumflow/2p/implicit/lensproblem.hh
@@ -67,7 +67,7 @@ SET_TYPE_PROP(LensCCAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune:
#endif
// Set the problem property
-SET_TYPE_PROP(LensProblem, Problem, Dumux::LensProblem<TypeTag>);
+SET_TYPE_PROP(LensProblem, Problem, LensProblem<TypeTag>);
// Set the wetting phase
SET_PROP(LensProblem, WettingPhase)
@@ -75,7 +75,7 @@ SET_PROP(LensProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -84,15 +84,15 @@ SET_PROP(LensProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
// Linear solver settings
-SET_TYPE_PROP(LensCCProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
-SET_TYPE_PROP(LensBoxProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(LensCCProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(LensBoxProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
-SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
+SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
SET_BOOL_PROP(LensCCAdaptiveProblem, AdaptiveGrid, true);
SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
diff --git a/test/porousmediumflow/2p/implicit/lensspatialparams.hh b/test/porousmediumflow/2p/implicit/lensspatialparams.hh
index da9dcf84885bce944ee0aa5edbb607c1c8129856..4a622dbfd6c82c92210208e54249cf4bff77db88 100644
--- a/test/porousmediumflow/2p/implicit/lensspatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/lensspatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(LensSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(LensSpatialParams, SpatialParams, Dumux::LensSpatialParams<TypeTag>);
+SET_TYPE_PROP(LensSpatialParams, SpatialParams, LensSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(LensSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/implicit/pointsources/lensproblem.hh b/test/porousmediumflow/2p/implicit/pointsources/lensproblem.hh
index dc2006f0faf00e7d8eed329cf12a1c1908def3d5..69c1178fa56425ee2e2c29e41c54de742135bd4d 100644
--- a/test/porousmediumflow/2p/implicit/pointsources/lensproblem.hh
+++ b/test/porousmediumflow/2p/implicit/pointsources/lensproblem.hh
@@ -88,7 +88,7 @@ SET_TYPE_PROP(LensProblemPointSource, Problem, LensProblemPointSource<TypeTag>);
template <class TypeTag >
class LensProblemPointSource : public LensProblem<TypeTag>
{
- typedef typename Dumux::LensProblem<TypeTag> ParentType;
+ typedef LensProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -110,7 +110,7 @@ public:
* \brief Applies a vector of point sources. The point sources
* are possibly solution dependent.
*
- * \param pointSources A vector of Dumux::PointSource s that contain
+ * \param pointSources A vector of PointSource s that contain
source values for all phases and space positions.
*
* For this method, the \a values method of the point source
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index e0e7e290ac15dc9526a966802d9fa47bec48a0db..cad2120f2995053c9980dcd85e132003eaf8516e 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -62,7 +62,7 @@ SET_TYPE_PROP(ThreeDTwoPTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune:
#endif
// Set the problem property
-SET_TYPE_PROP(ThreeDTwoPTestProblem, Problem, Dumux::Test3D2PProblem<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestProblem, Problem, Test3D2PProblem<TypeTag>);
// Set the wetting phase
SET_PROP(ThreeDTwoPTestProblem, WettingPhase)
@@ -70,7 +70,7 @@ SET_PROP(ThreeDTwoPTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -79,7 +79,7 @@ SET_PROP(ThreeDTwoPTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
#if PROBLEM == 1
@@ -94,17 +94,17 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::Test3d2pSpatialParams<TypeTag> type;
+ typedef Test3d2pSpatialParams<TypeTag> type;
};
#if PROBLEM == 1
-SET_TYPE_PROP(ThreeDTwoPTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
SET_SCALAR_PROP(ThreeDTwoPTestProblem, ImpetCFLFactor, 1.0);
#else
SET_SCALAR_PROP(ThreeDTwoPTestProblem, ImpetCFLFactor, 0.95);
#endif
-SET_TYPE_PROP(ThreeDTwoPTestProblem, AdaptionIndicator, Dumux::GridAdaptionIndicator2PLocal<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestProblem, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
NEW_TYPE_TAG(FVTwoPTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestProblem));
NEW_TYPE_TAG(FVAdaptiveTwoPTestProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestProblem));
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
index a673cee9cc23add720d69a0e3e6a3642a9d5edce..470927961d94223bfa063a85e69625b6abc3cf27 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pspatialparams.hh
@@ -41,7 +41,7 @@ namespace Properties
NEW_TYPE_TAG(Test3d2pSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(Test3d2pSpatialParams, SpatialParams, Dumux::Test3d2pSpatialParams<TypeTag>);
+SET_TYPE_PROP(Test3d2pSpatialParams, SpatialParams, Test3d2pSpatialParams<TypeTag>);
// Set the material law
SET_PROP(Test3d2pSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 796c660eee07cc22fb852d509ed45f592b2fec2d..f24324f108b8696504a70e0d126061a571cc5199 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -62,7 +62,7 @@ SET_TYPE_PROP(TestIMPESAdaptiveRestartProblem, GridCreator, GridCreator<TypeTag>
#endif
// Set the problem property
-SET_TYPE_PROP(TestIMPESAdaptiveProblem, Problem, Dumux::TestIMPESAdaptiveProblem<TypeTag>);
+SET_TYPE_PROP(TestIMPESAdaptiveProblem, Problem, TestIMPESAdaptiveProblem<TypeTag>);
// Set the wetting phase
SET_PROP(TestIMPESAdaptiveProblem, WettingPhase)
@@ -70,7 +70,7 @@ SET_PROP(TestIMPESAdaptiveProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -79,7 +79,7 @@ SET_PROP(TestIMPESAdaptiveProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Enable gravity
@@ -87,7 +87,7 @@ SET_BOOL_PROP(TestIMPESAdaptiveProblem, ProblemEnableGravity, false);
//SET_BOOL_PROP(TestIMPESAdaptiveProblem, EnableCompressibility, true);
-//SET_TYPE_PROP(TestIMPESAdaptiveProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
+//SET_TYPE_PROP(TestIMPESAdaptiveProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
SET_SCALAR_PROP(TestIMPESAdaptiveProblem, ImpetCFLFactor, 0.95);
}
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
index 49392068710d3fe7cd2c66219faa2f60e14921dc..25473c42096fdfc637991da0a8496f24f258fb61 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptivespatialparams.hh
@@ -42,7 +42,7 @@ namespace Properties
NEW_TYPE_TAG(TestIMPESAdaptiveSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParams, Dumux::TestIMPESAdaptiveSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParams, TestIMPESAdaptiveSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestIMPESAdaptiveSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/sequential/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
index d929ecddc7a695458e9b67ccbf28ced3a96cdcb7..074f2fd601786d4293af21c80cd0598b79a19fc0 100644
--- a/test/porousmediumflow/2p/sequential/test_impesproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
@@ -61,7 +61,7 @@ NEW_TYPE_TAG(IMPESTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IM
SET_TYPE_PROP(IMPESTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(IMPESTestProblem, Problem, Dumux::IMPESTestProblem<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblem, Problem, IMPESTestProblem<TypeTag>);
////////////////////////////////////////////////////////////////////////
//Switch to a p_n-S_w formulation
@@ -89,7 +89,7 @@ SET_PROP(IMPESTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -98,19 +98,19 @@ SET_PROP(IMPESTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
-SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
// set up an additional problem where the AMG backend is used
NEW_TYPE_TAG(IMPESTestProblemWithAMG, INHERITS_FROM(IMPESTestProblem));
// use the AMG backend for the corresponding test
-SET_TYPE_PROP(IMPESTestProblemWithAMG, LinearSolver, Dumux::AMGBackend<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblemWithAMG, LinearSolver, AMGBackend<TypeTag>);
// Set the grid type
SET_TYPE_PROP(IMPESTestProblemWithAMG, Grid, Dune::YaspGrid<2>);
// Set the grid creator
-SET_TYPE_PROP(IMPESTestProblemWithAMG, GridCreator, Dumux::GridCreator<TypeTag>);
+SET_TYPE_PROP(IMPESTestProblemWithAMG, GridCreator, GridCreator<TypeTag>);
}
/*!
diff --git a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
index 5c11563d2e387e2816eb308de1ba2afec3b66c52..c288a11f887cecd625f32c0d30e9c5902f72d44b 100644
--- a/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesspatialparams.hh
@@ -42,7 +42,7 @@ namespace Properties
NEW_TYPE_TAG(TestIMPESSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParams, Dumux::TestIMPESSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParams, TestIMPESSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestIMPESSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 165bdaf21dd6d6cb18a15c31f85ca7f2a8d6f17c..6b5e854b40a4601c3efd5ec1d6482b45ea75df93 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(MPFATwoPTestProblem, Problem, Dumux::MPFATwoPTestProblem<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestProblem, Problem, MPFATwoPTestProblem<TypeTag>);
// Set the wetting phase
SET_PROP(MPFATwoPTestProblem, WettingPhase)
@@ -74,7 +74,7 @@ SET_PROP(MPFATwoPTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
#if PROBLEM == 2
@@ -84,7 +84,7 @@ SET_PROP(MPFATwoPTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
#else
// Set the non-wetting phase
@@ -93,7 +93,7 @@ SET_PROP(MPFATwoPTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
#endif
@@ -108,9 +108,9 @@ SET_BOOL_PROP(MPFATwoPTestProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(MPFATwoPTestProblem, ProblemEnableGravity, false);
#endif
-SET_TYPE_PROP(MPFATwoPTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
SET_SCALAR_PROP(MPFATwoPTestProblem, ImpetCFLFactor, 1.0);
-SET_TYPE_PROP(MPFATwoPTestProblem, AdaptionIndicator, Dumux::GridAdaptionIndicator2PLocal<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestProblem, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
NEW_TYPE_TAG(FVTwoPTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestProblem));
NEW_TYPE_TAG(FVAdaptiveTwoPTestProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, MPFATwoPTestProblem));
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
index 07643adf5dbc742c1fc4523979d5c907c8d7c6f8..04ebce35c8d233d982193dc385cb89b835bc2f36 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pspatialparams.hh
@@ -40,7 +40,7 @@ namespace Properties
NEW_TYPE_TAG(Test2PSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(Test2PSpatialParams, SpatialParams, Dumux::Test2PSpatialParams<TypeTag>);
+SET_TYPE_PROP(Test2PSpatialParams, SpatialParams, Test2PSpatialParams<TypeTag>);
// Set the material law
SET_PROP(Test2PSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
index f2283c1d44ef3b1a18a99446b698d1660dff201a..5cfc6e108c90060cfe93721e6fd2185063780429 100644
--- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
@@ -52,7 +52,7 @@ NEW_TYPE_TAG(TransportTestProblem, INHERITS_FROM(FVTransportTwoP, TestTransportS
SET_TYPE_PROP(TransportTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TransportTestProblem, Problem, Dumux::TestTransportProblem<TypeTag>);
+SET_TYPE_PROP(TransportTestProblem, Problem, TestTransportProblem<TypeTag>);
// Set the wetting phase
SET_PROP(TransportTestProblem, WettingPhase)
@@ -60,7 +60,7 @@ SET_PROP(TransportTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
// Set the non-wetting phase
@@ -69,7 +69,7 @@ SET_PROP(TransportTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Unit<Scalar> > type;
};
SET_INT_PROP(TransportTestProblem, VelocityFormulation, SequentialTwoPCommonIndices::velocityTotal);
diff --git a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
index c1cf200af41ff99cf18f0c6739ac7079225f528a..d44fa7826264e0dc81433340643235c7a9aa8926 100644
--- a/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportspatialparams.hh
@@ -42,7 +42,7 @@ namespace Properties
NEW_TYPE_TAG(TestTransportSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TestTransportSpatialParams, SpatialParams, Dumux::TestTransportSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestTransportSpatialParams, SpatialParams, TestTransportSpatialParams<TypeTag>);
// Set the material law
SET_PROP(TestTransportSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index ff1a318faf86955438119db8884284980a6d6ce0..86c6f454b8ebf6ba9c9d8039c962d9cd57a285f1 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -46,12 +46,12 @@ NEW_TYPE_TAG(InjectionCCProblem, INHERITS_FROM(CCModel, InjectionProblem));
SET_TYPE_PROP(InjectionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(InjectionProblem, Problem, Dumux::InjectionProblem<TypeTag>);
+SET_TYPE_PROP(InjectionProblem, Problem, InjectionProblem<TypeTag>);
// Set fluid configuration
SET_TYPE_PROP(InjectionProblem,
FluidSystem,
- Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
+ FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(InjectionProblem, UseMoles, true);
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index 45c55cc01e9fea5528f75e0fe3cae7605ca648f3..46c453492f06911de42c219526188451dd67e2c5 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(InjectionSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(InjectionSpatialParams, SpatialParams, Dumux::InjectionSpatialParams<TypeTag>);
+SET_TYPE_PROP(InjectionSpatialParams, SpatialParams, InjectionSpatialParams<TypeTag>);
// Set the material law parameterized by absolute saturations
SET_TYPE_PROP(InjectionSpatialParams,
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 1ff7e8ea3650d38405a1547a75225fa8ea52b18b..cb9283d6d36afd10785f596d15a3f13f0f74690a 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -49,10 +49,10 @@ NEW_TYPE_TAG(WaterAirCCProblem, INHERITS_FROM(CCModel, WaterAirProblem));
SET_TYPE_PROP(WaterAirProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(WaterAirProblem, Problem, Dumux::WaterAirProblem<TypeTag>);
+SET_TYPE_PROP(WaterAirProblem, Problem, WaterAirProblem<TypeTag>);
// Set the wetting phase
-SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(WaterAirProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(WaterAirProblem, UseMoles, true);
diff --git a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
index f549920ce29acb1d344a0c9837dab2de018e23e4..6b88e122db3d376ea43e56da2f5b8123b360c9e5 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(WaterAirSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(WaterAirSpatialParams, SpatialParams, Dumux::WaterAirSpatialParams<TypeTag>);
+SET_TYPE_PROP(WaterAirSpatialParams, SpatialParams, WaterAirSpatialParams<TypeTag>);
// Set the material law parameterized by absolute saturations
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index 902d8fcebddd92b937517365d76c21490c553b7c..7d2ac6e5936851c82531dbaa6f391aa2e1b75f38 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -52,10 +52,10 @@ SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::YaspGrid<3>);
#endif
// Set the problem property
-SET_TYPE_PROP(Adaptive2p2c2d, Problem, Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
+SET_TYPE_PROP(Adaptive2p2c2d, Problem, Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
// Select fluid system
-SET_TYPE_PROP(Adaptive2p2c2d, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
+SET_TYPE_PROP(Adaptive2p2c2d, FluidSystem, H2OAirFluidSystem<TypeTag>);
// Set the 2d Transport and Pressure model (already set as default in properties file)
SET_TYPE_PROP(Adaptive2p2c2d, TransportModel, FV2dTransport2P2CAdaptive<TypeTag>);
@@ -146,7 +146,7 @@ Adaptive2p2c2d(TimeManager &timeManager, const GridView& gridView) :
*/
// \{
-//! @copydoc Dumux::TestDecTwoPTwoCProblem::shouldWriteRestartFile()
+//! @copydoc TestDecTwoPTwoCProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{
return false;
@@ -163,14 +163,14 @@ Scalar temperatureAtPos(const GlobalPosition& globalPos) const
// \}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::referencePressureAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::referencePressureAtPos()
*/
Scalar referencePressureAtPos(const GlobalPosition& globalPos) const
{
return 1e6;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryTypesAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryTypesAtPos()
*/
void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos) const
{
@@ -182,7 +182,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
@@ -190,7 +190,7 @@ const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulat
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::dirichletAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::dirichletAtPos()
*/
void dirichletAtPos(PrimaryVariables &bcValues, const GlobalPosition& globalPos) const
{
@@ -208,7 +208,7 @@ void dirichletAtPos(PrimaryVariables &bcValues, const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::neumannAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::neumannAtPos()
*/
void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalPos) const
{
@@ -216,7 +216,7 @@ void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalP
}
/*!
- * \copydoc Dumux::IMPETProblem::source()
+ * \copydoc IMPETProblem::source()
*/
void source(PrimaryVariables &values, const Element &element)
{
@@ -233,7 +233,7 @@ void source(PrimaryVariables &values, const Element &element)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initialFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
@@ -241,7 +241,7 @@ const void initialFormulation(typename Indices::BoundaryFormulation &initialForm
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initConcentrationAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::initConcentrationAtPos()
*/
Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
{
@@ -250,7 +250,7 @@ Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
private:
//Grid grid_;
-Dumux::VtkMultiWriter<GridView> debugWriter_;
+VtkMultiWriter<GridView> debugWriter_;
};
} //end namespace
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 0a3f5963f72b2a77e58f63fc340251d0998cf9c2..c121da8a5e2bba8ee13c98c1f77b7e501ea6fc0f 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -51,15 +51,15 @@ SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::YaspGrid<3>);
#endif
// Set the problem property
-SET_TYPE_PROP(Adaptive2p2c3d, Problem, Dumux::Adaptive2p2c3d<TTAG(Adaptive2p2c3d)>);
+SET_TYPE_PROP(Adaptive2p2c3d, Problem, Adaptive2p2c3d<TTAG(Adaptive2p2c3d)>);
// Set the model properties
-SET_TYPE_PROP(Adaptive2p2c3d, TransportModel, Dumux::FV3dTransport2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
+SET_TYPE_PROP(Adaptive2p2c3d, TransportModel, FV3dTransport2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
-SET_TYPE_PROP(Adaptive2p2c3d, PressureModel, Dumux::FV3dPressure2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
+SET_TYPE_PROP(Adaptive2p2c3d, PressureModel, FV3dPressure2P2CAdaptive<TTAG(Adaptive2p2c3d)>);
// Select fluid system
-SET_TYPE_PROP(Adaptive2p2c3d, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
+SET_TYPE_PROP(Adaptive2p2c3d, FluidSystem, H2OAirFluidSystem<TypeTag>);
SET_BOOL_PROP(Adaptive2p2c3d, EnableComplicatedFluidSystem, false);
@@ -151,13 +151,13 @@ Adaptive2p2c3d(TimeManager &timeManager, const GridView& gridView) :
* \name Problem parameters
*/
// \{
-//! @copydoc Dumux::TestDecTwoPTwoCProblem::name()
+//! @copydoc TestDecTwoPTwoCProblem::name()
const char *name() const
{
return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name).c_str();
}
-//! @copydoc Dumux::TestDecTwoPTwoCProblem::shouldWriteRestartFile()
+//! @copydoc TestDecTwoPTwoCProblem::shouldWriteRestartFile()
bool shouldWriteRestartFile() const
{
return false;
@@ -174,7 +174,7 @@ Scalar temperatureAtPos(const GlobalPosition& globalPos) const
// \}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::referencePressureAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::referencePressureAtPos()
*/
Scalar referencePressureAtPos(const GlobalPosition& globalPos) const
{
@@ -182,7 +182,7 @@ Scalar referencePressureAtPos(const GlobalPosition& globalPos) const
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryTypesAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryTypesAtPos()
*/
void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos) const
{
@@ -194,7 +194,7 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
@@ -202,7 +202,7 @@ const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulat
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::dirichletAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::dirichletAtPos()
*/
void dirichletAtPos(PrimaryVariables &bcValues, const GlobalPosition& globalPos) const
{
@@ -219,7 +219,7 @@ void dirichletAtPos(PrimaryVariables &bcValues, const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::neumannAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::neumannAtPos()
*/
void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalPos) const
{
@@ -227,7 +227,7 @@ void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalP
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::sourceAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::sourceAtPos()
*/
void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos) const
{
@@ -237,7 +237,7 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initialFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
@@ -245,7 +245,7 @@ const void initialFormulation(typename Indices::BoundaryFormulation &initialForm
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initConcentrationAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::initConcentrationAtPos()
*/
Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
{
@@ -253,7 +253,7 @@ Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
}
private:
-Dumux::VtkMultiWriter<GridView> debugWriter_;
+VtkMultiWriter<GridView> debugWriter_;
Scalar injectionrate_;
};
} //end namespace
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
index 2b6c455cd943dfababd27bb8a053d2b0b1125d29..1420f937d603b59feeaf52977a90571b939c84a5 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
@@ -41,7 +41,7 @@ namespace Properties
NEW_TYPE_TAG(Test2P2CSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(Test2P2CSpatialParams, SpatialParams, Dumux::Test2P2CSpatialParams<TypeTag>);
+SET_TYPE_PROP(Test2P2CSpatialParams, SpatialParams, Test2P2CSpatialParams<TypeTag>);
// Set the material law
SET_PROP(Test2P2CSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index ae2364427bbe11dcdc9a3c451a5cf95a754cc5d3..96e2e706049e5b02d2a5c14d5edef3a56987e2a9 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -48,18 +48,18 @@ NEW_TYPE_TAG(TestDecTwoPTwoCProblem, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CS
SET_TYPE_PROP(TestDecTwoPTwoCProblem, Grid, Dune::YaspGrid<3>);
// Set the problem property
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, Problem, Dumux::TestDecTwoPTwoCProblem<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCProblem, Problem, TestDecTwoPTwoCProblem<TypeTag>);
// Set the model properties
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, TransportModel, Dumux::FVTransport2P2C<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCProblem, TransportModel, FVTransport2P2C<TypeTag>);
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, PressureModel,Dumux::FVPressure2P2C<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCProblem, PressureModel,FVPressure2P2C<TypeTag>);
SET_INT_PROP(TestDecTwoPTwoCProblem, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
// Select fluid system
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCProblem, FluidSystem, H2OAirFluidSystem<TypeTag>);
// Select fluid system
SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableComplicatedFluidSystem, true);
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index c1253b6bad70317576762c09c20826f12af43963..9e3799c56fd4033047b78bf57d82cd65df609a0a 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -45,23 +45,23 @@ namespace Properties
{
NEW_TYPE_TAG(TestMultTwoPTwoCProblem, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CSpatialParams));
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, CellData, Dumux::CellData2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCProblem, CellData, CellData2P2CMultiPhysics<TypeTag>);
// Set the grid type
SET_TYPE_PROP(TestMultTwoPTwoCProblem, Grid, Dune::YaspGrid<3>);
// Set the problem property
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, Problem, Dumux::TestMultTwoPTwoCProblem<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCProblem, Problem, TestMultTwoPTwoCProblem<TypeTag>);
// Set the model properties
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, TransportModel,Dumux::FVTransport2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCProblem, TransportModel,FVTransport2P2CMultiPhysics<TypeTag>);
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, PressureModel, Dumux::FVPressure2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCProblem, PressureModel, FVPressure2P2CMultiPhysics<TypeTag>);
SET_INT_PROP(TestMultTwoPTwoCProblem, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureNw);
// Select fluid system
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, FluidSystem, Dumux::H2OAirFluidSystem<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCProblem, FluidSystem, H2OAirFluidSystem<TypeTag>);
// Select fluid system
SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableComplicatedFluidSystem, true);
@@ -158,14 +158,14 @@ Scalar temperatureAtPos(const GlobalPosition& globalPos) const
// \}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::referencePressureAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::referencePressureAtPos()
*/
Scalar referencePressureAtPos(const GlobalPosition& globalPos) const
{
return 1e6;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryTypesAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryTypesAtPos()
*/
void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos) const
{
@@ -177,14 +177,14 @@ void boundaryTypesAtPos(BoundaryTypes &bcTypes, const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::boundaryFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::boundaryFormulation()
*/
const void boundaryFormulation(typename Indices::BoundaryFormulation &bcFormulation, const Intersection& intersection) const
{
bcFormulation = Indices::concentration;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::dirichletAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::dirichletAtPos()
*/
void dirichletAtPos(PrimaryVariables &bcValues ,const GlobalPosition& globalPos) const
{
@@ -201,7 +201,7 @@ void dirichletAtPos(PrimaryVariables &bcValues ,const GlobalPosition& globalPos)
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::neumannAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::neumannAtPos()
*/
void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalPos) const
{
@@ -209,7 +209,7 @@ void neumannAtPos(PrimaryVariables &neumannValues, const GlobalPosition& globalP
neumannValues[Indices::contiWEqIdx] = 0.;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::sourceAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::sourceAtPos()
*/
void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos) const
{
@@ -218,14 +218,14 @@ void sourceAtPos(PrimaryVariables &sourceValues, const GlobalPosition& globalPos
sourceValues[Indices::contiNEqIdx] = 0.0001;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initialFormulation()
+ * \copydoc TestDecTwoPTwoCProblem::initialFormulation()
*/
const void initialFormulation(typename Indices::BoundaryFormulation &initialFormulation, const Element& element) const
{
initialFormulation = Indices::concentration;
}
/*!
- * \copydoc Dumux::TestDecTwoPTwoCProblem::initConcentrationAtPos()
+ * \copydoc TestDecTwoPTwoCProblem::initConcentrationAtPos()
*/
Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
{
diff --git a/test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh
index 066717fdb2846fcfc2e536069b2922ccb1b23078..b87088947ccafb644b529d24ffe37f7e744bed74 100644
--- a/test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh
+++ b/test/porousmediumflow/2pdfm/implicit/2pdfmspatialparams.hh
@@ -42,7 +42,7 @@ namespace Properties
NEW_TYPE_TAG(TwoPDFMSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TwoPDFMSpatialParams, SpatialParams, Dumux::TwoPDFMSpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPDFMSpatialParams, SpatialParams, TwoPDFMSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(TwoPDFMSpatialParams, MaterialLaw)
@@ -312,7 +312,7 @@ private:
const FaceMapper faceMapper_;
const VertexMapper vertexMapper_;
- Dumux::FractureMapper<TypeTag> fractureMapper_;
+ FractureMapper<TypeTag> fractureMapper_;
};
} // end namespace
diff --git a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
index da6c4c6d9eae30662de0e9d62181495e28dc1278..8f4af3e86a09b323dba024b76e8cd46c7f506fe7 100644
--- a/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
+++ b/test/porousmediumflow/2pdfm/implicit/2pdfmtestproblem.hh
@@ -58,10 +58,10 @@ SET_TYPE_PROP(TwoPDFMTestProblem, Grid, Dune::YaspGrid<2>);
#endif
// set the GridCreator property
-SET_TYPE_PROP(TwoPDFMTestProblem, GridCreator, Dumux::ArtGridCreator<TypeTag>);
+SET_TYPE_PROP(TwoPDFMTestProblem, GridCreator, ArtGridCreator<TypeTag>);
// Set the problem property
-SET_TYPE_PROP(TwoPDFMTestProblem, Problem, Dumux::TwoPDFMTestProblem<TypeTag>);
+SET_TYPE_PROP(TwoPDFMTestProblem, Problem, TwoPDFMTestProblem<TypeTag>);
// Set the wetting phase
SET_PROP(TwoPDFMTestProblem, WettingPhase)
@@ -69,7 +69,7 @@ SET_PROP(TwoPDFMTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -78,11 +78,11 @@ SET_PROP(TwoPDFMTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
// Linear solver settings
-SET_TYPE_PROP(TwoPDFMTestProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag>);
+SET_TYPE_PROP(TwoPDFMTestProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag>);
}
diff --git a/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh b/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
index 429602769418e4ac9805efa175b7c5ca7562fc8d..76e028a07050b7d0e5b453a3d8a5c7a4759aeedd 100644
--- a/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
+++ b/test/porousmediumflow/2pminc/implicit/2pminctestproblem.hh
@@ -52,7 +52,7 @@ NEW_TYPE_TAG(TwoPMincTestBoxProblem, INHERITS_FROM(BoxTwoPMinc, TwoPMincTestProb
SET_TYPE_PROP(TwoPMincTestProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TwoPMincTestProblem, Problem, Dumux::TwoPMincTestProblem<TypeTag>);
+SET_TYPE_PROP(TwoPMincTestProblem, Problem, TwoPMincTestProblem<TypeTag>);
// Set the wetting phase
SET_PROP(TwoPMincTestProblem, WettingPhase)
@@ -60,7 +60,7 @@ SET_PROP(TwoPMincTestProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Set the non-wetting phase
@@ -69,7 +69,7 @@ SET_PROP(TwoPMincTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
};
// Set number of continua
diff --git a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
index 693ee1157e42810d41a0ea6973f28fe2fa6537e8..ed1d97a03ac94853a9fea3c272a438a9e80eda65 100644
--- a/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
+++ b/test/porousmediumflow/2pminc/implicit/2pminctestspatialparams.hh
@@ -47,7 +47,7 @@ namespace Properties
NEW_TYPE_TAG(TwoPMincSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(TwoPMincSpatialParams, SpatialParams, Dumux::TwoPMincSpatialParams<TypeTag>);
+SET_TYPE_PROP(TwoPMincSpatialParams, SpatialParams, TwoPMincSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(TwoPMincSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index d49d7075e5ced201d5e0aabb89187b9370e3b278..8b5e8d0093045125fe522ab44d62b10b54fb2744 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -47,7 +47,7 @@ NEW_TYPE_TAG(FuelCellCCProblem, INHERITS_FROM(CCModel, FuelCellProblem));
// Set the grid type
SET_TYPE_PROP(FuelCellProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(FuelCellProblem, Problem, Dumux::FuelCellProblem<TypeTag>);
+SET_TYPE_PROP(FuelCellProblem, Problem, FuelCellProblem<TypeTag>);
// Set the primary variable combination for the 2pnc model
SET_INT_PROP(FuelCellProblem, Formulation, TwoPNCFormulation::pgSl);
@@ -57,7 +57,7 @@ SET_PROP(FuelCellProblem, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
static const bool useComplexRelations = true;
public:
- typedef Dumux::FluidSystems::H2ON2O2<Scalar, useComplexRelations> type;
+ typedef FluidSystems::H2ON2O2<Scalar, useComplexRelations> type;
};
// Set the transport equation that is replaced by the total mass balance
@@ -124,8 +124,8 @@ class FuelCellProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
// Select the electrochemistry method
- typedef typename Dumux::ElectroChemistry<TypeTag, Dumux::ElectroChemistryModel::Ochs> ElectroChemistry;
- typedef Dumux::Constants<Scalar> Constant;
+ typedef Dumux::ElectroChemistry<TypeTag, ElectroChemistryModel::Ochs> ElectroChemistry;
+ typedef Constants<Scalar> Constant;
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
enum { dofCodim = isBox ? dim : 0 };
@@ -181,7 +181,7 @@ public:
Scalar temperature() const
{ return temperature_; }
- //! \copydoc Dumux::ImplicitProblem::solDependentSource()
+ //! \copydoc ImplicitProblem::solDependentSource()
void solDependentSource(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvGeometry,
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index 1a86843401d5951ba599958df688af435e45583d..e3703d2076a1d15c4a8979a7883315c20a73a2cc 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(FuelCellSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(FuelCellSpatialParams, SpatialParams, Dumux::FuelCellSpatialParams<TypeTag>);
+SET_TYPE_PROP(FuelCellSpatialParams, SpatialParams, FuelCellSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(FuelCellSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
index 29697a3b33d15f390ac8f2385faf1e6dfa908541..2c3bb297725c19db78bc2b5b3619aa9b32d44ce0 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionproblem.hh
@@ -46,17 +46,17 @@ NEW_TYPE_TAG(DissolutionCCProblem, INHERITS_FROM(CCModel, DissolutionProblem));
SET_TYPE_PROP(DissolutionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(DissolutionProblem, Problem, Dumux::DissolutionProblem<TypeTag>);
+SET_TYPE_PROP(DissolutionProblem, Problem, DissolutionProblem<TypeTag>);
// Set fluid configuration
SET_PROP(DissolutionProblem, FluidSystem)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dumux::FluidSystems::BrineAir<Scalar, Dumux::H2O<Scalar>, true/*useComplexrelations=*/> type;
+ typedef FluidSystems::BrineAir<Scalar, H2O<Scalar>, true/*useComplexrelations=*/> type;
};
// Set the spatial parameters
-SET_TYPE_PROP(DissolutionProblem, SpatialParams, Dumux::DissolutionSpatialparams<TypeTag>);
+SET_TYPE_PROP(DissolutionProblem, SpatialParams, DissolutionSpatialparams<TypeTag>);
// Enable gravity
SET_BOOL_PROP(DissolutionProblem, ProblemEnableGravity, true);
diff --git a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
index 7cba74b72103b29800ddf924c6c3a7c285ac2927..e0e993dea4aae8870f520a319b9fdcb4b0c2866c 100644
--- a/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/dissolutionspatialparams.hh
@@ -37,7 +37,7 @@ namespace Properties
NEW_TYPE_TAG(DissolutionSpatialparams);
// Set the spatial parameters
-SET_TYPE_PROP(DissolutionSpatialparams, SpatialParams, Dumux::DissolutionSpatialparams<TypeTag>);
+SET_TYPE_PROP(DissolutionSpatialparams, SpatialParams, DissolutionSpatialparams<TypeTag>);
// Set the material Law
SET_PROP(DissolutionSpatialparams, MaterialLaw)
@@ -47,7 +47,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
// define the material law parameterized by absolute saturations
- typedef Dumux::EffToAbsLaw<Dumux::RegularizedBrooksCorey<Scalar> > type;
+ typedef EffToAbsLaw<RegularizedBrooksCorey<Scalar> > type;
};
}
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index b566fbb4b90727164b296056fbb2d4442ef3d984..ae8ea1c7d5204340ae758549026da59141f83a29 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -52,18 +52,18 @@ NEW_TYPE_TAG(ThreePNIConductionCCProblem, INHERITS_FROM(CCModel, ThreePNIConduct
SET_TYPE_PROP(ThreePNIConductionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ThreePNIConductionProblem, Problem, Dumux::ThreePNIConductionProblem<TypeTag>);
+SET_TYPE_PROP(ThreePNIConductionProblem, Problem, ThreePNIConductionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(ThreePNIConductionProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Set the spatial parameters
SET_TYPE_PROP(ThreePNIConductionProblem,
SpatialParams,
- Dumux::ThreePNISpatialParams<TypeTag>);
+ ThreePNISpatialParams<TypeTag>);
}
@@ -105,7 +105,7 @@ class ThreePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel) ThermalConductivityModel;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef Dumux::H2O<Scalar> IapwsH2O;
+ typedef H2O<Scalar> IapwsH2O;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index d1204c35af6c6ce92052595b4b089424a3e0d49d..980403cbd8612fd5edccf33bb7864316b8a8da95 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -51,18 +51,18 @@ NEW_TYPE_TAG(ThreePNIConvectionCCProblem, INHERITS_FROM(CCModel, ThreePNIConvect
SET_TYPE_PROP(ThreePNIConvectionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ThreePNIConvectionProblem, Problem, Dumux::ThreePNIConvectionProblem<TypeTag>);
+SET_TYPE_PROP(ThreePNIConvectionProblem, Problem, ThreePNIConvectionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(ThreePNIConvectionProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Set the spatial parameters
SET_TYPE_PROP(ThreePNIConvectionProblem,
SpatialParams,
- Dumux::ThreePNISpatialParams<TypeTag>);
+ ThreePNISpatialParams<TypeTag>);
}
@@ -105,7 +105,7 @@ class ThreePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel) ThermalConductivityModel;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef Dumux::H2O<Scalar> IapwsH2O;
+ typedef H2O<Scalar> IapwsH2O;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index f57e4811a17bd4dea389c2ddf08c8b17c9d9fd8a..16dec769e42caedac70c4ccba56df26b0b0a7d1e 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -50,7 +50,7 @@ namespace Properties
NEW_TYPE_TAG(ThreePNISpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ThreePNISpatialParams, SpatialParams, Dumux::ThreePNISpatialParams<TypeTag>);
+SET_TYPE_PROP(ThreePNISpatialParams, SpatialParams, ThreePNISpatialParams<TypeTag>);
// Set the material Law
SET_PROP(ThreePNISpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index 4dc9f7878080c4f4d9208f7e69c811b93b8d6176..5555760247e0cb1088ca557e568bbfbeb78b997d 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -47,12 +47,12 @@ NEW_TYPE_TAG(InfiltrationThreePCCProblem, INHERITS_FROM(CCModel, InfiltrationThr
SET_TYPE_PROP(InfiltrationThreePProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(InfiltrationThreePProblem, Problem, Dumux::InfiltrationThreePProblem<TypeTag>);
+SET_TYPE_PROP(InfiltrationThreePProblem, Problem, InfiltrationThreePProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(InfiltrationThreePProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Maximum tolerated relative error in the Newton method
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index c7bc3e18a863d3b6d0f2337fa4e992a66d89b201..4f5505221162019bd4d539905480ef82ca1ca169 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -44,7 +44,7 @@ namespace Properties
NEW_TYPE_TAG(InfiltrationThreePSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(InfiltrationThreePSpatialParams, SpatialParams, Dumux::InfiltrationThreePSpatialParams<TypeTag>);
+SET_TYPE_PROP(InfiltrationThreePSpatialParams, SpatialParams, InfiltrationThreePSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(InfiltrationThreePSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index a15091f919437a17df30abe56b11ccd114983327..34dc848fa4c503bce8b6a4e2209f5b42445d7c7c 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -49,12 +49,12 @@ NEW_TYPE_TAG(ColumnCCProblem, INHERITS_FROM(CCModel, ColumnProblem));
SET_TYPE_PROP(ColumnProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ColumnProblem, Problem, Dumux::ColumnProblem<TypeTag>);
+SET_TYPE_PROP(ColumnProblem, Problem, ColumnProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(ColumnProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirXylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirXylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
}
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
index 674cd97ef66d394f2eeee156e9c79ba454d318db..cb83c878028a39ab31a0508cd816df69dc65fe6b 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolspatialparams.hh
@@ -43,7 +43,7 @@ namespace Properties
NEW_TYPE_TAG(ColumnSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ColumnSpatialParams, SpatialParams, Dumux::ColumnSpatialParams<TypeTag>);
+SET_TYPE_PROP(ColumnSpatialParams, SpatialParams, ColumnSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(ColumnSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
index 1f27b6daffe6dd967d960d277b506c18304f2868..1ed8fede28f2e7d6dc09cd5108587be7fdf95bcb 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
@@ -47,12 +47,12 @@ NEW_TYPE_TAG(InfiltrationCCProblem, INHERITS_FROM(CCModel, InfiltrationProblem))
SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(InfiltrationProblem, Problem, Dumux::InfiltrationProblem<TypeTag>);
+SET_TYPE_PROP(InfiltrationProblem, Problem, InfiltrationProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(InfiltrationProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// Maximum tolerated relative error in the Newton method
diff --git a/test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh b/test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh
index 3c7f89d3ac8cf83934777bed950875892dfc0401..6dd7a4d62f4b4813d19e0041bacd9f59e219b5b4 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltrationspatialparameters.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(InfiltrationSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(InfiltrationSpatialParams, SpatialParams, Dumux::InfiltrationSpatialParams<TypeTag>);
+SET_TYPE_PROP(InfiltrationSpatialParams, SpatialParams, InfiltrationSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(InfiltrationSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index 0a8ce317c366e4df9d308a246e3b33b3c894f3fa..6011dfe66e3d249458bff202af58ee83f2f3d29e 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -52,12 +52,12 @@ NEW_TYPE_TAG(KuevetteCCProblem, INHERITS_FROM(CCModel, KuevetteProblem));
SET_TYPE_PROP(KuevetteProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(KuevetteProblem, Problem, Dumux::KuevetteProblem<TypeTag>);
+SET_TYPE_PROP(KuevetteProblem, Problem, KuevetteProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(KuevetteProblem,
FluidSystem,
- Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+ FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
// set newton relative tolerance
SET_SCALAR_PROP(KuevetteProblem, NewtonMaxRelativeShift, 1e-6);
diff --git a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
index d3df87cd44c9388fd9748352d10102c5936159fa..8e758f4688abd9f8143e5057cb560d924baf96d4 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevettespatialparams.hh
@@ -45,7 +45,7 @@ namespace Properties
NEW_TYPE_TAG(KuevetteSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(KuevetteSpatialParams, SpatialParams, Dumux::KuevetteSpatialParams<TypeTag>);
+SET_TYPE_PROP(KuevetteSpatialParams, SpatialParams, KuevetteSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(KuevetteSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
index aa73b0431161154c28818a935b1961bc072096bf..155955e493700cec3bef0e14d4d9c7f68e481f4d 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
@@ -54,13 +54,13 @@ SET_TYPE_PROP(HeterogeneousProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(HeterogeneousProblem, Problem, Dumux::HeterogeneousProblem<TypeTag>);
+SET_TYPE_PROP(HeterogeneousProblem, Problem, HeterogeneousProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(HeterogeneousProblem, FluidSystem, Dumux::BrineCO2FluidSystem<TypeTag>);
+SET_TYPE_PROP(HeterogeneousProblem, FluidSystem, BrineCO2FluidSystem<TypeTag>);
// Set the CO2 table to be used; in this case not the the default table
-SET_TYPE_PROP(HeterogeneousProblem, CO2Table, Dumux::HeterogeneousCO2Tables::CO2Tables);
+SET_TYPE_PROP(HeterogeneousProblem, CO2Table, HeterogeneousCO2Tables::CO2Tables);
// Set the salinity mass fraction of the brine in the reservoir
SET_SCALAR_PROP(HeterogeneousProblem, ProblemSalinity, 1e-1);
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
index c561781f7faacf413f23e1d11ce8c006622d1950..0dfefd9f0b339d51b89e5dde09302a3064fbb2da 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
@@ -54,13 +54,13 @@ SET_TYPE_PROP(HeterogeneousNIProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(HeterogeneousNIProblem, Problem, Dumux::HeterogeneousNIProblem<TypeTag>);
+SET_TYPE_PROP(HeterogeneousNIProblem, Problem, HeterogeneousNIProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(HeterogeneousNIProblem, FluidSystem, Dumux::BrineCO2FluidSystem<TypeTag>);
+SET_TYPE_PROP(HeterogeneousNIProblem, FluidSystem, BrineCO2FluidSystem<TypeTag>);
// Set the CO2 table to be used; in this case not the the default table
-SET_TYPE_PROP(HeterogeneousNIProblem, CO2Table, Dumux::HeterogeneousCO2Tables::CO2Tables);
+SET_TYPE_PROP(HeterogeneousNIProblem, CO2Table, HeterogeneousCO2Tables::CO2Tables);
// Set the salinity mass fraction of the brine in the reservoir
SET_SCALAR_PROP(HeterogeneousNIProblem, ProblemSalinity, 1e-1);
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
index 88cb7c3435dddd5d22232469d4053d9485f31669..5f074bd09d47b3d0886c0fd35995743aee0f06db 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousspatialparameters.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(HeterogeneousSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(HeterogeneousSpatialParams, SpatialParams, Dumux::HeterogeneousSpatialParams<TypeTag>);
+SET_TYPE_PROP(HeterogeneousSpatialParams, SpatialParams, HeterogeneousSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(HeterogeneousSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index c102e016524265cc15c5af41364e403adade0e7f..d133fbbbb45e3ad7949556df269c38c2b6af1771 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -77,19 +77,19 @@ SET_TYPE_PROP(CombustionProblemOneComponent, LinearSolver, SuperLUBackend<TypeTa
// Set the problem property
SET_TYPE_PROP(CombustionProblemOneComponent,
Problem,
- Dumux::CombustionProblemOneComponent<TTAG(CombustionProblemOneComponent)>);
+ CombustionProblemOneComponent<TTAG(CombustionProblemOneComponent)>);
// Set fluid configuration
SET_PROP(CombustionProblemOneComponent, FluidSystem){
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*useComplexRelations=*/false> type;
+ typedef FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*useComplexRelations=*/false> type;
};
// Set the newton controller
SET_TYPE_PROP(CombustionProblemOneComponent, NewtonController,
- Dumux::VeloModelNewtonController<TypeTag>);
+ VeloModelNewtonController<TypeTag>);
//! Set the default pressure formulation: either pw first or pn first
SET_INT_PROP(CombustionProblemOneComponent,
@@ -138,7 +138,7 @@ private:
private:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+ typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
SET_BOOL_PROP(CombustionProblemOneComponent, UseMaxwellDiffusion, false);
@@ -670,7 +670,7 @@ private:
}
// obtain fugacities
- typedef Dumux::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
+ typedef ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
ParameterCache paramCache;
ComputeFromReferencePhase::solve(fluidState,
paramCache,
diff --git a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
index c8f1550302a948471d18f2bb0888612371986721..abd2b36c477ecca41dc760b4f718e92e584bfd0a 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionspatialparams.hh
@@ -52,7 +52,7 @@ NEW_PROP_TAG(NumPhases);
NEW_TYPE_TAG(CombustionSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(CombustionSpatialParams, SpatialParams, Dumux::CombustionSpatialParams<TypeTag>);
+SET_TYPE_PROP(CombustionSpatialParams, SpatialParams, CombustionSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(CombustionSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 70911d47447e6997c16ba5865e961ff9b2bcf06c..c0845121963d8f92aafb700d28e77fec76f88007 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -81,19 +81,19 @@ SET_TYPE_PROP(EvaporationAtmosphereProblem, Grid, Dune::YaspGrid<2, Dune::Tensor
// Set the problem property
SET_TYPE_PROP(EvaporationAtmosphereProblem,
Problem,
- Dumux::EvaporationAtmosphereProblem<TTAG(EvaporationAtmosphereProblem)>);
+ EvaporationAtmosphereProblem<TTAG(EvaporationAtmosphereProblem)>);
// Set fluid configuration
SET_PROP(EvaporationAtmosphereProblem, FluidSystem)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::H2ON2Kinetic<Scalar, /*useComplexRelations=*/false> type;
+public: typedef FluidSystems::H2ON2Kinetic<Scalar, /*useComplexRelations=*/false> type;
};
// Set the newton controller
SET_TYPE_PROP(EvaporationAtmosphereProblem,
NewtonController,
- Dumux::VeloModelNewtonController<TypeTag>);
+ VeloModelNewtonController<TypeTag>);
//! Set the default pressure formulation: either pw first or pn first
@@ -132,10 +132,10 @@ SET_BOOL_PROP(EvaporationAtmosphereProblem, EnableKinetic, true);
SET_PROP(EvaporationAtmosphereProblem, FluidState){
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
private: typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-// public: typedef Dumux::NonEquilibriumEnergyFluidState<TypeTag> type;
-// public: typedef Dumux::NonEquilibriumMassFluidState<TypeTag> type;
- public: typedef Dumux::NonEquilibriumFluidState<Scalar, FluidSystem> type;
-// public: typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+// public: typedef NonEquilibriumEnergyFluidState<TypeTag> type;
+// public: typedef NonEquilibriumMassFluidState<TypeTag> type;
+ public: typedef NonEquilibriumFluidState<Scalar, FluidSystem> type;
+// public: typedef CompositionalFluidState<Scalar, FluidSystem> type;
};
SET_BOOL_PROP(EvaporationAtmosphereProblem, UseMaxwellDiffusion, false);
@@ -709,7 +709,7 @@ private:
Scalar xl[numComponents];
Scalar beta[numComponents];
- const Scalar Henry = Dumux::BinaryCoeff::H2O_N2::henry(TInitial_);
+ const Scalar Henry = BinaryCoeff::H2O_N2::henry(TInitial_);
const Scalar satVapPressure = FluidSystem::H2O::vaporPressure(TInitial_);
xl[FluidSystem::H2OIdx] = x_[wPhaseIdx][wCompIdx];
xl[FluidSystem::N2Idx] = x_[wPhaseIdx][nCompIdx];
@@ -761,7 +761,7 @@ private:
Scalar pnInjection_;
Dune::ParameterTree inputParameters_;
Scalar x_[numPhases][numComponents] ;
- Dumux::GnuplotInterface<Scalar> gnuplot_;
+ GnuplotInterface<Scalar> gnuplot_;
Scalar TInject_;
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
index a411190623036bcdfe2bba41f3e28d1288666ba3..aa6028279fb0e6819209ce84ea1e916f86190ece 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmospherespatialparams.hh
@@ -58,7 +58,7 @@ namespace Properties
NEW_TYPE_TAG(EvaporationAtmosphereSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(EvaporationAtmosphereSpatialParams, SpatialParams, Dumux::EvaporationAtmosphereSpatialParams<TypeTag>);
+SET_TYPE_PROP(EvaporationAtmosphereSpatialParams, SpatialParams, EvaporationAtmosphereSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(EvaporationAtmosphereSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
index 7b964d7fdcab5c56c3a0aba97a54afb50c16e594..93f9357f6c92cc2b0c9f4fbdccc995069b9ec781 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
@@ -52,7 +52,7 @@ SET_TYPE_PROP(Forchheimer1pProblem, Grid, Dune::YaspGrid<1>);
// Set the problem property
SET_TYPE_PROP(Forchheimer1pProblem,
Problem,
- Dumux::Forchheimer1pProblem<TypeTag>);
+ Forchheimer1pProblem<TypeTag>);
// Set fluid configuration
@@ -60,7 +60,7 @@ SET_PROP(Forchheimer1pProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar>, /*useComplexRelations=*/false> type;
+ typedef FluidSystems::H2OAir<Scalar, SimpleH2O<Scalar>, /*useComplexRelations=*/false> type;
};
// Enable molecular diffusion of the components?
@@ -390,7 +390,7 @@ private:
// make the fluid state consistent with local thermodynamic
// equilibrium
- typedef Dumux::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
+ typedef ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
ParameterCache paramCache;
ComputeFromReferencePhase::solve(fs,
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
index 107a9da4915a87bdd3b861ceed9855445fe6badf..085690c480de4884f9ff9c070f7d5b0ca856ee58 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
@@ -50,7 +50,7 @@ SET_TYPE_PROP(Forchheimer2pProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(Forchheimer2pProblem,
Problem,
- Dumux::Forchheimer2pProblem<TypeTag>);
+ Forchheimer2pProblem<TypeTag>);
// Set fluid configuration
@@ -58,7 +58,7 @@ SET_PROP(Forchheimer2pProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
+ typedef FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
};
@@ -393,7 +393,7 @@ private:
// make the fluid state consistent with local thermodynamic
// equilibrium
- typedef Dumux::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
+ typedef ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
ParameterCache paramCache;
ComputeFromReferencePhase::solve(fs,
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
index 3cf31e6460b8a2930b136f79379ea128c12ea4e3..610c3abf1960dc47e644a397a9da1a432d492c1f 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimerspatialparams.hh
@@ -47,7 +47,7 @@ namespace Properties
NEW_TYPE_TAG(ForchheimerSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ForchheimerSpatialParams, SpatialParams, Dumux::ForchheimerSpatialParams<TypeTag>);
+SET_TYPE_PROP(ForchheimerSpatialParams, SpatialParams, ForchheimerSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(ForchheimerSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index 239124a4080ebb0385ed56a825c8fbf39136e4ec..85119dc7ff4c20ad38c966d65b3b54543f484c56 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -54,14 +54,14 @@ SET_TYPE_PROP(ObstacleProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(ObstacleProblem,
Problem,
- Dumux::ObstacleProblem<TypeTag>);
+ ObstacleProblem<TypeTag>);
// Set fluid configuration
SET_PROP(ObstacleProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
+ typedef FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
};
// Enable smooth upwinding?
@@ -399,7 +399,7 @@ private:
// make the fluid state consistent with local thermodynamic
// equilibrium
- typedef Dumux::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
+ typedef ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
ParameterCache paramCache;
ComputeFromReferencePhase::solve(fs,
diff --git a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
index 7a6a73656c5d4d8eeb7d416350dc58559308b80d..ed4a1931275f93dba0991a154d05e31ff1e8a4bd 100644
--- a/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstaclespatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(ObstacleSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(ObstacleSpatialParams, SpatialParams, Dumux::ObstacleSpatialParams<TypeTag>);
+SET_TYPE_PROP(ObstacleSpatialParams, SpatialParams, ObstacleSpatialParams<TypeTag>);
// Set the material Law
SET_PROP(ObstacleSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index 22a558fb9946ac28d5b814fac1910658ff075030..c6f41fa4dba144618cbd36ceb02e64ce777339b8 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -58,7 +58,7 @@ SET_TYPE_PROP(RichardsAnalyticalProblem, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
SET_PROP(RichardsAnalyticalProblem, Problem)
-{ typedef Dumux::RichardsAnalyticalProblem<TypeTag> type; };
+{ typedef RichardsAnalyticalProblem<TypeTag> type; };
// Set the wetting phase
SET_PROP(RichardsAnalyticalProblem, WettingPhase)
@@ -66,7 +66,7 @@ SET_PROP(RichardsAnalyticalProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Enable gravity
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
index cf64e27ad89c83245055809699aed8cadc8a07cf..78795be03d0967153a8b99704d30f45099718675 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(RichardsAnalyticalSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(RichardsAnalyticalSpatialParams, SpatialParams, Dumux::RichardsAnalyticalSpatialParams<TypeTag>);
+SET_TYPE_PROP(RichardsAnalyticalSpatialParams, SpatialParams, RichardsAnalyticalSpatialParams<TypeTag>);
// Set the material law
SET_PROP(RichardsAnalyticalSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
index 56f745e350df8ce744a948ed87eddd7eb0416ed2..be66fd45777b4c78d2a21ffdd2199320002b6649 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
@@ -51,7 +51,7 @@ NEW_TYPE_TAG(RichardsLensCCProblem, INHERITS_FROM(CCModel, RichardsLensProblem))
SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
-SET_TYPE_PROP(RichardsLensProblem, Problem, Dumux::RichardsLensProblem<TypeTag>);
+SET_TYPE_PROP(RichardsLensProblem, Problem, RichardsLensProblem<TypeTag>);
// Set the wetting phase
SET_PROP(RichardsLensProblem, WettingPhase)
@@ -59,7 +59,7 @@ SET_PROP(RichardsLensProblem, WettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
};
// Enable gravity
diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
index 2e4ee30be15677a6f4725ab7bbddd6666bf81d76..b518ed870f2d63c8969f749a7b27e41da70c1c03 100644
--- a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh
@@ -43,7 +43,7 @@ namespace Properties
NEW_TYPE_TAG(RichardsLensSpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(RichardsLensSpatialParams, SpatialParams, Dumux::RichardsLensSpatialParams<TypeTag>);
+SET_TYPE_PROP(RichardsLensSpatialParams, SpatialParams, RichardsLensSpatialParams<TypeTag>);
// Set the material law
SET_PROP(RichardsLensSpatialParams, MaterialLaw)
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index f756acafba2e55867b95e712b77702ec8ed85828..4d75c5aea5f786966ce0c41af3a2795d2278df6e 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -51,7 +51,7 @@ SET_TYPE_PROP(RichardsNIConductionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(RichardsNIConductionProblem, Problem,
- Dumux::RichardsNIConductionProblem<TypeTag>);
+ RichardsNIConductionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(RichardsNIConductionProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
@@ -59,7 +59,7 @@ SET_TYPE_PROP(RichardsNIConductionProblem, FluidSystem, FluidSystems::H2ON2<type
// Set the spatial parameters
SET_TYPE_PROP(RichardsNIConductionProblem,
SpatialParams,
- Dumux::RichardsNISpatialParams<TypeTag>);
+ RichardsNISpatialParams<TypeTag>);
}
/*!
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index 3ad247468d0ee15ba117b2e9b4ddc24abe8b5fba..7079debfad2decdd1bf1e67b2fc8d9064eb1294a 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -52,7 +52,7 @@ SET_TYPE_PROP(RichardsNIConvectionProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(RichardsNIConvectionProblem, Problem,
- Dumux::RichardsNIConvectionProblem<TypeTag>);
+ RichardsNIConvectionProblem<TypeTag>);
// Set the fluid system
SET_TYPE_PROP(RichardsNIConvectionProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
@@ -60,7 +60,7 @@ SET_TYPE_PROP(RichardsNIConvectionProblem, FluidSystem, FluidSystems::H2ON2<type
// Set the spatial parameters
SET_TYPE_PROP(RichardsNIConvectionProblem,
SpatialParams,
- Dumux::RichardsNISpatialParams<TypeTag>);
+ RichardsNISpatialParams<TypeTag>);
}
@@ -102,7 +102,7 @@ class RichardsNIConvectionProblem : public RichardsProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel) ThermalConductivityModel;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef Dumux::H2O<Scalar> IapwsH2O;
+ typedef H2O<Scalar> IapwsH2O;
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
index 81d0d606beab0f868f28418e2896f12eb26633bb..ee40841c2f0f84bdbf1a2b2346deca39148813ad 100644
--- a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh
@@ -50,7 +50,7 @@ namespace Properties
NEW_TYPE_TAG(RichardsNISpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(RichardsNISpatialParams, SpatialParams, Dumux::RichardsNISpatialParams<TypeTag>);
+SET_TYPE_PROP(RichardsNISpatialParams, SpatialParams, RichardsNISpatialParams<TypeTag>);
// Set the material law
SET_PROP(RichardsNISpatialParams, MaterialLaw)
diff --git a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
index c5ed85d7b74cc42ad94dba9c1c8387333a1eaeca..337cf77c2f629aa7509bef5297c8e956769f3d25 100644
--- a/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex2_tutorialproblem_implicit.hh
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(Ex2TutorialProblemImplicit, INHERITS_FROM(BoxTwoP, Ex2TutorialSpati
// Set the "Problem" property
SET_PROP(Ex2TutorialProblemImplicit, Problem) /*@\label{tutorial-implicit:set-problem}@*/
-{ typedef Dumux::Ex2TutorialProblemImplicit<TypeTag> type;};
+{ typedef Ex2TutorialProblemImplicit<TypeTag> type;};
// Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID /*@\label{tutorial-implicit:set-grid}@*/
@@ -63,17 +63,17 @@ SET_TYPE_PROP(Ex2TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
SET_PROP(Ex2TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
};
// Set the non-wetting phase
SET_PROP(Ex2TutorialProblemImplicit, NonwettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
}; /*@\label{tutorial-implicit:2p-system-end}@*/
-SET_TYPE_PROP(Ex2TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);
+SET_TYPE_PROP(Ex2TutorialProblemImplicit, FluidSystem, TwoPImmiscibleFluidSystem<TypeTag>);
// Disable gravity
SET_BOOL_PROP(Ex2TutorialProblemImplicit, ProblemEnableGravity, false); /*@\label{tutorial-implicit:gravity}@*/
}
diff --git a/tutorial/solutions_implicit/ex2_tutorialspatialparams_implicit.hh b/tutorial/solutions_implicit/ex2_tutorialspatialparams_implicit.hh
index be590e8be1c859bad70139909a5f1ac5648bd0af..45785f645b383acf9ab244ef205a44a6329107a0 100644
--- a/tutorial/solutions_implicit/ex2_tutorialspatialparams_implicit.hh
+++ b/tutorial/solutions_implicit/ex2_tutorialspatialparams_implicit.hh
@@ -45,7 +45,7 @@ NEW_TYPE_TAG(Ex2TutorialSpatialParamsImplicit);/*@\label{tutorial-implicit:defin
// Set the spatial parameters
SET_TYPE_PROP(Ex2TutorialSpatialParamsImplicit, SpatialParams,
- Dumux::Ex2TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
+ Ex2TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
// Set the material law
SET_PROP(Ex2TutorialSpatialParamsImplicit, MaterialLaw)
diff --git a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
index 97d6861634339e297b3650d7af5f288f58b690b9..98091278765b07e306c2bc6d2ff5789dad993b2a 100644
--- a/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
+++ b/tutorial/solutions_implicit/ex5_tutorialproblem_implicit.hh
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(Ex5TutorialProblemImplicit, INHERITS_FROM(BoxTwoP, Ex5TutorialSpati
// Set the "Problem" property
SET_PROP(Ex5TutorialProblemImplicit, Problem) /*@\label{tutorial-implicit:set-problem}@*/
-{ typedef Dumux::Ex5TutorialProblemImplicit<TypeTag> type;};
+{ typedef Ex5TutorialProblemImplicit<TypeTag> type;};
// Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID /*@\label{tutorial-implicit:set-grid}@*/
@@ -63,17 +63,17 @@ SET_TYPE_PROP(Ex5TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
SET_PROP(Ex5TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
};
// Set the non-wetting phase
SET_PROP(Ex5TutorialProblemImplicit, NonwettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
}; /*@\label{tutorial-implicit:2p-system-end}@*/
-SET_TYPE_PROP(Ex5TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
+SET_TYPE_PROP(Ex5TutorialProblemImplicit, FluidSystem, TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
// Disable gravity
SET_BOOL_PROP(Ex5TutorialProblemImplicit, ProblemEnableGravity, false); /*@\label{tutorial-implicit:gravity}@*/
}
diff --git a/tutorial/solutions_implicit/ex5_tutorialspatialparams_implicit.hh b/tutorial/solutions_implicit/ex5_tutorialspatialparams_implicit.hh
index 2314a736ea77c0040f474098db97373555f6266d..6478e579537d6313c9f4a1c6e478147f1bcae63e 100644
--- a/tutorial/solutions_implicit/ex5_tutorialspatialparams_implicit.hh
+++ b/tutorial/solutions_implicit/ex5_tutorialspatialparams_implicit.hh
@@ -45,7 +45,7 @@ NEW_TYPE_TAG(Ex5TutorialSpatialParamsImplicit);/*@\label{tutorial-implicit:defin
// Set the spatial parameters
SET_TYPE_PROP(Ex5TutorialSpatialParamsImplicit, SpatialParams,
- Dumux::Ex5TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
+ Ex5TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
// Set the material law
SET_PROP(Ex5TutorialSpatialParamsImplicit, MaterialLaw)
diff --git a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
index fd8e2a3714e5730b9c91995517b0fc52e8e18846..ebf5c1c76ce1f888b997bfae9a483104e741dc99 100644
--- a/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex2tutorialproblem_sequential.hh
@@ -57,7 +57,7 @@ NEW_TYPE_TAG(Ex2TutorialProblemSequential, INHERITS_FROM(FVPressureTwoP, FVTrans
// Set the problem property
SET_PROP(Ex2TutorialProblemSequential, Problem) /*@\label{tutorial-sequential:set-problem}@*/
{
- typedef Dumux::Ex2TutorialProblemSequential<TypeTag> type;
+ typedef Ex2TutorialProblemSequential<TypeTag> type;
};
// Set the grid type
@@ -69,7 +69,7 @@ SET_PROP(Ex2TutorialProblemSequential, WettingPhase) /*@\label{tutorial-sequenti
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
};
// Set the non-wetting phase
@@ -78,10 +78,10 @@ SET_PROP(Ex2TutorialProblemSequential, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
}; /*@\label{tutorial-sequential:2p-system-end}@*/
-SET_TYPE_PROP(Ex2TutorialProblemSequential, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
+SET_TYPE_PROP(Ex2TutorialProblemSequential, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
SET_SCALAR_PROP(Ex2TutorialProblemSequential, ImpetCFLFactor, 0.95); /*@\label{tutorial-sequential:cflfactor}@*/
// Disable gravity
diff --git a/tutorial/solutions_sequential/ex2tutorialspatialparams_sequential.hh b/tutorial/solutions_sequential/ex2tutorialspatialparams_sequential.hh
index 685e973d8a36591648e3a5d8040918f7d1c3d39a..2e5b9464f125bc2c0783c073160dacf7341dac9c 100644
--- a/tutorial/solutions_sequential/ex2tutorialspatialparams_sequential.hh
+++ b/tutorial/solutions_sequential/ex2tutorialspatialparams_sequential.hh
@@ -44,7 +44,7 @@ NEW_TYPE_TAG(Ex2TutorialSpatialParamsSequential);
// Set the spatial parameters
SET_TYPE_PROP(Ex2TutorialSpatialParamsSequential, SpatialParams,
- Dumux::Ex2TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
+ Ex2TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
// Set the material law
SET_PROP(Ex2TutorialSpatialParamsSequential, MaterialLaw)
diff --git a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
index 3e1aff7e0316d6fb231daf88d3b82866681cddc2..a4580d29fdc5bd3033178fb14fb6f8c45f3529bf 100644
--- a/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
+++ b/tutorial/solutions_sequential/ex5_tutorialproblem_sequential.hh
@@ -58,7 +58,7 @@ NEW_TYPE_TAG(Ex5TutorialProblemSequential, INHERITS_FROM(FVPressureTwoP, FVTrans
// Set the problem property
SET_PROP(Ex5TutorialProblemSequential, Problem) /*@\label{tutorial-sequential:set-problem}@*/
{
- typedef Dumux::Ex5TutorialProblemSequential<TypeTag> type;
+ typedef Ex5TutorialProblemSequential<TypeTag> type;
};
// Set the grid type
@@ -70,7 +70,7 @@ SET_PROP(Ex5TutorialProblemSequential, WettingPhase) /*@\label{tutorial-sequenti
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
};
// Set the non-wetting phase
@@ -79,10 +79,10 @@ SET_PROP(Ex5TutorialProblemSequential, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
}; /*@\label{tutorial-sequential:2p-system-end}@*/
-SET_TYPE_PROP(Ex5TutorialProblemSequential, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
+SET_TYPE_PROP(Ex5TutorialProblemSequential, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
SET_SCALAR_PROP(Ex5TutorialProblemSequential, ImpetCFLFactor, 0.95); /*@\label{tutorial-sequential:cflfactor}@*/
// Disable gravity
diff --git a/tutorial/solutions_sequential/ex5_tutorialspatialparams_sequential.hh b/tutorial/solutions_sequential/ex5_tutorialspatialparams_sequential.hh
index 576776af20d615f540c74758300e4f66e9fb13c9..9ba8670ac3d2ed33cd5f5f154e5a2868276ba444 100644
--- a/tutorial/solutions_sequential/ex5_tutorialspatialparams_sequential.hh
+++ b/tutorial/solutions_sequential/ex5_tutorialspatialparams_sequential.hh
@@ -44,7 +44,7 @@ NEW_TYPE_TAG(Ex5TutorialSpatialParamsSequential);
// Set the spatial parameters
SET_TYPE_PROP(Ex5TutorialSpatialParamsSequential, SpatialParams,
- Dumux::Ex5TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
+ Ex5TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
// Set the material law
SET_PROP(Ex5TutorialSpatialParamsSequential, MaterialLaw)
diff --git a/tutorial/tutorialproblem_implicit.hh b/tutorial/tutorialproblem_implicit.hh
index c2d5b13004768575139b107146ce0fb2d5086815..d39495bfab3bd6a7e1ebe413d66477ece5605dbc 100644
--- a/tutorial/tutorialproblem_implicit.hh
+++ b/tutorial/tutorialproblem_implicit.hh
@@ -48,7 +48,7 @@ NEW_TYPE_TAG(TutorialProblemImplicit, INHERITS_FROM(BoxTwoP, TutorialSpatialPara
// Set the "Problem" property
SET_PROP(TutorialProblemImplicit, Problem) /*@\label{tutorial-implicit:set-problem}@*/
-{ typedef Dumux::TutorialProblemImplicit<TypeTag> type;};
+{ typedef TutorialProblemImplicit<TypeTag> type;};
// Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID /*@\label{tutorial-implicit:set-grid}@*/
@@ -63,17 +63,17 @@ SET_TYPE_PROP(TutorialProblemImplicit, Grid, Dune::YaspGrid<2>);
SET_PROP(TutorialProblemImplicit, WettingPhase) /*@\label{tutorial-implicit:2p-system-start}@*/
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-implicit:wettingPhase}@*/
};
// Set the non-wetting phase
SET_PROP(TutorialProblemImplicit, NonwettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
+public: typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-implicit:nonwettingPhase}@*/
}; /*@\label{tutorial-implicit:2p-system-end}@*/
-SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
+SET_TYPE_PROP(TutorialProblemImplicit, FluidSystem, TwoPImmiscibleFluidSystem<TypeTag>);/*@\label{tutorial-implicit:set-fluidsystem}@*/
// Disable gravity
SET_BOOL_PROP(TutorialProblemImplicit, ProblemEnableGravity, false); /*@\label{tutorial-implicit:gravity}@*/
}
diff --git a/tutorial/tutorialproblem_sequential.hh b/tutorial/tutorialproblem_sequential.hh
index 09c6f8a6e199a2a2e0191d533f6b7e3641aa98b3..ccef75d33ead625a6591897fd6b926600dc54e60 100644
--- a/tutorial/tutorialproblem_sequential.hh
+++ b/tutorial/tutorialproblem_sequential.hh
@@ -57,7 +57,7 @@ NEW_TYPE_TAG(TutorialProblemSequential, INHERITS_FROM(FVPressureTwoP, FVTranspor
// Set the problem property
SET_PROP(TutorialProblemSequential, Problem) /*@\label{tutorial-sequential:set-problem}@*/
{
- typedef Dumux::TutorialProblemSequential<TypeTag> type;
+ typedef TutorialProblemSequential<TypeTag> type;
};
// Set the grid type
@@ -69,7 +69,7 @@ SET_PROP(TutorialProblemSequential, WettingPhase) /*@\label{tutorial-sequential:
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type; /*@\label{tutorial-sequential:wettingPhase}@*/
};
// Set the non-wetting phase
@@ -78,10 +78,10 @@ SET_PROP(TutorialProblemSequential, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
+ typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type; /*@\label{tutorial-sequential:nonwettingPhase}@*/
}; /*@\label{tutorial-sequential:2p-system-end}@*/
-SET_TYPE_PROP(TutorialProblemSequential, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
+SET_TYPE_PROP(TutorialProblemSequential, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-sequential:cflflux}@*/
SET_SCALAR_PROP(TutorialProblemSequential, ImpetCFLFactor, 0.95); /*@\label{tutorial-sequential:cflfactor}@*/
// Disable gravity
diff --git a/tutorial/tutorialspatialparams_implicit.hh b/tutorial/tutorialspatialparams_implicit.hh
index 83f4985cf399ab5f1e89eb29465776dfd196b677..18086e92aa9393e360effa587445041ceb3d46d2 100644
--- a/tutorial/tutorialspatialparams_implicit.hh
+++ b/tutorial/tutorialspatialparams_implicit.hh
@@ -45,7 +45,7 @@ NEW_TYPE_TAG(TutorialSpatialParamsImplicit);/*@\label{tutorial-implicit:define-s
// Set the spatial parameters
SET_TYPE_PROP(TutorialSpatialParamsImplicit, SpatialParams,
- Dumux::TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
+ TutorialSpatialParamsImplicit<TypeTag>); /*@\label{tutorial-implicit:set-spatialparameters}@*/
// Set the material law
SET_PROP(TutorialSpatialParamsImplicit, MaterialLaw)
diff --git a/tutorial/tutorialspatialparams_sequential.hh b/tutorial/tutorialspatialparams_sequential.hh
index 04ec71ee5dd6a21e381e6549f44978a30e26819c..fb22619772d7e85bfd4e959acc14f0b8f578c4f1 100644
--- a/tutorial/tutorialspatialparams_sequential.hh
+++ b/tutorial/tutorialspatialparams_sequential.hh
@@ -44,7 +44,7 @@ NEW_TYPE_TAG(TutorialSpatialParamsSequential);
// Set the spatial parameters
SET_TYPE_PROP(TutorialSpatialParamsSequential, SpatialParams,
- Dumux::TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
+ TutorialSpatialParamsSequential<TypeTag>); /*@\label{tutorial-sequential:set-spatialparameters}@*/
// Set the material law
SET_PROP(TutorialSpatialParamsSequential, MaterialLaw)