Commit a6c1287d authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[test][porousmediumflow][3p] use new base spatial params

parent 8ed741af
Pipeline #11269 waiting for manual action with stages
......@@ -92,7 +92,6 @@ public:
InfiltrationThreePProblem(std::shared_ptr<const GridGeometry> gridGeometry)
: ParentType(gridGeometry)
{
temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
FluidSystem::init(282.15, 284.15, 3, 8e4, 3e5, 200);
name_ = getParam<std::string>("Problem.Name");
......@@ -116,18 +115,6 @@ public:
const std::string& name() const
{ return name_; }
/*!
* \brief Returns the temperature within the domain.
*
* \param globalPos The global position
*
* This problem assumes a temperature of 10 degrees Celsius.
*/
Scalar temperatureAtPos(const GlobalPosition &globalPos) const
{
return temperature_;
}
// \}
/*!
......@@ -215,16 +202,6 @@ public:
return values;
}
/*!
* \brief Returns the temperature within the domain.
*
* This problem assumes a uniform temperature of 10 degrees Celsius.
*/
Scalar temperature() const
{ return temperature_; }
private:
// internal method for the initial condition (reused for the
// dirichlet conditions!)
......@@ -286,7 +263,6 @@ private:
return(sw);
}
Scalar temperature_;
static constexpr Scalar eps_ = 1e-6;
std::string name_;
Scalar time_;
......
......@@ -27,7 +27,7 @@
#define DUMUX_INFILTRATION_THREEP_SPATIAL_PARAMS_HH
#include <dumux/porousmediumflow/properties.hh>
#include <dumux/material/spatialparams/fv.hh>
#include <dumux/porousmediumflow/fvspatialparamsmp.hh>
#include <dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/common/enumerate.hh>
......@@ -39,15 +39,15 @@ namespace Dumux {
*/
template<class GridGeometry, class Scalar>
class InfiltrationThreePSpatialParams
: public FVSpatialParams<GridGeometry, Scalar,
InfiltrationThreePSpatialParams<GridGeometry, Scalar>>
: public FVPorousMediumSpatialParamsMP<GridGeometry, Scalar,
InfiltrationThreePSpatialParams<GridGeometry, Scalar>>
{
using GridView = typename GridGeometry::GridView;
using FVElementGeometry = typename GridGeometry::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using Element = typename GridView::template Codim<0>::Entity;
using ParentType = FVSpatialParams<GridGeometry, Scalar,
InfiltrationThreePSpatialParams<GridGeometry, Scalar>>;
using ParentType = FVPorousMediumSpatialParamsMP<GridGeometry, Scalar,
InfiltrationThreePSpatialParams<GridGeometry, Scalar>>;
using GlobalPosition = typename SubControlVolume::GlobalPosition;
......@@ -152,6 +152,16 @@ public:
return makeFluidMatrixInteraction(pcKrSwCurve_);
}
/*!
* \brief Returns the temperature at a given location
*
* \param globalPos The global coordinates for the given location
*/
Scalar temperatureAtPos(const GlobalPosition &globalPos) const
{
return 273.15 + 10.0; // -> 10 degrees Celsius
}
private:
bool isFineMaterial_(const GlobalPosition &globalPos) const
{
......
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