OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix various hiccups in the non-test problems after the recebt switches

Browse Source 
the switches are the introduction of "smart primary variables", rate
vectors, and changing the capillary pressure API for the multi-phase
models to the one previously used by the MpNc model.
This commit is contained in:
Andreas Lauser 2011-11-17 18:00:07 +01:00 committed by Andreas Lauser
parent f4f7190c72
commit 9131de9074
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/tutorialproblem_coupled.hh
View File

@ -111,6 +111,7 @@ class TutorialProblemCoupled : public TwoPProblem<TypeTag> /*@\label{tutorial-co
// Dumux specific types // Dumux specific types
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager; typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables; typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes; typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem; typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices; typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
@ -181,7 +182,7 @@ public:
//! segment. Here, the 'values' parameter stores the mass flux in //! segment. Here, the 'values' parameter stores the mass flux in
//! [kg/(m^2 * s)] in normal direction of each phase. Negative //! [kg/(m^2 * s)] in normal direction of each phase. Negative
template <class Context> template <class Context>
void neumann(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const void neumann(RateVector &values, const Context &context, int spaceIdx, int timeIdx) const
{ {
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx); const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
Scalar right = this->bboxMax()[0]; Scalar right = this->bboxMax()[0];
@ -202,7 +203,7 @@ public:
//! stores the rate mass generated or annihilated per volume unit //! stores the rate mass generated or annihilated per volume unit
//! in [kg / (m^3 * s)]. Positive values mean that mass is created. //! in [kg / (m^3 * s)]. Positive values mean that mass is created.
template <class Context> template <class Context>
void source(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const void source(RateVector &values, const Context &context, int spaceIdx, int timeIdx) const
{ {
values[contiWEqIdx] = 0.0; values[contiWEqIdx] = 0.0;
values[contiNEqIdx]= 0.0; values[contiNEqIdx]= 0.0;