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

implement the remaining Dumux naming conventions for the non-decoupled models

Browse Source 
Tensor -> DimMatrix
refElem -> refElement
gv -> gridView
remove "AtIP" suffix
*Index -> *Idx for variables
remove ${MODEL_NAME}Index property
consistent argument names for compute(Storage|Flux|Source) in the local residuals

also remove the "MassUpwindWeight" and "UpwindWeight" properties as
they were not really useful.
This commit is contained in:
Andreas Lauser 2012-05-14 13:04:14 +02:00 committed by Andreas Lauser
parent 12cffbb074
commit 88636f077b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/tutorialproblem_coupled.hh
View File

@ -129,7 +129,7 @@ class TutorialProblemCoupled
typedef typename GridView::ctype CoordScalar; typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition; typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor; typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
// Dumux specific types // Dumux specific types
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager; typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@ -137,7 +137,7 @@ class TutorialProblemCoupled
typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector; typedef typename GET_PROP_TYPE(TypeTag, RateVector) RateVector;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector; typedef typename GET_PROP_TYPE(TypeTag, BoundaryRateVector) BoundaryRateVector;
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, Indices) Indices;
// get material law from property system // get material law from property system
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
@ -164,7 +164,7 @@ public:
{ {
// set main diagonal entries of the permeability tensor to a value // set main diagonal entries of the permeability tensor to a value
// setting to a single value means: isotropic, homogeneous // setting to a single value means: isotropic, homogeneous
K_ = this->toTensor_(1e-7); K_ = this->toDimMatrix_(1e-7);
//set residual saturations //set residual saturations
materialParams_.setSwr(0.0); /*@\label{tutorial-coupled:setLawParams}@*/ materialParams_.setSwr(0.0); /*@\label{tutorial-coupled:setLawParams}@*/
@ -208,7 +208,7 @@ public:
* is the vector including the global coordinates of the finite volume. * is the vector including the global coordinates of the finite volume.
*/ */
template <class Context> template <class Context>
const Tensor &intrinsicPermeability(const Context &context, /*@\label{tutorial-coupled:permeability}@*/ const DimMatrix &intrinsicPermeability(const Context &context, /*@\label{tutorial-coupled:permeability}@*/
int spaceIdx, int timeIdx) const int spaceIdx, int timeIdx) const
{ return K_; } { return K_; }
@ -298,7 +298,7 @@ public:
} }
private: private:
Tensor K_; DimMatrix K_;
// Object that holds the values/parameters of the selected material law. // Object that holds the values/parameters of the selected material law.
MaterialLawParams materialParams_; /*@\label{tutorial-coupled:matParamsObject}@*/ MaterialLawParams materialParams_; /*@\label{tutorial-coupled:matParamsObject}@*/