OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PORV: fix the case where PORO contains some NaNs but the code should not choke anyway

Browse Source 
thanks to @joakim-hove for catching this.
This commit is contained in:
Andreas Lauser
2016-10-20 18:53:32 +02:00
parent 3008e45367
commit d48da54ded
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
opm/parser/eclipse/EclipseState/Eclipse3DProperties.cpp
View File

@@ -74,17 +74,16 @@ namespace Opm {
const auto& poro = doubleGridProperties->getKeyword("PORO");
const auto& ntg = doubleGridProperties->getKeyword("NTG");
if (poro.containsNaN())
throw std::logic_error("Do not have information for the PORV keyword - some defaulted values in PORO");
else {
const auto& poroData = poro.getData();
for (size_t globalIndex = 0; globalIndex < poro.getCartesianSize(); globalIndex++) {
if (!std::isfinite(values[globalIndex])) {
double cell_poro = poroData[globalIndex];
double cell_ntg = ntg.iget(globalIndex);
double cell_volume = eclipseGrid->getCellVolume(globalIndex);
values[globalIndex] = cell_poro * cell_volume * cell_ntg;
}
const auto& poroData = poro.getData();
for (size_t globalIndex = 0; globalIndex < poro.getCartesianSize(); globalIndex++) {
if (!std::isfinite(values[globalIndex])) {
double cell_poro = poroData[globalIndex];
if (std::isnan(cell_poro))
throw std::logic_error("Some cells neither specify the PORV keyword nor PORO");
double cell_ntg = ntg.iget(globalIndex);
double cell_volume = eclipseGrid->getCellVolume(globalIndex);
values[globalIndex] = cell_poro * cell_volume * cell_ntg;
}
}