Commit 8d74cef8 by Bernd Flemisch

### [test][porousmediumflow][3p3c] use new base spatial params

parent e85a188e
 ... @@ -105,9 +105,8 @@ public: ... @@ -105,9 +105,8 @@ public: InfiltrationThreePThreeCProblem(std::shared_ptr gridGeometry) InfiltrationThreePThreeCProblem(std::shared_ptr gridGeometry) : ParentType(gridGeometry) : ParentType(gridGeometry) { { temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius FluidSystem::init(/*tempMin=*/282.15, FluidSystem::init(/*tempMin=*/temperature_ - 1, /*tempMax=*/284.15, /*tempMax=*/temperature_ + 1, /*nTemp=*/3, /*nTemp=*/3, /*pressMin=*/0.8*1e5, /*pressMin=*/0.8*1e5, /*pressMax=*/3*1e5, /*pressMax=*/3*1e5, ... @@ -124,18 +123,6 @@ public: ... @@ -124,18 +123,6 @@ public: const std::string& name() const const std::string& name() const { return name_; } { 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_; } // \} // \} /*! /*! ... @@ -273,7 +260,6 @@ private: ... @@ -273,7 +260,6 @@ private: return(sw); return(sw); } } Scalar temperature_; static constexpr Scalar eps_ = 1e-6; static constexpr Scalar eps_ = 1e-6; std::string name_; std::string name_; }; }; ... ...
 ... @@ -27,7 +27,7 @@ ... @@ -27,7 +27,7 @@ #define DUMUX_INFILTRATION_THREEPTHREEC_SPATIAL_PARAMETERS_HH #define DUMUX_INFILTRATION_THREEPTHREEC_SPATIAL_PARAMETERS_HH #include #include #include #include #include #include namespace Dumux { namespace Dumux { ... @@ -38,15 +38,15 @@ namespace Dumux { ... @@ -38,15 +38,15 @@ namespace Dumux { */ */ template template class InfiltrationThreePThreeCSpatialParams class InfiltrationThreePThreeCSpatialParams : public FVSpatialParams> InfiltrationThreePThreeCSpatialParams> { { using GridView = typename GridGeometry::GridView; using GridView = typename GridGeometry::GridView; using FVElementGeometry = typename GridGeometry::LocalView; using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity; using ParentType = FVSpatialParams>; InfiltrationThreePThreeCSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; using GlobalPosition = typename SubControlVolume::GlobalPosition; ... @@ -107,6 +107,16 @@ public: ... @@ -107,6 +107,16 @@ public: return makeFluidMatrixInteraction(pcKrSwCurve_); 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: private: bool isFineMaterial_(const GlobalPosition &globalPos) const bool isFineMaterial_(const GlobalPosition &globalPos) const { return { return ... ...
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!