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

BlackoilModel: rename ebosModel to model

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-06 10:11:57 +01:00
parent aaaf230724
commit dc798d0a24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/simulators/flow/BlackoilModel.hpp
View File

@ -785,7 +785,7 @@ namespace Opm {
OPM_TIMEBLOCK(localConvergenceData); OPM_TIMEBLOCK(localConvergenceData);
double pvSumLocal = 0.0; double pvSumLocal = 0.0;
double numAquiferPvSumLocal = 0.0; double numAquiferPvSumLocal = 0.0;
const auto& ebosModel = simulator_.model(); const auto& model = simulator_.model();
const auto& ebosProblem = simulator_.problem(); const auto& ebosProblem = simulator_.problem();
const auto& residual = simulator_.model().linearizer().residual(); const auto& residual = simulator_.model().linearizer().residual();
@ -803,7 +803,7 @@ namespace Opm {
const auto& fs = intQuants.fluidState(); const auto& fs = intQuants.fluidState();
const auto pvValue = ebosProblem.referencePorosity(cell_idx, /*timeIdx=*/0) * const auto pvValue = ebosProblem.referencePorosity(cell_idx, /*timeIdx=*/0) *
ebosModel.dofTotalVolume(cell_idx); model.dofTotalVolume(cell_idx);
pvSumLocal += pvValue; pvSumLocal += pvValue;
if (isNumericalAquiferCell(elem)) if (isNumericalAquiferCell(elem))
@ -834,7 +834,7 @@ namespace Opm {
{ {
OPM_TIMEBLOCK(computeCnvErrorPv); OPM_TIMEBLOCK(computeCnvErrorPv);
double errorPV{}; double errorPV{};
const auto& ebosModel = simulator_.model(); const auto& model = simulator_.model();
const auto& ebosProblem = simulator_.problem(); const auto& ebosProblem = simulator_.problem();
const auto& residual = simulator_.model().linearizer().residual(); const auto& residual = simulator_.model().linearizer().residual();
const auto& gridView = simulator().gridView(); const auto& gridView = simulator().gridView();
@ -852,7 +852,7 @@ namespace Opm {
elemCtx.updatePrimaryStencil(elem); elemCtx.updatePrimaryStencil(elem);
// elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0); // elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
const unsigned cell_idx = elemCtx.globalSpaceIndex(/*spaceIdx=*/0, /*timeIdx=*/0); const unsigned cell_idx = elemCtx.globalSpaceIndex(/*spaceIdx=*/0, /*timeIdx=*/0);
const double pvValue = ebosProblem.referencePorosity(cell_idx, /*timeIdx=*/0) * ebosModel.dofTotalVolume( cell_idx ); const double pvValue = ebosProblem.referencePorosity(cell_idx, /*timeIdx=*/0) * model.dofTotalVolume(cell_idx);
const auto& cellResidual = residual[cell_idx]; const auto& cellResidual = residual[cell_idx];
bool cnvViolated = false; bool cnvViolated = false;