From 37c44921cc2e3b8f5d5dcb435f1310e6efaa5ca5 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 10 Mar 2016 12:05:47 +0100
Subject: [PATCH] [fix] Use sequential indices instead of deprecated decoupled
indices
---
.../2p/sequential/diffusion/cellcentered/pressure.hh | 2 +-
dumux/porousmediumflow/2p/sequential/properties.hh | 4 ++--
test/porousmediumflow/2p/sequential/test_3d2pproblem.hh | 2 +-
test/porousmediumflow/2p/sequential/test_impesproblem.hh | 6 ++----
test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh | 2 +-
.../porousmediumflow/2p/sequential/test_transportproblem.hh | 3 +--
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
index 89c04798f3..1c22f06e23 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/pressure.hh
@@ -90,7 +90,7 @@ namespace Dumux
*
* In the IMPES models the default setting is:
*
- * - formulation: \f$ p_w-S_w \f$ (Property: \a Formulation defined as \a DecoupledTwoPCommonIndices::pwsw)
+ * - formulation: \f$ p_w-S_w \f$ (Property: \a Formulation defined as \a SequentialTwoPCommonIndices::pwsw)
*
* - compressibility: disabled (Property: \a EnableCompressibility set to \a false)
*
diff --git a/dumux/porousmediumflow/2p/sequential/properties.hh b/dumux/porousmediumflow/2p/sequential/properties.hh
index f16887684b..d553433139 100644
--- a/dumux/porousmediumflow/2p/sequential/properties.hh
+++ b/dumux/porousmediumflow/2p/sequential/properties.hh
@@ -108,12 +108,12 @@ SET_INT_PROP(SequentialTwoP, NumPhases, 2);//!< The number of phases in the 2p m
SET_INT_PROP(SequentialTwoP, NumComponents, 1); //!< Each phase consists of 1 pure component
//! Set \f$p_w\f$-\f$S_w\f$ formulation as default two-phase formulation
-SET_INT_PROP(SequentialTwoP, Formulation, DecoupledTwoPCommonIndices::pwsw);
+SET_INT_PROP(SequentialTwoP, Formulation, SequentialTwoPCommonIndices::pwsw);
//! Chose the set of indices depending on the chosen formulation
SET_PROP(SequentialTwoP, Indices)
{
-typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
+ typedef SequentialTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
};
//! Set the default pressure formulation according to the chosen two-phase formulation
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index 8b3316d62a..5c31f7c710 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -88,7 +88,7 @@ public:
};
#if PROBLEM == 1
-SET_INT_PROP(ThreeDTwoPTestProblem, Formulation, DecoupledTwoPCommonIndices::pnSw);
+SET_INT_PROP(ThreeDTwoPTestProblem, Formulation, SequentialTwoPCommonIndices::pnSw);
#endif
// Set the spatial parameters
diff --git a/test/porousmediumflow/2p/sequential/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
index 7d0b0a3451..32b6367768 100644
--- a/test/porousmediumflow/2p/sequential/test_impesproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
@@ -73,16 +73,14 @@ SET_TYPE_PROP(IMPESTestProblem, Problem, Dumux::IMPESTestProblem<TypeTag>);
////////////////////////////////////////////////////////////////////////
//Switch to a p_n-S_w formulation
//
-//SET_INT_PROP(IMPESTestProblem, Formulation,
-// DecoupledTwoPCommonIndices::pnsn);
+//SET_INT_PROP(IMPESTestProblem, Formulation, SequentialTwoPCommonIndices::pnsn);
//
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
//Switch to a p_global-S_w formulation
//
-//SET_INT_PROP(IMPESTestProblem, Formulation,
-// DecoupledTwoPCommonIndices::pGlobalSw);
+//SET_INT_PROP(IMPESTestProblem, Formulation, SequentialTwoPCommonIndices::pGlobalSw);
//
//Define the capillary pressure term in the transport equation -> only needed in case of a p_global-S_w formulation!
//SET_TYPE_PROP(IMPESTestProblem, CapillaryFlux, CapillaryDiffusion<TypeTag>);
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index dcd40978ed..fede79e600 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -108,7 +108,7 @@ public:
#endif
#if PROBLEM == 1
-SET_INT_PROP(MPFATwoPTestProblem, Formulation, DecoupledTwoPCommonIndices::pnsw);
+SET_INT_PROP(MPFATwoPTestProblem, Formulation, SequentialTwoPCommonIndices::pnsw);
#endif
#if PROBLEM == 2
diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
index b6b4bb3438..727ae91bb3 100644
--- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
@@ -73,8 +73,7 @@ public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
-SET_INT_PROP(TransportTestProblem, VelocityFormulation,
- DecoupledTwoPCommonIndices::velocityTotal);
+SET_INT_PROP(TransportTestProblem, VelocityFormulation, SequentialTwoPCommonIndices::velocityTotal);
}
/*!
--
GitLab