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

Merge pull request #1003 from babrodtk/two_phase_bugfixes

Browse Source 
Two phase bugfixes
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-28 15:42:59 +02:00
commit 1fbc689f6c
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@ -322,8 +322,8 @@ namespace Opm
this->compute_R_(n, p, T, z, cells, &R_[0]);
}
const auto& pu = phaseUsage();
bool oil_and_gas = pu.phase_pos[BlackoilPhases::Liquid] &&
pu.phase_pos[BlackoilPhases::Vapour];
bool oil_and_gas = pu.phase_used[BlackoilPhases::Liquid] &&
pu.phase_used[BlackoilPhases::Vapour];
const int o = pu.phase_pos[BlackoilPhases::Liquid];
const int g = pu.phase_pos[BlackoilPhases::Vapour];

10
opm/core/props/phaseUsageFromDeck.hpp
View File

@ -88,8 +88,14 @@ namespace Opm
}
pu.num_phases = 0;
for (int i = 0; i < BlackoilPhases::MaxNumPhases; ++i) {
pu.phase_pos[i] = pu.num_phases;
pu.num_phases += pu.phase_used[i];
if (pu.phase_used[i]) {
pu.phase_pos[i] = pu.num_phases;
pu.num_phases += 1;
}
else {
//Set to ridiculous value on purpose: should never be used
pu.phase_pos[i] = 2000000000;
}
}
// Only 2 or 3 phase systems handled.

15
opm/core/simulator/initState_impl.hpp
View File

@ -741,7 +741,7 @@ namespace Opm
}
/// Initialize surface volume from pressure and saturation by z = As.
/// Here saturation is used as an intial guess for z in the
/// Here saturation is used as an initial guess for z in the
/// computation of A.
template <class Props, class State>
void initBlackoilSurfvol(const UnstructuredGrid& grid,
@ -800,10 +800,6 @@ namespace Opm
const Props& props,
State& state)
{
if (props.numPhases() != 3) {
OPM_THROW(std::runtime_error, "initBlackoilSurfvol() is only supported in three-phase simulations.");
}
const std::vector<double>& rs = state.gasoilratio();
const std::vector<double>& rv = state.rv();
@ -828,15 +824,6 @@ namespace Opm
std::vector<double> capPressures(number_of_cells*np);
props.capPress(number_of_cells,&state.saturation()[0],&allcells[0],&capPressures[0],NULL);
std::vector<double> Pw(number_of_cells);
std::vector<double> Pg(number_of_cells);
for (int c = 0; c < number_of_cells; ++c){
Pw[c] = state.pressure()[c] + capPressures[c*np + BlackoilPhases::Aqua];
Pg[c] = state.pressure()[c] + capPressures[c*np + BlackoilPhases::Vapour];
}
double z_tmp;
// Water phase