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

Merge pull request #17 from berland/master

Browse Source 
Postpone incorporation of user-supplied surface tension to the end
This commit is contained in:
Atgeirr Flø Rasmussen 2012-12-02 23:44:08 -08:00
commit bf5f8c56d2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/upscale_relperm.cpp
View File

@ -1028,6 +1028,9 @@ int main(int varnum, char** vararg)
* J-function in that they represent all possible saturations, * J-function in that they represent all possible saturations,
* ie. we do not want to extrapolate the J-functions (but we might * ie. we do not want to extrapolate the J-functions (but we might
* have to do that later in the computations). * have to do that later in the computations).
*
* The user-supplied surface tension is ignored until
* the final output of results.
*/ */
if (maxPermContrast == 0) { if (maxPermContrast == 0) {
@ -1071,9 +1074,9 @@ int main(int varnum, char** vararg)
if (! anisotropic_input) { if (! anisotropic_input) {
Pcmincandidate = InvJfunctions[int(satnums[cell_idx])-1].getMinimumX().first Pcmincandidate = InvJfunctions[int(satnums[cell_idx])-1].getMinimumX().first
/ sqrt(permxs[cell_idx] * milliDarcyToSqMetre / poros[cell_idx]) * surfaceTension; / sqrt(permxs[cell_idx] * milliDarcyToSqMetre / poros[cell_idx]);
Pcmaxcandidate = InvJfunctions[int(satnums[cell_idx])-1].getMaximumX().first Pcmaxcandidate = InvJfunctions[int(satnums[cell_idx])-1].getMaximumX().first
/ sqrt(permxs[cell_idx] * milliDarcyToSqMetre/poros[cell_idx]) * surfaceTension; / sqrt(permxs[cell_idx] * milliDarcyToSqMetre/poros[cell_idx]);
minSw = InvJfunctions[int(satnums[cell_idx])-1].getMinimumF().second; minSw = InvJfunctions[int(satnums[cell_idx])-1].getMinimumF().second;
maxSw = InvJfunctions[int(satnums[cell_idx])-1].getMaximumF().second; maxSw = InvJfunctions[int(satnums[cell_idx])-1].getMaximumF().second;
} }
@ -1216,7 +1219,7 @@ int main(int varnum, char** vararg)
PtestvalueCell = Ptestvalue; PtestvalueCell = Ptestvalue;
} }
if (! anisotropic_input ) { if (! anisotropic_input ) {
double Jvalue = sqrt(permxs[cell_idx] * milliDarcyToSqMetre /poros[cell_idx]) * PtestvalueCell / surfaceTension; double Jvalue = sqrt(permxs[cell_idx] * milliDarcyToSqMetre /poros[cell_idx]) * PtestvalueCell;
//cout << "JvalueCell: " << Jvalue << endl; //cout << "JvalueCell: " << Jvalue << endl;
waterSaturationCell waterSaturationCell
= InvJfunctions[int(satnums[cell_idx])-1].evaluate(Jvalue); = InvJfunctions[int(satnums[cell_idx])-1].evaluate(Jvalue);
@ -1421,7 +1424,7 @@ int main(int varnum, char** vararg)
if (! anisotropic_input) { if (! anisotropic_input) {
double Jvalue = sqrt(permxs[cell_idx] * milliDarcyToSqMetre/poros[cell_idx]) * PtestvalueCell / surfaceTension; double Jvalue = sqrt(permxs[cell_idx] * milliDarcyToSqMetre/poros[cell_idx]) * PtestvalueCell;
//cout << "JvalueCell: " << Jvalue << endl; //cout << "JvalueCell: " << Jvalue << endl;
double waterSaturationCell double waterSaturationCell
= InvJfunctions[int(satnums[cell_idx])-1].evaluate(Jvalue); = InvJfunctions[int(satnums[cell_idx])-1].evaluate(Jvalue);
@ -1859,6 +1862,13 @@ int main(int varnum, char** vararg)
} }
vector<double> Pvalues = pressurePoints; //WaterSaturation.get_xVector(); vector<double> Pvalues = pressurePoints; //WaterSaturation.get_xVector();
// Multiply all pressures with the surface tension (potentially) supplied
// at the command line. This multiplication has been postponed to here
// to avoid division by zero and to avoid special handling of negative
// capillary pressure in the code above.
std::transform(Pvalues.begin(), Pvalues.end(), Pvalues.begin(),
std::bind1st(std::multiplies<double>(), surfaceTension));
vector<double> Satvalues = WaterSaturation; //.get_fVector(); vector<double> Satvalues = WaterSaturation; //.get_fVector();
// If user wants interpolated output, do monotone cubic interpolation // If user wants interpolated output, do monotone cubic interpolation

2
examples/upscale_relpermvisc.cpp
View File

@ -1029,8 +1029,6 @@ int main(int varnum, char** vararg)
} }
} }
cout << "Kom hit 2?" << endl;
// Find max/min fracflowratio over all rock types. // Find max/min fracflowratio over all rock types.
double fracflowratioMin = numeric_limits<double>().max(); double fracflowratioMin = numeric_limits<double>().max();
double fracflowratioMax = 0; double fracflowratioMax = 0;