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

Revert "Restore upscaling utility results"

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2014-10-20 10:23:29 +02:00
parent 1a18f95c36
commit 009bf57f29
5 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/upscale_cond.cpp
View File

@@ -69,7 +69,6 @@
#endif
#include <opm/core/utility/MonotCubicInterpolator.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/upscaling/SinglePhaseUpscaler.hpp>
#include <opm/upscaling/ParserAdditions.hpp>
@@ -236,9 +235,7 @@ try
options.insert(make_pair("rock6satexp", "0"));
// Conversion factor, multiply mD numbers with this to get m² numbers
const double milliDarcyToSqMetre =
Opm::unit::convert::to(1.0*Opm::prefix::milli*Opm::unit::darcy,
Opm::unit::square(Opm::unit::meter));
const double milliDarcyToSqMetre = 9.869233e-16;
// Reference: http://www.spe.org/spe-site/spe/spe/papers/authors/Metric_Standard.pdf
/*
@@ -355,8 +352,8 @@ try
const int points = atoi(options["points"].c_str());
vector<int> satnums = deck->getKeyword("SATNUM")->getIntData();
vector<double> poros = deck->getKeyword("PORO")->getRawDoubleData();
vector<double> permxs = deck->getKeyword("PERMX")->getRawDoubleData();
vector<double> poros = deck->getKeyword("PORO")->getSIDoubleData();
vector<double> permxs = deck->getKeyword("PERMX")->getSIDoubleData();
const double minPerm = atof(options["minPerm"].c_str());
const double minPoro = atof(options["minPoro"].c_str());