From 240cff0403e6c5e12c30591d4e578d84503f9cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Berland?= Date: Sat, 20 Nov 2010 09:18:20 +0100 Subject: [PATCH] fix bug: convert minperm from Darcy to SI --- examples/cpchop.cpp | 4 +++- examples/exp_variogram.cpp | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/cpchop.cpp b/examples/cpchop.cpp index 53e796f..a5ef389 100644 --- a/examples/cpchop.cpp +++ b/examples/cpchop.cpp @@ -65,6 +65,8 @@ int main(int argc, char** argv) std::string resultfile = param.getDefault("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(); diff --git a/examples/exp_variogram.cpp b/examples/exp_variogram.cpp index 42af8a0..cb149c3 100644 --- a/examples/exp_variogram.cpp +++ b/examples/exp_variogram.cpp @@ -76,6 +76,7 @@ int main(int argc, char** argv) std::string resultfile = param.getDefault("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));