From 18ee64fe2f249c211e32fb1f800cfab297bfa73c Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 8 May 2014 16:52:24 +0200 Subject: [PATCH] clean up the richards model and follow the recent renames of opm-material --- examples/groundwater_immiscible.cpp | 2 +- examples/problems/fingerproblem.hh | 2 +- examples/problems/fractureproblem.hh | 2 +- examples/problems/lensproblem.hh | 2 +- examples/problems/powerinjectionproblem.hh | 2 +- examples/problems/richardslensproblem.hh | 29 ++++++++++++++-------- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/examples/groundwater_immiscible.cpp b/examples/groundwater_immiscible.cpp index 5c16525af..2dbe08a9d 100644 --- a/examples/groundwater_immiscible.cpp +++ b/examples/groundwater_immiscible.cpp @@ -29,7 +29,7 @@ namespace Opm { namespace Properties { -NEW_TYPE_TAG(GroundWaterProblem, INHERITS_FROM(ImmiscibleOnePhaseModel, GroundWaterBaseProblem)); +NEW_TYPE_TAG(GroundWaterProblem, INHERITS_FROM(ImmiscibleSinglePhaseModel, GroundWaterBaseProblem)); }} int main(int argc, char **argv) diff --git a/examples/problems/fingerproblem.hh b/examples/problems/fingerproblem.hh index 104a05cdb..7186b922c 100644 --- a/examples/problems/fingerproblem.hh +++ b/examples/problems/fingerproblem.hh @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/examples/problems/fractureproblem.hh b/examples/problems/fractureproblem.hh index 07697ff60..c5bfc4d51 100644 --- a/examples/problems/fractureproblem.hh +++ b/examples/problems/fractureproblem.hh @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/examples/problems/lensproblem.hh b/examples/problems/lensproblem.hh index 36cdcfc2c..a5a05df61 100644 --- a/examples/problems/lensproblem.hh +++ b/examples/problems/lensproblem.hh @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/examples/problems/powerinjectionproblem.hh b/examples/problems/powerinjectionproblem.hh index 7f9bdaf39..72402be88 100644 --- a/examples/problems/powerinjectionproblem.hh +++ b/examples/problems/powerinjectionproblem.hh @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/examples/problems/richardslensproblem.hh b/examples/problems/richardslensproblem.hh index 8882e80f5..b0228f6a2 100644 --- a/examples/problems/richardslensproblem.hh +++ b/examples/problems/richardslensproblem.hh @@ -55,7 +55,7 @@ SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>); SET_TYPE_PROP(RichardsLensProblem, Problem, Ewoms::RichardsLensProblem); // Set the wetting phase -SET_PROP(RichardsLensProblem, WettingPhase) +SET_PROP(RichardsLensProblem, WettingFluid) { private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; @@ -154,7 +154,7 @@ class RichardsLensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem) enum { // copy some indices for convenience pressureWIdx = Indices::pressureWIdx, - contiWEqIdx = Indices::contiWEqIdx, + contiEqIdx = Indices::contiEqIdx, wettingPhaseIdx = FluidSystem::wettingPhaseIdx, nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx, numPhases = FluidSystem::numPhases, @@ -233,7 +233,8 @@ public: * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability */ template - const DimMatrix &intrinsicPermeability(const Context &context, int spaceIdx, + const DimMatrix &intrinsicPermeability(const Context &context, + int spaceIdx, int timeIdx) const { const GlobalPosition &pos = context.pos(spaceIdx, timeIdx); @@ -254,7 +255,8 @@ public: */ template const MaterialLawParams &materialLawParams(const Context &context, - int spaceIdx, int timeIdx) const + int spaceIdx, + int timeIdx) const { const auto &pos = context.pos(spaceIdx, timeIdx); if (isInLens_(pos)) @@ -268,7 +270,8 @@ public: * \copydetails Doxygen::contextParams */ template - Scalar referencePressure(const Context &context, int spaceIdx, + Scalar referencePressure(const Context &context, + int spaceIdx, int timeIdx) const { return pnRef_; } @@ -283,8 +286,10 @@ public: * \copydoc VcfvProblem::boundary */ template - void boundary(BoundaryRateVector &values, const Context &context, - int spaceIdx, int timeIdx) const + void boundary(BoundaryRateVector &values, + const Context &context, + int spaceIdx, + int timeIdx) const { const auto &pos = context.pos(spaceIdx, timeIdx); @@ -308,7 +313,7 @@ public: RateVector massRate(0.0); // inflow of water - massRate[contiWEqIdx] = -0.04; // kg / (m * s) + massRate[contiEqIdx] = -0.04; // kg / (m * s) values.setMassRate(massRate); } @@ -327,7 +332,9 @@ public: * \copydoc VcfvProblem::initial */ template - void initial(PrimaryVariables &values, const Context &context, int spaceIdx, + void initial(PrimaryVariables &values, + const Context &context, + int spaceIdx, int timeIdx) const { const auto &materialParams @@ -350,7 +357,9 @@ public: * everywhere. */ template - void source(RateVector &rate, const Context &context, int spaceIdx, + void source(RateVector &rate, + const Context &context, + int spaceIdx, int timeIdx) const { rate = Scalar(0.0); }