Convert all upscaling programs to new pinch behaviour.

This means that PINCH must be used in the input deck,
whereas before, z_tolerance was available as a program
parameter (but only for some programs). A benefit is that
all programs will now uniformly accept PINCH in the input
decks.
This commit is contained in:
Atgeirr Flø Rasmussen
2014-08-20 14:15:17 +02:00
parent a9aa2e02f3
commit 886c463d9f
13 changed files with 30 additions and 28 deletions

View File

@@ -939,7 +939,6 @@ try
if (isMaster) cout << "Tesselating grid... ";
flush(cout); start = clock();
SinglePhaseUpscaler upscaler;
double ztol = 0.0;
double linsolver_tolerance = atof(options["linsolver_tolerance"].c_str());
int linsolver_verbosity = atoi(options["linsolver_verbosity"].c_str());
int linsolver_type = atoi(options["linsolver_type"].c_str());
@@ -949,7 +948,7 @@ try
bool twodim_hack = false;
upscaler.init(deck, boundaryCondition,
Opm::unit::convert::from(minPerm, Opm::prefix::milli*Opm::unit::darcy),
ztol, linsolver_tolerance,
linsolver_tolerance,
linsolver_verbosity, linsolver_type, twodim_hack,
linsolver_maxit, linsolver_prolongate_factor, smooth_steps);