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

Corrects the whitespace again for blackoilmodelebos.hpp

Browse Source
This commit is contained in:
kel85uk 2018-05-29 14:16:19 +02:00
parent b7fbe66c91
commit 963d42aab3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -426,13 +426,13 @@ namespace Opm {
if (elem.partitionType() != Dune::InteriorEntity) if (elem.partitionType() != Dune::InteriorEntity)
continue; continue;
unsigned globalElemIdx = elemMapper.index(elem); unsigned globalElemIdx = elemMapper.index(elem);
const auto& priVarsNew = ebosSimulator_.model().solution(/*timeIdx=*/0)[globalElemIdx]; const auto& priVarsNew = ebosSimulator_.model().solution(/*timeIdx=*/0)[globalElemIdx];
Scalar pressureNew; Scalar pressureNew;
pressureNew = priVarsNew[Indices::pressureSwitchIdx]; pressureNew = priVarsNew[Indices::pressureSwitchIdx];
Scalar saturationsNew[FluidSystem::numPhases] = { 0.0 }; Scalar saturationsNew[FluidSystem::numPhases] = { 0.0 };
Scalar oilSaturationNew = 1.0; Scalar oilSaturationNew = 1.0;
if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) { if (FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)) {
saturationsNew[FluidSystem::waterPhaseIdx] = priVarsNew[Indices::waterSaturationIdx]; saturationsNew[FluidSystem::waterPhaseIdx] = priVarsNew[Indices::waterSaturationIdx];
@ -475,7 +475,7 @@ namespace Opm {
for (unsigned phaseIdx = 0; phaseIdx < FluidSystem::numPhases; ++ phaseIdx) { for (unsigned phaseIdx = 0; phaseIdx < FluidSystem::numPhases; ++ phaseIdx) {
Scalar tmp = saturationsNew[phaseIdx] - saturationsOld[phaseIdx]; Scalar tmp = saturationsNew[phaseIdx] - saturationsOld[phaseIdx];
resultDelta += tmp*tmp; resultDelta += tmp*tmp;
resultDenom += saturationsNew[phaseIdx]*saturationsNew[phaseIdx]; resultDenom += saturationsNew[phaseIdx]*saturationsNew[phaseIdx];
} }
} }
@ -483,9 +483,9 @@ namespace Opm {
resultDelta = gridView.comm().sum(resultDelta); resultDelta = gridView.comm().sum(resultDelta);
resultDenom = gridView.comm().sum(resultDenom); resultDenom = gridView.comm().sum(resultDenom);
if (resultDenom > 0.0) if (resultDenom > 0.0)
return resultDelta/resultDenom; return resultDelta/resultDenom;
return 0.0; return 0.0;
} }