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

Merge pull request #1120 from jokva/density-from-eclipsestate

Browse Source 
Use Density from EclipseState
This commit is contained in:
Atgeirr Flø Rasmussen 2017-01-09 10:38:30 +01:00 committed by GitHub
commit e5bb786df2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/props/IncompPropertiesSinglePhase.cpp
View File

@ -38,9 +38,9 @@ namespace Opm
{ {
rock_.init(eclState, grid.number_of_cells, grid.global_cell, grid.cartdims); rock_.init(eclState, grid.number_of_cells, grid.global_cell, grid.cartdims);
if (deck.hasKeyword("DENSITY")) { const auto& densities = eclState.getTableManager().getDensityTable();
const auto& densityRecord = deck.getKeyword("DENSITY").getRecord(0); if( !densities.empty() ) {
surface_density_ = densityRecord.getItem("OIL").getSIDouble(0); surface_density_ = densities[0].oil;
} else { } else {
surface_density_ = 1000.0; surface_density_ = 1000.0;
OPM_MESSAGE("Input is missing DENSITY -- using a standard density of " OPM_MESSAGE("Input is missing DENSITY -- using a standard density of "

8
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
View File

@ -47,10 +47,10 @@ namespace Opm
} }
// Surface densities. Accounting for different orders in eclipse and our code. // Surface densities. Accounting for different orders in eclipse and our code.
if (deck.hasKeyword("DENSITY")) { const auto& densities = es.getTableManager().getDensityTable();
const auto& densityRecord = deck.getKeyword("DENSITY").getRecord(region_number); if (!densities.empty()) {
surface_density_[phase_usage.phase_pos[PhaseUsage::Aqua]] = densityRecord.getItem("OIL").getSIDouble(0); surface_density_[phase_usage.phase_pos[PhaseUsage::Aqua]] = densities[region_number].water;
surface_density_[phase_usage.phase_pos[PhaseUsage::Liquid]] = densityRecord.getItem("WATER").getSIDouble(0); surface_density_[phase_usage.phase_pos[PhaseUsage::Liquid]] = densities[region_number].oil;
} else { } else {
OPM_THROW(std::runtime_error, "Input is missing DENSITY\n"); OPM_THROW(std::runtime_error, "Input is missing DENSITY\n");
} }