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

Fix parallel restart and pav in water zone

Browse Source
This commit is contained in:
Tor Harald Sandve
2018-01-16 15:44:01 +01:00
parent de3df0d81d
commit 5d5c6bad75
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ebos/ecloutputblackoilmodule.hh
View File

@@ -72,6 +72,9 @@ class EclOutputBlackOilModule
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { numPhases = FluidSystem::numPhases };
enum { oilPhaseIdx = FluidSystem::oilPhaseIdx };
@@ -943,11 +946,18 @@ private:
// Get compressed cell fipnum.
const auto& gridView = simulator_.gridManager().gridView();
unsigned numElements = gridView.size(/*codim=*/0);
fipnum_.resize(numElements);
if (fipnum_global.empty()) {
std::fill(fipnum_.begin(), fipnum_.end(), 0);
} else {
for (size_t elemIdx = 0; elemIdx < numElements; ++elemIdx) {
fipnum_.resize(numElements, 0.0);
if (!fipnum_global.empty()) {
ElementContext elemCtx(simulator_);
ElementIterator elemIt = gridView.template begin</*codim=*/0>();
const ElementIterator& elemEndIt = gridView.template end</*codim=*/0>();
for (; elemIt != elemEndIt; ++elemIt) {
const Element& elem = *elemIt;
if (elem.partitionType() != Dune::InteriorEntity)
continue; // assign no fipnum regions to ghost elements
elemCtx.updatePrimaryStencil(elem);
const unsigned elemIdx = elemCtx.globalSpaceIndex(/*spaceIdx=*/0, /*timeIdx=*/0);
fipnum_[elemIdx] = fipnum_global[simulator_.gridManager().cartesianIndex( elemIdx )];
}
}
@@ -995,10 +1005,11 @@ private:
if (FluidSystem::phaseIsActive(gasPhaseIdx))
hydrocarbon += saturation_[gasPhaseIdx][elem];
pPvSum += oilPressure_[elem] * fip_[FIPDataType::PoreVolume][elem];
Scalar pPv = oilPressure_[elem] * fip_[FIPDataType::PoreVolume][elem];
pPvSum += pPv;
pvSum += fip_[FIPDataType::PoreVolume][elem];
pPvHydrocarbonSum += pPvSum * hydrocarbon;
pvHydrocarbonSum += pvSum * hydrocarbon;
pPvHydrocarbonSum += pPv * hydrocarbon;
pvHydrocarbonSum += fip_[FIPDataType::PoreVolume][elem] * hydrocarbon;
}
}
const auto& comm = simulator_.gridView().comm();

3
ebos/eclwriter.hh
View File

@@ -145,9 +145,6 @@ public:
const ElementIterator& elemEndIt = gridView.template end</*codim=*/0>();
for (; elemIt != elemEndIt; ++elemIt) {
const Element& elem = *elemIt;
if (elem.partitionType() != Dune::InteriorEntity)
continue;
elemCtx.updatePrimaryStencil(elem);
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
eclOutputModule_.processElement(elemCtx);