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

Browse Source
This commit is contained in:
Håvard Berland 2010-11-20 13:22:01 +01:00
commit 8aa583bfad
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/cpchop.cpp
View File

@ -64,6 +64,9 @@ int main(int argc, char** argv)
std::string filebase = param.getDefault<std::string>("filebase", "");
std::string resultfile = param.getDefault<std::string>("resultfile", "");
double minperm = param.getDefault("minperm", 1e-9);
double minpermSI = Dune::unit::convert::from(minperm, Dune::prefix::milli*Dune::unit::darcy);
double z_tolerance = param.getDefault("z_tolerance", 0.0);
double residual_tolerance = param.getDefault("residual_tolerance", 1e-8);
double linsolver_verbosity = param.getDefault("linsolver_verbosity", 0);
@ -123,7 +126,7 @@ int main(int argc, char** argv)
Dune::EclipseGridParser subparser = ch.subparser();
Dune::SinglePhaseUpscaler upscaler;
upscaler.init(subparser, Dune::SinglePhaseUpscaler::Fixed, 0.0, z_tolerance,
upscaler.init(subparser, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
residual_tolerance, linsolver_verbosity, linsolver_type, false);
Dune::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();

8
examples/exp_variogram.cpp
View File

@ -65,7 +65,7 @@ int main(int argc, char** argv)
int jmax = param.getDefault("jmax", dims[1]);
double zmin = param.getDefault("zmin", ch.zLimits().first);
double zmax = param.getDefault("zmax", ch.zLimits().second);
int pairs = param.getDefault("pairs", 100);
int pairs = param.getDefault("pairs", 100);
std::string direction = param.get<std::string>("direction");
int ilen = param.getDefault("ilen", 0);
int jlen = param.getDefault("jlen", 0);
@ -75,6 +75,8 @@ int main(int argc, char** argv)
int outputprecision = param.getDefault("outputprecision", 8);
std::string resultfile = param.getDefault<std::string>("resultfile", "");
double minperm = param.getDefault("minperm", 1e-9);
double minpermSI = Dune::unit::convert::from(minperm, Dune::prefix::milli*Dune::unit::darcy);
double z_tolerance = param.getDefault("z_tolerance", 0.0);
double residual_tolerance = param.getDefault("residual_tolerance", 1e-8);
double linsolver_verbosity = param.getDefault("linsolver_verbosity", 0);
@ -157,7 +159,7 @@ int main(int argc, char** argv)
Dune::EclipseGridParser subparser_1 = ch.subparser();
Dune::SinglePhaseUpscaler upscaler_1;
upscaler_1.init(subparser_1, Dune::SinglePhaseUpscaler::Fixed, 0.0, z_tolerance,
upscaler_1.init(subparser_1, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
residual_tolerance, linsolver_verbosity, linsolver_type, false);
Dune::SinglePhaseUpscaler::permtensor_t upscaled_K_1 = upscaler_1.upscaleSinglePhase();
upscaled_K_1 *= (1.0/(Dune::prefix::milli*Dune::unit::darcy));
@ -180,7 +182,7 @@ int main(int argc, char** argv)
Dune::EclipseGridParser subparser_2 = ch.subparser();
Dune::SinglePhaseUpscaler upscaler_2;
upscaler_2.init(subparser_2, Dune::SinglePhaseUpscaler::Fixed, 0.0, z_tolerance,
upscaler_2.init(subparser_2, Dune::SinglePhaseUpscaler::Fixed, minpermSI, z_tolerance,
residual_tolerance, linsolver_verbosity, linsolver_type, false);
Dune::SinglePhaseUpscaler::permtensor_t upscaled_K_2 = upscaler_2.upscaleSinglePhase();
upscaled_K_2 *= (1.0/(Dune::prefix::milli*Dune::unit::darcy));