Commit 9d32e2dc authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[2pLiquidVapor][test] Clean-up

parent 94723b10
......@@ -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
{
......
......@@ -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>
......
......@@ -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";
......
......@@ -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";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment