OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed linsolver_tolerance to 1e-12, added check on swir/swor

Browse Source
This commit is contained in:
Kari B. Skjerve
2012-01-24 13:07:04 +01:00
parent 1361539489
commit 2f31cfa8d0
4 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/upscale_relperm.cpp
View File

@@ -845,10 +845,20 @@ int main(int varnum, char** vararg)
cout << "LF Volume: " << volume << endl;
cout << "Upscaled porosity: " << poreVolume/volume << endl;
cout << "Upscaled Swir: " << Swir << endl;
cout << "Upscaled Swor: " << Swor << endl;
cout << "Upscaled Swmax: " << Swor << endl; //Swor=1-Swmax
cout << "Saturation points to be computed: " << points << endl;
}
// Sometimes, if Swmax=1 or Swir=0 in the input tables, the upscaled
// values can be a little bit larger (within machine precision) and
// the check below fails. Hence, check if these values are within the
// the [0 1] interval within some precision (use linsolver_precision)
if (Swor > 1.0 && Swor - linsolver_tolerance < 1.0) {
Swor = 1.0;
}
if (Swir < 0.0 && Swir + linsolver_tolerance > 0.0) {
Swir = 0.0;
}
if (Swir < 0 || Swir > 1 || Swor < 0 || Swor > 1) {
if (isMaster) cerr << "ERROR: Swir/Swor unsensible. Check your input. Exiting";
usageandexit();