mirror of
https://github.com/OPM/opm-upscaling.git
synced 2025-02-25 18:45:23 -06:00
support minperm in cpchop and exp_variogram
If not, permeability upscaling will not converge for grids with cells with zero permeability
This commit is contained in:
parent
fa3bc15cff
commit
7c8635d292
@ -64,6 +64,7 @@ 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 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 +124,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, minperm, z_tolerance,
|
||||
residual_tolerance, linsolver_verbosity, linsolver_type, false);
|
||||
|
||||
Dune::SinglePhaseUpscaler::permtensor_t upscaled_K = upscaler.upscaleSinglePhase();
|
||||
|
@ -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,7 @@ 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 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 +158,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, minperm, 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 +181,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, minperm, 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));
|
||||
|
Loading…
Reference in New Issue
Block a user