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 #992 from babrodtk/fix_fip_output_units_ebos

Browse Source 
Fix for FIP output in ebos
This commit is contained in:
Atgeirr Flø Rasmussen 2016-12-22 14:56:12 +01:00 committed by GitHub
commit 7777fe6918
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -332,10 +332,13 @@ public:
// Compute current FIP. // Compute current FIP.
std::vector<std::vector<double>> COIP; std::vector<std::vector<double>> COIP;
COIP = solver->computeFluidInPlace(fipnum); COIP = solver->computeFluidInPlace(fipnum);
FIPUnitConvert(eclState().getUnits(), COIP);
std::vector<double> OOIP_totals = FIPTotals(OOIP, state); std::vector<double> OOIP_totals = FIPTotals(OOIP, state);
std::vector<double> COIP_totals = FIPTotals(COIP, state); std::vector<double> COIP_totals = FIPTotals(COIP, state);
FIPUnitConvert(eclState().getUnits(), COIP);
FIPUnitConvert(eclState().getUnits(), OOIP_totals);
FIPUnitConvert(eclState().getUnits(), COIP_totals);
if ( terminal_output_ ) if ( terminal_output_ )
{ {
outputFluidInPlace(OOIP_totals, COIP_totals,eclState().getUnits(), 0); outputFluidInPlace(OOIP_totals, COIP_totals,eclState().getUnits(), 0);
@ -598,21 +601,29 @@ protected:
void FIPUnitConvert(const UnitSystem& units, void FIPUnitConvert(const UnitSystem& units,
std::vector<std::vector<double>>& fip) std::vector<std::vector<double>>& fip)
{ {
if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_FIELD) { for (size_t i = 0; i < fip.size(); ++i) {
for (size_t i = 0; i < fip.size(); ++i) { FIPUnitConvert(units, fip[i]);
fip[i][0] = unit::convert::to(fip[i][0], unit::stb);
fip[i][1] = unit::convert::to(fip[i][1], unit::stb);
fip[i][2] = unit::convert::to(fip[i][2], 1000*unit::cubic(unit::feet));
fip[i][3] = unit::convert::to(fip[i][3], 1000*unit::cubic(unit::feet));
fip[i][4] = unit::convert::to(fip[i][4], unit::stb);
fip[i][5] = unit::convert::to(fip[i][5], unit::stb);
fip[i][6] = unit::convert::to(fip[i][6], unit::psia);
}
} }
if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_METRIC) { }
for (size_t i = 0; i < fip.size(); ++i) {
fip[i][6] = unit::convert::to(fip[i][6], unit::barsa);
} void FIPUnitConvert(const UnitSystem& units,
std::vector<double>& fip)
{
if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_FIELD) {
fip[0] = unit::convert::to(fip[0], unit::stb);
fip[1] = unit::convert::to(fip[1], unit::stb);
fip[2] = unit::convert::to(fip[2], 1000*unit::cubic(unit::feet));
fip[3] = unit::convert::to(fip[3], 1000*unit::cubic(unit::feet));
fip[4] = unit::convert::to(fip[4], unit::stb);
fip[5] = unit::convert::to(fip[5], unit::stb);
fip[6] = unit::convert::to(fip[6], unit::psia);
}
else if (units.getType() == UnitSystem::UnitType::UNIT_TYPE_METRIC) {
fip[6] = unit::convert::to(fip[6], unit::barsa);
}
else {
OPM_THROW(std::runtime_error, "Unsupported unit type for fluid in place output.");
} }
} }
@ -646,7 +657,7 @@ protected:
OPM_THROW(std::logic_error, "FIP not yet implemented for MPI"); OPM_THROW(std::logic_error, "FIP not yet implemented for MPI");
} }
} }
totals[6] = unit::convert::to( (p_pv_hydrocarbon_sum / pv_hydrocarbon_sum), unit::barsa); totals[6] = (p_pv_hydrocarbon_sum / pv_hydrocarbon_sum);
return totals; return totals;
} }