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

Rename parameter init_sat -> init_saturation (docs already used this name).

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-05-03 13:48:59 +02:00
parent 2cf04140a1
commit e78c7c6072
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opm/core/utility/initState_impl.hpp
View File

@@ -214,16 +214,16 @@ namespace Opm
// Initialise pressure to hydrostatic state.
const double ref_p = param.getDefault("ref_pressure", 100)*unit::barsa;
initHydrostaticPressure(grid, props.density(), woc, gravity, woc, ref_p, state);
} else if (param.has("init_sat")) {
// Initialise water saturation to init_sat parameter.
const double init_sat = param.get<double>("init_sat");
} else if (param.has("init_saturation")) {
// Initialise water saturation to init_saturation parameter.
const double init_saturation = param.get<double>("init_saturation");
for (int cell = 0; cell < num_cells; ++cell) {
state.saturation()[2*cell] = init_sat;
state.saturation()[2*cell + 1] = 1.0 - init_sat;
state.saturation()[2*cell] = init_saturation;
state.saturation()[2*cell + 1] = 1.0 - init_saturation;
}
// Initialise pressure to hydrostatic state.
const double ref_p = param.getDefault("ref_pressure", 100)*unit::barsa;
const double rho = props.density()[0]*init_sat + props.density()[1]*(1.0 - init_sat);
const double rho = props.density()[0]*init_saturation + props.density()[1]*(1.0 - init_saturation);
const double dens[2] = { rho, rho };
const double ref_z = grid.cell_centroids[0 + grid.dimensions - 1];
initHydrostaticPressure(grid, dens, ref_z, gravity, ref_z, ref_p, state);