OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

clean up the richards model and follow the recent renames of opm-material

Browse Source
This commit is contained in:
Andreas Lauser 2014-05-08 16:52:24 +02:00
parent 69e6fb60a2
commit 18ee64fe2f
6 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/groundwater_immiscible.cpp
View File

@ -29,7 +29,7 @@
namespace Opm { namespace Opm {
namespace Properties { namespace Properties {
NEW_TYPE_TAG(GroundWaterProblem, INHERITS_FROM(ImmiscibleOnePhaseModel, GroundWaterBaseProblem)); NEW_TYPE_TAG(GroundWaterProblem, INHERITS_FROM(ImmiscibleSinglePhaseModel, GroundWaterBaseProblem));
}} }}
int main(int argc, char **argv) int main(int argc, char **argv)

2
examples/problems/fingerproblem.hh
View File

@ -32,7 +32,7 @@
#include <opm/material/fluidmatrixinteractions/ParkerLenhard.hpp> #include <opm/material/fluidmatrixinteractions/ParkerLenhard.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp> #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp> #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Air.hpp> #include <opm/material/components/Air.hpp>

2
examples/problems/fractureproblem.hh
View File

@ -34,7 +34,7 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp> #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/heatconduction/Somerton.hpp> #include <opm/material/heatconduction/Somerton.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/components/SimpleH2O.hpp> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Dnapl.hpp> #include <opm/material/components/Dnapl.hpp>
#include <ewoms/io/artgridmanager.hh> #include <ewoms/io/artgridmanager.hh>

2
examples/problems/lensproblem.hh
View File

@ -33,7 +33,7 @@
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp> #include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp> #include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp> #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp> #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Dnapl.hpp> #include <opm/material/components/Dnapl.hpp>

2
examples/problems/powerinjectionproblem.hh
View File

@ -29,7 +29,7 @@
#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp> #include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
#include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp> #include <opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp>
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp> #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp> #include <opm/material/fluidsystems/TwoPhaseImmiscibleFluidSystem.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp> #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/components/SimpleH2O.hpp> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Air.hpp> #include <opm/material/components/Air.hpp>

29
examples/problems/richardslensproblem.hh
View File

@ -55,7 +55,7 @@ SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
SET_TYPE_PROP(RichardsLensProblem, Problem, Ewoms::RichardsLensProblem<TypeTag>); SET_TYPE_PROP(RichardsLensProblem, Problem, Ewoms::RichardsLensProblem<TypeTag>);
// Set the wetting phase // Set the wetting phase
SET_PROP(RichardsLensProblem, WettingPhase) SET_PROP(RichardsLensProblem, WettingFluid)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@ -154,7 +154,7 @@ class RichardsLensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
enum { enum {
// copy some indices for convenience // copy some indices for convenience
pressureWIdx = Indices::pressureWIdx, pressureWIdx = Indices::pressureWIdx,
contiWEqIdx = Indices::contiWEqIdx, contiEqIdx = Indices::contiEqIdx,
wettingPhaseIdx = FluidSystem::wettingPhaseIdx, wettingPhaseIdx = FluidSystem::wettingPhaseIdx,
nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx, nonWettingPhaseIdx = FluidSystem::nonWettingPhaseIdx,
numPhases = FluidSystem::numPhases, numPhases = FluidSystem::numPhases,
@ -233,7 +233,8 @@ public:
* \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability * \copydoc FvBaseMultiPhaseProblem::intrinsicPermeability
*/ */
template <class Context> template <class Context>
const DimMatrix &intrinsicPermeability(const Context &context, int spaceIdx, const DimMatrix &intrinsicPermeability(const Context &context,
int spaceIdx,
int timeIdx) const int timeIdx) const
{ {
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx); const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
@ -254,7 +255,8 @@ public:
*/ */
template <class Context> template <class Context>
const MaterialLawParams &materialLawParams(const Context &context, const MaterialLawParams &materialLawParams(const Context &context,
int spaceIdx, int timeIdx) const int spaceIdx,
int timeIdx) const
{ {
const auto &pos = context.pos(spaceIdx, timeIdx); const auto &pos = context.pos(spaceIdx, timeIdx);
if (isInLens_(pos)) if (isInLens_(pos))
@ -268,7 +270,8 @@ public:
* \copydetails Doxygen::contextParams * \copydetails Doxygen::contextParams
*/ */
template <class Context> template <class Context>
Scalar referencePressure(const Context &context, int spaceIdx, Scalar referencePressure(const Context &context,
int spaceIdx,
int timeIdx) const int timeIdx) const
{ return pnRef_; } { return pnRef_; }
@ -283,8 +286,10 @@ public:
* \copydoc VcfvProblem::boundary * \copydoc VcfvProblem::boundary
*/ */
template <class Context> template <class Context>
void boundary(BoundaryRateVector &values, const Context &context, void boundary(BoundaryRateVector &values,
int spaceIdx, int timeIdx) const const Context &context,
int spaceIdx,
int timeIdx) const
{ {
const auto &pos = context.pos(spaceIdx, timeIdx); const auto &pos = context.pos(spaceIdx, timeIdx);
@ -308,7 +313,7 @@ public:
RateVector massRate(0.0); RateVector massRate(0.0);
// inflow of water // inflow of water
massRate[contiWEqIdx] = -0.04; // kg / (m * s) massRate[contiEqIdx] = -0.04; // kg / (m * s)
values.setMassRate(massRate); values.setMassRate(massRate);
} }
@ -327,7 +332,9 @@ public:
* \copydoc VcfvProblem::initial * \copydoc VcfvProblem::initial
*/ */
template <class Context> template <class Context>
void initial(PrimaryVariables &values, const Context &context, int spaceIdx, void initial(PrimaryVariables &values,
const Context &context,
int spaceIdx,
int timeIdx) const int timeIdx) const
{ {
const auto &materialParams const auto &materialParams
@ -350,7 +357,9 @@ public:
* everywhere. * everywhere.
*/ */
template <class Context> template <class Context>
void source(RateVector &rate, const Context &context, int spaceIdx, void source(RateVector &rate,
const Context &context,
int spaceIdx,
int timeIdx) const int timeIdx) const
{ rate = Scalar(0.0); } { rate = Scalar(0.0); }