From 064538e543949fcf1701b5bda00e439f4e7b9077 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Thu, 7 Mar 2013 17:43:13 +0000
Subject: [PATCH] [ implicit - testProblem ] added possible use of cc-method
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10347 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/implicit/1p/1ptestproblem.hh | 8 +++++---
test/implicit/1p2c/1p2coutflowproblem.hh | 8 +++++---
test/implicit/2p/lensproblem.hh | 3 ++-
test/implicit/2p2c/injectionproblem.hh | 4 +++-
test/implicit/2p2cni/waterairproblem.hh | 3 ++-
test/implicit/2pni/injectionproblem2pni.hh | 3 ++-
test/implicit/3p3c/infiltrationproblem.hh | 6 ++++--
test/implicit/3p3cni/kuevetteproblem.hh | 4 ++--
test/implicit/mpnc/forchheimer1pproblem.hh | 3 ++-
test/implicit/mpnc/forchheimer2pproblem.hh | 4 +++-
test/implicit/mpnc/obstacleproblem.hh | 5 ++++-
test/implicit/richards/richardslensproblem.hh | 5 ++++-
12 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/test/implicit/1p/1ptestproblem.hh b/test/implicit/1p/1ptestproblem.hh
index 46e916c4e6..8c8f60bd4e 100644
--- a/test/implicit/1p/1ptestproblem.hh
+++ b/test/implicit/1p/1ptestproblem.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief A test problem for the one-phase box model:
+ * \brief A test problem for the one-phase model:
* water is flowing from bottom to top through and around a low permeable lens.
*/
#ifndef DUMUX_1PTEST_PROBLEM_HH
@@ -107,7 +107,7 @@ SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
/*!
* \ingroup OnePBoxModel
* \ingroup ImplicitTestProblems
- * \brief Test problem for the one-phase box model:
+ * \brief Test problem for the one-phase model:
* water is flowing from bottom to top through and around a low permeable lens.
*
* The domain is box shaped. All sides are closed (Neumann 0 boundary)
@@ -118,7 +118,9 @@ SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
* compared to the surrounding material (\f$ K=10e-10\f$) is defined.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_1p -parameterFile test_1p.input</tt>
+ * <tt>./test_box1p -parameterFile test_box1p.input</tt> or
+ * <tt>./test_cc1p -parameterFile test_cc1p.input</tt>
+ *
* The same parameter file can be also used for 3d simulation but you need to change line
* <tt>typedef Dune::SGrid<2,2> type;</tt> to
* <tt>typedef Dune::SGrid<3,3> type;</tt> in the problem file
diff --git a/test/implicit/1p2c/1p2coutflowproblem.hh b/test/implicit/1p2c/1p2coutflowproblem.hh
index d9b7f740e6..3e1fd87f39 100644
--- a/test/implicit/1p2c/1p2coutflowproblem.hh
+++ b/test/implicit/1p2c/1p2coutflowproblem.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/**
* \file
- * \brief Definition of a problem, for the 1p2c box problem:
+ * \brief Definition of a problem, for the 1p2c problem:
* Component transport of nitrogen dissolved in the water phase.
*/
#ifndef DUMUX_1P2C_OUTFLOW_PROBLEM_HH
@@ -93,7 +93,7 @@ SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
* \ingroup OnePTwoCBoxModel
* \ingroup ImplicitTestProblems
*
- * \brief Definition of a problem, for the 1p2c box problem:
+ * \brief Definition of a problem, for the 1p2c problem:
* Nitrogen is dissolved in the water phase and
* is transported with the water flow from the left side to the right.
*
@@ -107,10 +107,12 @@ SET_BOOL_PROP(OnePTwoCOutflowProblem, ProblemEnableGravity, false);
* gradient of 1e5 Pa/m. The nitrogen is transported with the water flow
* and leaves the domain at the right boundary
* where an outflow boundary condition is applied.
+ *
* This problem uses the \ref OnePTwoCBoxModel model.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_1p2c -parameterFile ./test_1p2c.input</tt>
+ * <tt>./test_box1p2c -parameterFile ./test_box1p2c.input</tt> or
+ * <tt>./test_cc1p2c -parameterFile ./test_cc1p2c.input</tt>
*/
template <class TypeTag>
class OnePTwoCOutflowProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/2p/lensproblem.hh b/test/implicit/2p/lensproblem.hh
index 9f219d3bd3..b60da056fd 100644
--- a/test/implicit/2p/lensproblem.hh
+++ b/test/implicit/2p/lensproblem.hh
@@ -153,7 +153,8 @@ SET_TYPE_PROP(LensCCProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
* size is \f$t_{\text{inital}} = 250\;s\f$.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_2p -parameterFile test_2p.input</tt>
+ * <tt>./test_box2p -parameterFile test_box2p.input</tt> or
+ * <tt>./test_cc2p -parameterFile test_cc2p.input</tt>
*/
template <class TypeTag >
class LensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
diff --git a/test/implicit/2p2c/injectionproblem.hh b/test/implicit/2p2c/injectionproblem.hh
index 678a7de3eb..7edacbfea1 100644
--- a/test/implicit/2p2c/injectionproblem.hh
+++ b/test/implicit/2p2c/injectionproblem.hh
@@ -85,10 +85,12 @@ SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false);
* Air enters a water-filled aquifer, which is situated 2700m below sea level, at the right boundary
* (\f$ 5m<y<15m\f$) and migrates upwards due to buoyancy. It accumulates and
* partially enters the lower permeable aquitard.
+ *
* This problem uses the \ref TwoPTwoCModel.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_2p2c -parameterFile ./test_2p2c.input</tt>
+ * <tt>./test_box2p2c -parameterFile ./test_box2p2c.input</tt> or
+ * <tt>./test_cc2p2c -parameterFile ./test_cc2p2c.input</tt>
*/
template <class TypeTag>
class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/2p2cni/waterairproblem.hh b/test/implicit/2p2cni/waterairproblem.hh
index add059273b..bffc692720 100644
--- a/test/implicit/2p2cni/waterairproblem.hh
+++ b/test/implicit/2p2cni/waterairproblem.hh
@@ -103,7 +103,8 @@ SET_BOOL_PROP(WaterAirProblem, NewtonWriteConvergence, false);
* This problem uses the \ref TwoPTwoCNIModel model.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_2p2cni -parameterFile test_2p2cni.input</tt>
+ * <tt>./test_box2p2cni -parameterFile test_box2p2cni.input</tt> or
+ * <tt>./test_cc2p2cni -parameterFile test_cc2p2cni.input</tt>
* */
template <class TypeTag >
class WaterAirProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/2pni/injectionproblem2pni.hh b/test/implicit/2pni/injectionproblem2pni.hh
index 69f8aa8478..7d7c379d5e 100644
--- a/test/implicit/2pni/injectionproblem2pni.hh
+++ b/test/implicit/2pni/injectionproblem2pni.hh
@@ -144,7 +144,8 @@ SET_BOOL_PROP(InjectionProblem2PNI, NewtonWriteConvergence, true);
* This problem uses the \ref TwoPNIModel model.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_2pni -parameterFile test_2pni.input</tt>
+ * <tt>./test_box2pni -parameterFile test_box2pni.input</tt> or
+ * <tt>./test_cc2pni -parameterFile test_cc2pni.input</tt>
*/
template<class TypeTag>
class InjectionProblem2PNI : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index 0b80c4b246..8fb36ad880 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -96,10 +96,12 @@ SET_INT_PROP(InfiltrationProblem, ImplicitNumericDifferenceMethod, 0);
*
* This problem should typically be simulated for 30 days.
* A good choice for the initial time step size is 60 s.
- * To adjust the simulation time it is necessary to edit the file test_3p3cni.input
+ * To adjust the simulation time it is necessary to edit the file test_box3p3c.input
+ * or test_cc3p3c.input.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_3p3c -parameterFile test_3p3c.input</tt>
+ * <tt>./test_box3p3c -parameterFile test_box3p3c.input</tt> or
+ * <tt>./test_cc3p3c -parameterFile test_cc3p3c.input</tt>
* */
template <class TypeTag >
class InfiltrationProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/3p3cni/kuevetteproblem.hh b/test/implicit/3p3cni/kuevetteproblem.hh
index e2b2da6fca..a706ccb567 100644
--- a/test/implicit/3p3cni/kuevetteproblem.hh
+++ b/test/implicit/3p3cni/kuevetteproblem.hh
@@ -115,8 +115,8 @@ SET_SCALAR_PROP(KuevetteProblem, NewtonRelTolerance, 1e-6);
* To adjust the simulation time it is necessary to edit the file test_3p3cni.input
*
* To run the simulation execute:
- *
- * <tt>./test_3p3cni -parameterFile test_3p3cni.input</tt>
+ * <tt>./test_box3p3cni -parameterFile test_box3p3cni.input</tt> or
+ * <tt>./test_cc3p3cni -parameterFile test_cc3p3cni.input</tt>
* */
template <class TypeTag >
class KuevetteProblem : public ImplicitPorousMediaProblem<TypeTag>
diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/implicit/mpnc/forchheimer1pproblem.hh
index bcc998021d..9996b9093b 100644
--- a/test/implicit/mpnc/forchheimer1pproblem.hh
+++ b/test/implicit/mpnc/forchheimer1pproblem.hh
@@ -126,9 +126,10 @@ SET_BOOL_PROP(Forchheimer1pProblem, VtkAddVelocities, true);
* -> mu = 1e-03 ; cE =0.55; rho = 1000; K = 1e-12; a = mu /( cE *rho* sqrt(K) );
* -> gradP = -41e5; v = - a /2 + sqrt (a^2/4-sqrt(K)*gradP/(rho *cE))
*
+ * This problem uses the \ref MPNCModel.
*
* To run the simulation execute the following line in shell:
- * <tt>./test_forchheimer1p</tt>
+ * <tt>./test_forchheimer1p -parameterFile test_forchheimer1p.input</tt>
*/
template <class TypeTag>
class Forchheimer1pProblem
diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/implicit/mpnc/forchheimer2pproblem.hh
index 42883c19bb..c331c92d0f 100644
--- a/test/implicit/mpnc/forchheimer2pproblem.hh
+++ b/test/implicit/mpnc/forchheimer2pproblem.hh
@@ -120,8 +120,10 @@ SET_BOOL_PROP(Forchheimer2pProblem, VtkAddVelocities, true);
* This selection is chosen via the BaseFluxVariables property, which can also
* be set to the Darcy relation.
*
+ * This problem uses the \ref MPNCModel.
+ *
* To run the simulation execute the following line in shell:
- * <tt>./test_forchheimer2p</tt>
+ * <tt>./test_forchheimer2p -parameterFile test_forchheimer2p.input</tt>
*/
template <class TypeTag>
class Forchheimer2pProblem
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh
index 83a01ea940..a39a922009 100644
--- a/test/implicit/mpnc/obstacleproblem.hh
+++ b/test/implicit/mpnc/obstacleproblem.hh
@@ -121,8 +121,11 @@ SET_TYPE_PROP(ObstacleProblem, Scalar, double);
* and the right boundary which are Dirichlet conditions with the same
* values as the initial condition.
*
+ * This problem uses the \ref MPNCModel.
+ *
* To run the simulation execute the following line in shell:
- * <tt>make test_mpnc && ./test_mpnc</tt>
+ * <tt>./test_boxmpnc -parameterFile test_boxmpnc.input</tt> or
+ * <tt>./test_ccmpnc -parameterFile test_ccmpnc.input</tt>
*/
template <class TypeTag>
class ObstacleProblem
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh
index 1865286944..6dfb590edb 100644
--- a/test/implicit/richards/richardslensproblem.hh
+++ b/test/implicit/richards/richardslensproblem.hh
@@ -104,9 +104,12 @@ SET_BOOL_PROP(RichardsLensProblem, NewtonWriteConvergence, false);
* which uses the TwoPBoxModel, with the main difference being that
* the domain is initally fully saturated by gas instead of water and
* water instead of a %DNAPL infiltrates from the top.
+ *
+ * This problem uses the \ref RichardsModel
*
* To run the simulation execute the following line in shell:
- * <tt>./test_richards -parameterFile test_richards.input -TimeManager.TEnd 10000000</tt>
+ * <tt>./test_boxrichards -parameterFile test_boxrichards.input -TimeManager.TEnd 10000000</tt>
+ * <tt>./test_ccrichards -parameterFile test_ccrichards.input -TimeManager.TEnd 10000000</tt>
*
* where the initial time step is 100 seconds, and the end of the
* simulation time is 10,000,000 seconds (115.7 days)
--
GitLab