From 9d32e2dc82a758c4dbe6246b6fa80bb124e41cbf Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Wed, 31 Aug 2016 14:52:41 +0200
Subject: [PATCH] [2pLiquidVapor][test] Clean-up
---
.../implicit/steaminjectionproblem.hh | 22 ++++---------------
.../implicit/steaminjectionspatialparams.hh | 6 ++---
.../implicit/test_boxsteaminjection.cc | 10 +++------
.../implicit/test_ccsteaminjection.cc | 10 +++------
4 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
index 4b9fd58c99..8ca19c9cc6 100644
--- a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Non-isothermal steam injection problem for the validation of the 2p1cni model against the data provided by Ochs, 2006.
+ * \brief Non-isothermal steam injection test problem for the 2p1cni model.
*
*/
#ifndef DUMUX_STEAM_INJECTIONPROBLEM_HH
@@ -64,26 +64,20 @@ public:
// Enable gravity
SET_BOOL_PROP(InjectionProblem, ProblemEnableGravity, true);
-// Use forward differences instead of central differences
-SET_INT_PROP(InjectionProblem, ImplicitNumericDifferenceMethod, +1);
-
-// Write newton convergence
-SET_BOOL_PROP(InjectionProblem, NewtonWriteConvergence, false);
-
//Define whether spurious cold-water flow into the steam is blocked
SET_BOOL_PROP(InjectionProblem, UseBlockingOfSpuriousFlow, true);
}
-
+//TODO: Names
/*!
* \ingroup ThreePTwoCNIBoxModel
* \ingroup ImplicitTestProblems
- * \brief Non-isothermal problem where ...
+ * \brief Non-isothermal 2D problem where steam is injected on the lower left side of the domain.
*
* This problem uses the \ref ThreePTwoCNIModel.
*
* */
-template <class TypeTag >
+template <class TypeTag>
class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -104,7 +98,6 @@ class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
wPhaseIdx = Indices::wPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
-
// Phase State
wPhaseOnly = Indices::wPhaseOnly,
gPhaseOnly = Indices::gPhaseOnly,
@@ -115,21 +108,17 @@ class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
-
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
- typedef Dune::FieldVector<Scalar,dim> Vector;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
-
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
@@ -155,8 +144,6 @@ public:
FluidSystem::init();
}
-
-
/*!
* \name Problem parameters
*/
@@ -226,7 +213,6 @@ public:
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
-
void neumannAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
index 2feaeda202..02f7028b6c 100644
--- a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
+++ b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
@@ -19,11 +19,11 @@
/*!
* \file
*
- * \brief Definition of the spatial parameters for various steam injection problems
+ * \brief Definition of the spatial parameters for the steam injection problem
*/
-#ifndef DUMUX_INJECTION_SPATIAL_PARAMS_HH
-#define DUMUX_INJECTION_SPATIAL_PARAMS_HH
+#ifndef DUMUX_STEAMINJECTION_SPATIAL_PARAMS_HH
+#define DUMUX_STEAMINJECTION_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc b/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
index 82d1719810..bd83890846 100644
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Validation of the 2p1cni model
+ * \brief Test for the 2p1cni box model
*/
#include "config.h"
#include "steaminjectionproblem.hh"
@@ -43,12 +43,8 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
"\t-TimeManager.TEnd End of the simulation [s] \n"
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-Grid.UpperRight coordinates of the upper right corner of the grid [m] \n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc b/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
index 1a077bc986..1273bd90ed 100644
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Validation of the 2p1cni model
+ * \brief Test for the 2p1cni cell-centered model
*/
#include "config.h"
#include "steaminjectionproblem.hh"
@@ -43,12 +43,8 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
"\t-TimeManager.TEnd End of the simulation [s] \n"
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-Grid.UpperRight coordinates of the upper right corner of the grid [m] \n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
--
GitLab