Commit 53ace3de authored by Timo Koch's avatar Timo Koch
Browse files

This implements the task of the last dumux day for the implicit tests...

This implements the task of the last dumux day for the implicit tests (common/decoupled/freeflow/geomechanics see earlier commit):
In test folder:
1. change SET_TYPE_PROP instead of SET_PROP where possible
2. Remove commented code where not needed
3. Remove unnecessary includes
4. Change the neumann/dirichlet,... functions to the corresponding atPos functions where globalPos is needed

The task for the multidomain folder will follow by thomas

Reviewed by bernd
 


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14046 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 69cf5b85
......@@ -25,9 +25,6 @@
#define DUMUX_1P2CNI_OUTFLOW_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
namespace Dumux
{
......@@ -52,7 +49,6 @@ class OnePNISpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
//typedef LinearMaterial<Scalar> EffMaterialLaw;
public:
OnePNISpatialParams(const GridView &gridView)
: ParentType(gridView)
......
......@@ -65,20 +65,15 @@ public:
};
// Set the grid type
SET_PROP(OnePTestProblem, Grid)
{
typedef Dune::YaspGrid<2> type;
//typedef Dune::UGGrid<2> type;
//typedef Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming> type;
};
SET_TYPE_PROP(OnePTestProblem, Grid, Dune::YaspGrid<2>);
//SET_TYPE_PROP(OnePTestProblem, Grid, Dune::UGGrid<2>);
//SET_TYPE_PROP(OnePTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
// Set the problem property
SET_PROP(OnePTestProblem, Problem)
{ typedef Dumux::OnePTestProblem<TypeTag> type; };
SET_TYPE_PROP(OnePTestProblem, Problem, Dumux::OnePTestProblem<TypeTag> );
// Set the spatial parameters
SET_PROP(OnePTestProblem, SpatialParams)
{ typedef Dumux::OnePTestSpatialParams<TypeTag> type; };
SET_TYPE_PROP(OnePTestProblem, SpatialParams, Dumux::OnePTestSpatialParams<TypeTag> );
// Linear solver settings
SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
......
......@@ -25,7 +25,6 @@
#ifndef DUMUX_1P2CNI_CONDUCTION_PROBLEM_HH
#define DUMUX_1P2CNI_CONDUCTION_PROBLEM_HH
#include <math.h>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/implicit/1p2c/1p2cmodel.hh>
......
......@@ -26,7 +26,6 @@
#ifndef DUMUX_1P2CNI_CONVECTION_PROBLEM_HH
#define DUMUX_1P2CNI_CONVECTION_PROBLEM_HH
#include <math.h>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/implicit/1p2c/1p2cmodel.hh>
......
......@@ -25,9 +25,6 @@
#define DUMUX_1P2CNI_OUTFLOW_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
namespace Dumux
{
......@@ -52,7 +49,6 @@ class OnePTwoCNISpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
//typedef LinearMaterial<Scalar> EffMaterialLaw;
public:
OnePTwoCNISpatialParams(const GridView &gridView)
: ParentType(gridView)
......
......@@ -24,7 +24,6 @@
#ifndef DUMUX_1P2C_OUTFLOW_PROBLEM_HH
#define DUMUX_1P2C_OUTFLOW_PROBLEM_HH
//#include <dune/grid/alugrid/2d/alugrid.hh>
#if HAVE_UG
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#endif
......
......@@ -26,9 +26,6 @@
#define DUMUX_1P2C_OUTFLOW_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
namespace Dumux
{
......@@ -54,7 +51,6 @@ class OnePTwoCOutflowSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
//typedef LinearMaterial<Scalar> EffMaterialLaw;
public:
OnePTwoCOutflowSpatialParams(const GridView &gridView)
: ParentType(gridView)
......
......@@ -38,8 +38,6 @@
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/implicit/cellcentered/ccpropertydefaults.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include "lensspatialparams.hh"
namespace Dumux
......@@ -67,8 +65,6 @@ SET_TYPE_PROP(LensProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(LensProblem, Problem, Dumux::LensProblem<TypeTag>);
// TODO: remove this macro switch
#if 1
// Set the wetting phase
SET_PROP(LensProblem, WettingPhase)
{
......@@ -86,10 +82,6 @@ private:
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
};
#else
// OR: set the fluid system
SET_TYPE_PROP(LensProblem, FluidSystem, H2ON2FluidSystem<TypeTag>);
#endif
// Enable partial reassembly of the jacobian matrix?
SET_BOOL_PROP(LensProblem, ImplicitEnablePartialReassemble, true);
......
......@@ -127,13 +127,6 @@ public:
outerMaterialParams_.setVgAlpha(0.0037);
outerMaterialParams_.setVgn(4.7);
// parameters for the linear law
// minimum and maximum pressures
// lensMaterialParams_.setEntryPc(0);
// outerMaterialParams_.setEntryPc(0);
// lensMaterialParams_.setMaxPc(0);
// outerMaterialParams_.setMaxPc(0);
lensK_ = 9.05e-12;
outerK_ = 4.6e-10;
}
......
......@@ -184,7 +184,6 @@ public:
eps_ = 1e-6;
// initialize the tables of the fluid system
//FluidSystem::init();
FluidSystem::init(/*Tmin=*/temperatureLow_,
/*Tmax=*/temperatureHigh_,
/*nT=*/nTemperature_,
......
......@@ -28,7 +28,6 @@
#define DUMUX_INJECTION_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
......
......@@ -25,7 +25,6 @@
#ifndef DUMUX_WATER_AIR_PROBLEM_HH
#define DUMUX_WATER_AIR_PROBLEM_HH
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
......
......@@ -25,7 +25,6 @@
#define DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicitspatialparams.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
......
......@@ -35,7 +35,6 @@
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
#include <dumux/io/artgridcreator.hh>
#include "2pdfmspatialparams.hh"
......
......@@ -329,7 +329,6 @@ public:
values[pressureIdx] = -darcyVelocity_*elemVolVars[scvIdx].density(swIdx);
values[temperatureIdx] = -darcyVelocity_*elemVolVars[scvIdx].density(swIdx)
*IapwsH2O::liquidEnthalpy(temperatureHigh_, elemVolVars[scvIdx].pressure(swIdx));
// std::cout<<"values[temperatureIdx]: "<<values[temperatureIdx]<<std::endl;
}
}
......
......@@ -70,7 +70,6 @@ class ThreePNISpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
//typedef LinearMaterial<Scalar> EffMaterialLaw;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
......@@ -87,7 +86,6 @@ public:
// residual saturations
materialParams_.setSwr(0.12);
materialParams_.setSwrx(0.12);
materialParams_.setSnr(0.10);
......@@ -129,7 +127,7 @@ public:
const FVElementGeometry &fvGeometry,
const int scvIdx) const
{
return permeability_;
return permeability_;
}
/*!
......@@ -143,7 +141,7 @@ public:
const FVElementGeometry &fvGeometry,
const int scvIdx) const
{
return porosity_;
return porosity_;
}
/*!
......@@ -157,7 +155,7 @@ public:
const FVElementGeometry &fvGeometry,
const int scvIdx) const
{
return materialParams_;
return materialParams_;
}
......
......@@ -25,7 +25,6 @@
#ifndef DUMUX_COLUMNXYLOLPROBLEM_HH
#define DUMUX_COLUMNXYLOLPROBLEM_HH
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
......
......@@ -25,7 +25,6 @@
#ifndef DUMUX_INFILTRATIONPROBLEM_HH
#define DUMUX_INFILTRATIONPROBLEM_HH
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
......@@ -267,10 +266,6 @@ public:
values[switch1Idx] = 1.-sgr;
values[switch2Idx] = 1.e-6;
}
//initial_(values, globalPos, element);
//const MaterialLawParams& materialParams = this->spatialParams().materialLawParams();
//MaterialLaw::pcgw(materialParams, 1.0);
}
/*!
......@@ -306,7 +301,7 @@ public:
if ((globalPos[0] <= 75.+eps_) && (globalPos[0] >= 50.+eps_) && (globalPos[1] >= 10.-eps_))
{
values[contiWEqIdx] = -0.0;
values[contiNEqIdx] = -0.001, // /*Molfluss, umr. über M(Mesit.)=0,120 kg/mol --> 1.2e-4 kg/(sm)
values[contiNEqIdx] = -0.001, //mole flow, convertion to mass flow with molar mass M(Mesit.)=0,120 kg/mol --> 1.2e-4 kg/(sm)
values[contiAEqIdx] = -0.0;
}
}
......@@ -343,7 +338,6 @@ public:
int &vIdxGlobal,
const GlobalPosition &globalPos) const
{
// return threePhases;
return wgPhaseOnly;
}
......@@ -380,8 +374,7 @@ public:
}
private:
// internal method for the initial condition (reused for the
// dirichlet conditions!)
// internal method for the initial condition
void initial_(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
......
......@@ -168,11 +168,6 @@ public:
const FVElementGeometry &fvGeometry,
int scvIdx) const
{
//const GlobalPosition &globalPos = fvGeometry.subContVol[scvIdx].global;
// if (isFineMaterial_(globalPos))
// return finePorosity_;
// else
// return coarsePorosity_;
return Porosity_;
}
......@@ -188,11 +183,6 @@ public:
const FVElementGeometry &fvGeometry,
int scvIdx) const
{
//const GlobalPosition &globalPos = fvGeometry.subContVol[scvIdx].global;
//if (isFineMaterial_(globalPos))
//return fineMaterialParams_;
//else
//return coarseMaterialParams_;
return MaterialParams_;
}
......
......@@ -26,7 +26,6 @@
#ifndef DUMUX_KUEVETTE3P3CNIPROBLEM_HH
#define DUMUX_KUEVETTE3P3CNIPROBLEM_HH
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
......@@ -66,9 +65,6 @@ SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true);
// Use central differences (backward -1, forward +1)
SET_INT_PROP(KuevetteProblem, ImplicitNumericDifferenceMethod, 0);
// Write newton convergence
//SET_BOOL_PROP(KuevetteProblem, NewtonWriteConvergence, true);
// Set the maximum time step
SET_SCALAR_PROP(KuevetteProblem, TimeManagerMaxTimeStepSize, 60.);
......
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