OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-24 10:10:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

extend/correct a few comments, remove artifacts of renamed concepts

Browse Source 
(phaseState -> fluidState, material context -> material parameters, etc)
This commit is contained in:
Andreas Lauser 2010-12-09 18:55:48 +00:00 committed by Andreas Lauser
parent 230042640c
commit 6972419eb5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/tutorialspatialparameters_coupled.hh
View File

@ -56,11 +56,11 @@ class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@
typedef typename Grid::Traits::template Codim<0>::Entity Element; typedef typename Grid::Traits::template Codim<0>::Entity Element;
// select material law to be used // select material law to be used
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/ typedef RegularizedBrooksCorey<Scalar> EffectiveMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/
public: public:
// adapter for absolute law // adapter for absolute law
typedef EffToAbsLaw<RawMaterialLaw> MaterialLaw; /*@\label{tutorial-coupled:eff2abs}@*/ typedef EffToAbsLaw<EffectiveMaterialLaw> MaterialLaw; /*@\label{tutorial-coupled:eff2abs}@*/
// determine appropriate parameters depening on selected materialLaw // determine appropriate parameters depening on selected materialLaw
typedef typename MaterialLaw::Params MaterialLawParams; /*@\label{tutorial-coupled:matLawObjectType}@*/ typedef typename MaterialLaw::Params MaterialLawParams; /*@\label{tutorial-coupled:matLawObjectType}@*/
@ -83,10 +83,11 @@ public:
return 0.2; return 0.2;
} }
// return the materialLaw context (i.e. BC, regularizedVG, etc) depending on the position // return the parameter object for the material law (i.e. Brooks-Corey)
// which may vary with the spatial position
const MaterialLawParams& materialLawParams(const Element &element, /*@\label{tutorial-coupled:matLawParams}@*/ const MaterialLawParams& materialLawParams(const Element &element, /*@\label{tutorial-coupled:matLawParams}@*/
const FVElementGeometry &fvElemGeom, const FVElementGeometry &fvElemGeom,
int scvIdx) const int scvIdx) const
{ {
return materialParams_; return materialParams_;
} }

9
examples/tutorialspatialparameters_decoupled.hh
View File

@ -47,10 +47,10 @@ class TutorialSpatialParametersDecoupled
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix; typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
// material law typedefs // material law typedefs
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; typedef RegularizedBrooksCorey<Scalar> EffectiveMaterialLaw;
// typedef LinearMaterial<Scalar> RawMaterialLaw; // typedef LinearMaterial<Scalar> EffectiveMaterialLaw;
public: public:
typedef EffToAbsLaw<RawMaterialLaw> MaterialLaw; typedef EffToAbsLaw<EffectiveMaterialLaw> MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams; typedef typename MaterialLaw::Params MaterialLawParams;
//! Update the spatial parameters with the flow solution after a timestep. //! Update the spatial parameters with the flow solution after a timestep.
@ -73,7 +73,8 @@ public:
return 0.2; return 0.2;
} }
//! return the material law context (i.e. BC, regularizedVG, etc) depending on the position //! return the parameter object for the material law (i.e. Brooks-Corey)
//! which may vary with the spatial position
const MaterialLawParams& materialLawParams(const GlobalPosition& globalPos, const Element &element) const const MaterialLawParams& materialLawParams(const GlobalPosition& globalPos, const Element &element) const
{ {
return materialLawParams_; return materialLawParams_;