diff --git a/test/porousmediumflow/2p1c/implicit/params_box.input b/test/porousmediumflow/2p1c/implicit/params_box.input index 0cfbd646e155627593a35caa21ca70046b0cd079..c93fdeeb0c96d7ffe08e9dd3f5757eef6ce4a19c 100644 --- a/test/porousmediumflow/2p1c/implicit/params_box.input +++ b/test/porousmediumflow/2p1c/implicit/params_box.input @@ -13,3 +13,9 @@ Name = test_boxsteaminjection # name passed to the output routines SolidDensity = 2650 SolidThermalConductivity = 2.8 SolidHeatCapacity = 850.0 + +[SpatialParams] +Swr = 0.1 +Snr = 0 +VanGenuchtenAlpha = 0.0028 +VanGenuchtenN = 2.0 diff --git a/test/porousmediumflow/2p1c/implicit/params_tpfa.input b/test/porousmediumflow/2p1c/implicit/params_tpfa.input index 8d5fbbc7da10136513f7a2bb5a4f0e30f15ef827..9b18fbb3c48a2fd1802071e1eea1e9e8c0a8e751 100644 --- a/test/porousmediumflow/2p1c/implicit/params_tpfa.input +++ b/test/porousmediumflow/2p1c/implicit/params_tpfa.input @@ -13,3 +13,9 @@ Name = test_ccsteaminjection # name passed to the output routines SolidDensity = 2650 SolidThermalConductivity = 2.8 SolidHeatCapacity = 850.0 + +[SpatialParams] +Swr = 0.1 +Snr = 0 +VanGenuchtenAlpha = 0.0028 +VanGenuchtenN = 2.0 diff --git a/test/porousmediumflow/2p1c/implicit/spatialparams.hh b/test/porousmediumflow/2p1c/implicit/spatialparams.hh index b298ab78a125aa8f96c0aa55a1611abfd46ef559..6046c2e3fafd177e7aab31e14ba364d334fdf165 100644 --- a/test/porousmediumflow/2p1c/implicit/spatialparams.hh +++ b/test/porousmediumflow/2p1c/implicit/spatialparams.hh @@ -27,8 +27,7 @@ #include <dumux/porousmediumflow/properties.hh> #include <dumux/material/spatialparams/fv.hh> -#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh> -#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh> +#include <dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh> namespace Dumux { /*! @@ -53,23 +52,16 @@ class InjectionProblemSpatialParams using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>; - using EffectiveLaw = RegularizedVanGenuchten<Scalar>; + using PcKrSwCurve = FluidMatrix::VanGenuchtenDefault<Scalar>; public: - using MaterialLaw = EffToAbsLaw<EffectiveLaw>; - using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = DimWorldMatrix; InjectionProblemSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry) + , pcKrSwCurve_("SpatialParams") { gasWetting_ = getParam<bool>("SpatialParams.GasWetting", false); - - // set Van Genuchten Parameters - materialParams_.setSwr(0.1); - materialParams_.setSnr(0.0); - materialParams_.setVgAlpha(0.0028); - materialParams_.setVgn(2.0); } /*! @@ -104,9 +96,9 @@ public: * * \param globalPos The global position */ - const MaterialLawParams& materialLawParamsAtPos(const GlobalPosition& globalPos) const + auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const { - return materialParams_; + return makeFluidMatrixInteraction(pcKrSwCurve_); } /*! @@ -126,7 +118,7 @@ public: private: bool gasWetting_; - MaterialLawParams materialParams_; + const PcKrSwCurve pcKrSwCurve_; }; }