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

swatInitScaling(): Rename array size parameter

Browse Source 
This commit renames the 'np' parameter used to allocate small arrays
for saturations and capillary pressures to 'max_np' to better
reflect its purpose.

Suggested by: [at] atgeirr
This commit is contained in:
Bård Skaflestad 2014-08-04 19:06:12 +02:00
parent 4da2c5862d
commit e8901775cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
View File

@ -430,10 +430,10 @@ namespace Opm
swat = eps_transf_[cell].wat.smax; swat = eps_transf_[cell].wat.smax;
} else { } else {
const int wpos = phase_usage_.phase_pos[BlackoilPhases::Aqua]; const int wpos = phase_usage_.phase_pos[BlackoilPhases::Aqua];
const int np = BlackoilPhases::MaxNumPhases; const int max_np = BlackoilPhases::MaxNumPhases;
double s[np] = { 0.0 }; double s[max_np] = { 0.0 };
s[wpos] = swat; s[wpos] = swat;
double pc[np] = { 0.0 }; double pc[max_np] = { 0.0 };
funcForCell(cell).evalPc(s, pc, &(eps_transf_[cell])); funcForCell(cell).evalPc(s, pc, &(eps_transf_[cell]));
if (pc[wpos] > 1.0e-8) { if (pc[wpos] > 1.0e-8) {
eps_transf_[cell].wat.pcFactor *= pcow/pc[wpos]; eps_transf_[cell].wat.pcFactor *= pcow/pc[wpos];