OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2026-08-26 21:17:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix bug: convert minperm from Darcy to SI

Browse Source
This commit is contained in:
Håvard Berland
2010-11-20 09:18:20 +01:00
committed by Havard Berland
parent 7c8635d292
commit 240cff0403
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/cpchop.cpp
+3 -1
View File
@@ -65,6 +65,8 @@ int main(int argc, char** argv)
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);
@@ -124,7 +126,7 @@ int main(int argc, char** argv)
Dune::EclipseGridParser subparser = ch.subparser();
Dune::SinglePhaseUpscaler upscaler;
upscaler.init(subparser, Dune::SinglePhaseUpscaler::Fixed, minperm, 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();
examples/exp_variogram.cpp
+3 -2
View File
@@ -76,6 +76,7 @@ int main(int argc, char** argv)
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);
@@ -158,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, minperm, 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));
@@ -181,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, minperm, 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));