OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-12 01:11:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

consistently make the time index available

Browse Source 
- this renames historyIdx to timeIdx (I think it expresses what it is meant for better)
- rename localIdx to "spaceIdx" in the problems/spatial parameters
- add a "timeIdx" argument to the problem's methods
This commit is contained in:
Andreas Lauser 2011-11-11 20:19:03 +01:00 committed by Andreas Lauser
parent 2591f9cca0
commit 57e9f74f3a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/tutorialproblem_coupled.hh
View File

@ -151,15 +151,15 @@ public:
//! Returns the temperature within a finite volume. We use constant
//! 10 degrees Celsius.
template <class Context>
Scalar temperature(const Context &context, int localIdx) const
Scalar temperature(const Context &context, int spaceIdx, int timeIdx) const
{ return 283.15; };
//! Specifies which kind of boundary condition should be used for
//! which equation for a finite volume on the boundary.
template <class Context>
void boundaryTypes(BoundaryTypes &bcTypes, const Context &context, int localIdx) const
void boundaryTypes(BoundaryTypes &bcTypes, const Context &context, int spaceIdx, int timeIdx) const
{
const GlobalPosition &pos = context.pos(localIdx);
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
if (pos[0] < eps_) // Dirichlet conditions on left boundary
bcTypes.setAllDirichlet();
else // neuman for the remaining boundaries
@ -171,7 +171,7 @@ public:
//! on the grid boundary. Here, the 'values' parameter stores
//! primary variables.
template <class Context>
void dirichlet(PrimaryVariables &values, const Context &context, int localIdx) const
void dirichlet(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const
{
values[Indices::pwIdx] = 200.0e3; // 200 kPa = 2 bar
values[Indices::SnIdx] = 0.0; // 0 % oil saturation on left boundary
@ -181,9 +181,9 @@ public:
//! segment. Here, the 'values' parameter stores the mass flux in
//! [kg/(m^2 * s)] in normal direction of each phase. Negative
template <class Context>
void neumann(PrimaryVariables &values, const Context &context, int localIdx) const
void neumann(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const
{
const GlobalPosition &pos = context.pos(localIdx);
const GlobalPosition &pos = context.pos(spaceIdx, timeIdx);
Scalar right = this->bboxMax()[0];
// extraction of oil on the right boundary for approx. 1.e6 seconds
if (pos[0] > right - eps_) {
@ -202,7 +202,7 @@ public:
//! stores the rate mass generated or annihilated per volume unit
//! in [kg / (m^3 * s)]. Positive values mean that mass is created.
template <class Context>
void source(PrimaryVariables &values, const Context &context, int localIdx) const
void source(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const
{
values[contiWEqIdx] = 0.0;
values[contiNEqIdx]= 0.0;
@ -211,7 +211,7 @@ public:
// Evaluates the initial value for a control volume. For this
// method, the 'values' parameter stores primary variables.
template <class Context>
void initial(PrimaryVariables &values, const Context &context, int localIdx) const
void initial(PrimaryVariables &values, const Context &context, int spaceIdx, int timeIdx) const
{
values[pwIdx] = 200.0e3; // 200 kPa = 2 bar
values[SnIdx] = 1.0;

6
examples/tutorialspatialparameters_coupled.hh
View File

@ -105,7 +105,7 @@ public:
*/
template <class Context>
const Tensor &intrinsicPermeability(const Context &context, /*@\label{tutorial-coupled:permeability}@*/
int localIdx) const
int spaceIdx, int timeIdx) const
{ return K_; }
/*! Defines the porosity \f$[-]\f$ of the porous medium depending
@ -120,7 +120,7 @@ public:
*/
template <class Context>
Scalar porosity(const Context &context, /*@\label{tutorial-coupled:porosity}@*/
int localIdx) const
int spaceIdx, int timeIdx) const
{ return 0.2; }
/*! Returns the parameter object for the material law (i.e. Brooks-Corey)
@ -135,7 +135,7 @@ public:
*/
template <class Context>
const MaterialLawParams& materialLawParams(const Context &context, /*@\label{tutorial-coupled:matLawParams}@*/
int contextIdx) const
int spaceIdx, int timeIdx) const
{ return materialParams_; }
// constructor