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

rename the "grid manager" to "vanguard"

Browse Source 
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
This commit is contained in:
Andreas Lauser
2018-02-01 16:26:58 +01:00
parent 61461dd61c
commit 436c9f8791
13 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ebos/eclthresholdpressure.hh
View File

@@ -101,8 +101,8 @@ public:
// sorry!
assert(simulator_.model().numGridDof() == numElements);
const auto& gridManager = simulator_.gridManager();
const auto& eclState = gridManager.eclState();
const auto& vanguard = simulator_.vanguard();
const auto& eclState = vanguard.eclState();
const auto& simConfig = eclState.getSimulationConfig();
enableThresholdPressure_ = simConfig.hasThresholdPressure();
@@ -125,7 +125,7 @@ public:
eclState.get3DProperties().getIntGridProperty("EQLNUM").getData();
elemEquilRegion_.resize(numElements, 0);
for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) {
int cartElemIdx = gridManager.cartesianIndex(elemIdx);
int cartElemIdx = vanguard.cartesianIndex(elemIdx);
// ECL uses Fortran-style indices but we want C-style ones!
elemEquilRegion_[elemIdx] = equilRegionData[cartElemIdx] - 1;
@@ -161,8 +161,8 @@ private:
// compute the defaults of the threshold pressures using the initial condition
void computeDefaultThresholdPressures_()
{
const auto& gridManager = simulator_.gridManager();
const auto& gridView = gridManager.gridView();
const auto& vanguard = simulator_.vanguard();
const auto& gridView = vanguard.gridView();
typedef Opm::MathToolbox<Evaluation> Toolbox;
// loop over the whole grid and compute the maximum gravity adjusted pressure
@@ -233,10 +233,10 @@ private:
// THPRES keyword.
void applyExplicitThresholdPressures_()
{
const auto& gridManager = simulator_.gridManager();
const auto& gridView = gridManager.gridView();
const auto& vanguard = simulator_.vanguard();
const auto& gridView = vanguard.gridView();
const auto& elementMapper = simulator_.model().elementMapper();
const auto& eclState = simulator_.gridManager().eclState();
const auto& eclState = simulator_.vanguard().eclState();
const Opm::SimulationConfig& simConfig = eclState.getSimulationConfig();
const auto& thpres = simConfig.getThresholdPressure();