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

Update upscale_perm.cpp and /SteadyStateUpscaler to new init method.

Browse Source
This commit is contained in:
Markus Blatt 2012-11-19 13:09:42 +01:00
parent d8077112d3
commit 6de11bb38e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dune/upscaling/SteadyStateUpscaler_impl.hpp
View File

@ -161,7 +161,10 @@ namespace Dune
// Run pressure solver.
this->flow_solver_.solve(this->res_prop_, saturation, this->bcond_, src,
this->residual_tolerance_, this->linsolver_verbosity_, this->linsolver_type_);
this->residual_tolerance_, this->linsolver_verbosity_,
this->linsolver_type_, false,
this->linsolver_maxit_, this->linsolver_prolongate_factor_,
this->linsolver_smooth_steps_);
double max_mod = this->flow_solver_.postProcessFluxes();
std::cout << "Max mod = " << max_mod << std::endl;
@ -173,7 +176,10 @@ namespace Dune
// Run pressure solver.
this->flow_solver_.solve(this->res_prop_, saturation, this->bcond_, src,
this->residual_tolerance_, this->linsolver_verbosity_, this->linsolver_type_);
this->residual_tolerance_, this->linsolver_verbosity_,
this->linsolver_type_, false,
this->linsolver_maxit_, this->linsolver_prolongate_factor_,
this->linsolver_smooth_steps_);
max_mod = this->flow_solver_.postProcessFluxes();
std::cout << "Max mod = " << max_mod << std::endl;

9
examples/upscale_perm.cpp
View File

@ -219,6 +219,9 @@ int main(int varnum, char** vararg) {
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());
int linsolver_maxit = atoi(options["linsolver_max_iterations"].c_str());
int smooth_steps = atoi(options["linsolver_smooth_steps"].c_str());
double linsolver_prolongate_factor = atof(options["linsolver_prolongate_factor"].c_str());
bool twodim_hack = false;
SinglePhaseUpscaler upscaler_nonperiodic;
@ -232,7 +235,8 @@ int main(int varnum, char** vararg) {
start = clock();
upscaler_nonperiodic.init(eclParser,
isFixed ? SinglePhaseUpscaler::Fixed : SinglePhaseUpscaler::Linear,
minPerm, ztol, linsolver_tolerance, linsolver_verbosity, linsolver_type, twodim_hack);
minPerm, ztol, linsolver_tolerance, linsolver_verbosity, linsolver_type,
twodim_hack, linsolver_maxit, linsolver_prolongate_factor, smooth_steps);
finish = clock();
timeused_nonperiodic_tesselation = (double(finish)-double(start))/CLOCKS_PER_SEC;
cout << " (" << timeused_nonperiodic_tesselation << " secs)" << endl << endl;
@ -241,7 +245,8 @@ int main(int varnum, char** vararg) {
cout << "Tesselating periodic grid ... ";
start = clock();
upscaler_periodic.init(eclParser, SinglePhaseUpscaler::Periodic, minPerm,
ztol, linsolver_tolerance, linsolver_verbosity, linsolver_type, twodim_hack);
ztol, linsolver_tolerance, linsolver_verbosity, linsolver_type, twodim_hack,
linsolver_maxit, linsolver_prolongate_factor, smooth_steps);
finish = clock();
timeused_periodic_tesselation = (double(finish)-double(start))/CLOCKS_PER_SEC;
cout << " (" << timeused_periodic_tesselation << " secs)" << endl << endl;