OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-28 16:14:25 -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

4
examples/tutorial_decoupled.cc
View File

@ -41,8 +41,8 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TutorialProblemDecoupled) TypeTag;
typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;

14
examples/tutorialproblem_coupled.hh
View File

@ -27,7 +27,7 @@
#include <dune/grid/yaspgrid.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"
namespace Dumux
@ -109,10 +109,10 @@ class TutorialProblemCoupled : public TwoPProblem<TypeTag> /*@\label{tutorial-co
typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
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(FVElementGeometry)) FVElementGeometry;
public:
TutorialProblemCoupled(TimeManager &timeManager,
const GridView &gridView)
@ -145,7 +145,7 @@ public:
// Evaluate the boundary conditions for a dirichlet boundary
// segment. For this method, the 'values' parameter stores
// primary variables.
void dirichlet(PrimaryVarVector &values,
void dirichlet(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const Intersection &isIt,
@ -160,7 +160,7 @@ public:
// segment. For this method, the 'values' parameter stores the
// mass flux in normal direction of each phase. Negative values
// mean influx.
void neumann(PrimaryVarVector &values,
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const Intersection &isIt,
@ -184,7 +184,7 @@ public:
// Evaluate the initial value for a control volume. For this
// method, the 'values' parameter stores primary variables.
void initial(PrimaryVarVector &values,
void initial(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
@ -198,7 +198,7 @@ public:
// stores the rate mass generated or annihilate per volume
// unit. Positive values mean that mass is created, negative ones
// mean that it vanishes.
void source(PrimaryVarVector &values,
void source(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const

2
examples/tutorialproblem_decoupled.hh
View File

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

10
examples/tutorialspatialparameters_decoupled.hh
View File

@ -29,14 +29,14 @@ namespace Dumux
template<class TypeTag>
class TutorialSpatialParametersDecoupled
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename Grid::ctype CoordScalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename Grid::ctype CoordScalar;
enum
{dim=Grid::dimension, dimWorld=Grid::dimensionworld, numEq=1};
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
@ -53,7 +53,7 @@ public:
}
const FieldMatrix& intrinsicPermeability (const GlobalPosition& globalPos, const Element& element) const
const FieldMatrix& intrinsicPermeability (const GlobalPosition& globalPos, const Element& element) const
{
return K_;
}