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

change names according to the meeting on monday

Browse Source
This commit is contained in:
Andreas Lauser 2010-08-05 12:11:43 +00:00 committed by Andreas Lauser
parent 5aae649eae
commit 3d2292da0f
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/tutorialproblem_coupled.hh
View File

@ -27,7 +27,7 @@
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfs.hh> #include <dune/grid/io/file/dgfparser/dgfs.hh>
// assign parameters dependent on space (e.g. soil properties) // assign parameters dependent on space (e.g. spatial parameters)
#include "tutorialspatialparameters_coupled.hh" #include "tutorialspatialparameters_coupled.hh"
namespace Dumux namespace Dumux
@ -109,7 +109,7 @@ class TutorialProblemCoupled : public TwoPProblem<TypeTag> /*@\label{tutorial-co
typedef Dune::FieldVector<CoordScalar, dim> LocalPosition; typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition; typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVarVector)) PrimaryVarVector; typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes; typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry; typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
@ -145,7 +145,7 @@ public:
// Evaluate the boundary conditions for a dirichlet boundary // Evaluate the boundary conditions for a dirichlet boundary
// segment. For this method, the 'values' parameter stores // segment. For this method, the 'values' parameter stores
// primary variables. // primary variables.
void dirichlet(PrimaryVarVector &values, void dirichlet(PrimaryVariables &values,
const Element &element, const Element &element,
const FVElementGeometry &fvElemGeom, const FVElementGeometry &fvElemGeom,
const Intersection &isIt, const Intersection &isIt,
@ -160,7 +160,7 @@ public:
// segment. For this method, the 'values' parameter stores the // segment. For this method, the 'values' parameter stores the
// mass flux in normal direction of each phase. Negative values // mass flux in normal direction of each phase. Negative values
// mean influx. // mean influx.
void neumann(PrimaryVarVector &values, void neumann(PrimaryVariables &values,
const Element &element, const Element &element,
const FVElementGeometry &fvElemGeom, const FVElementGeometry &fvElemGeom,
const Intersection &isIt, const Intersection &isIt,
@ -184,7 +184,7 @@ public:
// Evaluate the initial value for a control volume. For this // Evaluate the initial value for a control volume. For this
// method, the 'values' parameter stores primary variables. // method, the 'values' parameter stores primary variables.
void initial(PrimaryVarVector &values, void initial(PrimaryVariables &values,
const Element &element, const Element &element,
const FVElementGeometry &fvElemGeom, const FVElementGeometry &fvElemGeom,
int scvIdx) const int scvIdx) const
@ -198,7 +198,7 @@ public:
// stores the rate mass generated or annihilate per volume // stores the rate mass generated or annihilate per volume
// unit. Positive values mean that mass is created, negative ones // unit. Positive values mean that mass is created, negative ones
// mean that it vanishes. // mean that it vanishes.
void source(PrimaryVarVector &values, void source(PrimaryVariables &values,
const Element &element, const Element &element,
const FVElementGeometry &fvElemGeom, const FVElementGeometry &fvElemGeom,
int scvIdx) const int scvIdx) const

2
examples/tutorialproblem_decoupled.hh
View File

@ -99,7 +99,7 @@ public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type;
}; };
// Set the soil properties // Set the spatial parameters
SET_PROP(TutorialProblemDecoupled, SpatialParameters) SET_PROP(TutorialProblemDecoupled, SpatialParameters)
{ {
private: private: