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

Merge pull request #11 from atgeirr/master

Browse Source 
Fix argument order for init().
This commit is contained in:
Atgeirr Flø Rasmussen 2012-11-19 03:19:39 -08:00
commit d8077112d3
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dune/upscaling/UpscalerBase.hpp
View File

@ -80,24 +80,24 @@ namespace Dune
double perm_threshold,
double z_tolerance = 0.0,
double residual_tolerance = 1e-8,
int linsolver_maxit = 0,
double linsolver_prolongate_factor =1.6,
int linsolver_verbosity = 0,
int linsolver_type = 1,
bool twodim_hack = false,
int linsolver_smooth_steps=2);
int linsolver_maxit = 0,
double linsolver_prolongate_factor = 1.6,
int linsolver_smooth_steps = 2);
/// Access the grid.
const GridType& grid() const;
/// Set boundary condition type. This may not be used to swicth
/// between Periodic and the other types, since the grid is
/// modified for Periodic conditions.
void setBoundaryConditionType(BoundaryConditionType type);
/// Set boundary condition type. This may not be used to swicth
/// between Periodic and the other types, since the grid is
/// modified for Periodic conditions.
void setBoundaryConditionType(BoundaryConditionType type);
/// Set the permeability of a cell directly. This will override
/// the permeability that was read from the eclipse file.
void setPermeability(const int cell_index, const permtensor_t& k);
/// Set the permeability of a cell directly. This will override
/// the permeability that was read from the eclipse file.
void setPermeability(const int cell_index, const permtensor_t& k);
/// Does a single-phase upscaling.
/// @return an upscaled permeability tensor.

20
dune/upscaling/UpscalerBase_impl.hpp
View File

@ -127,16 +127,16 @@ namespace Dune
template <class Traits>
inline void UpscalerBase<Traits>::init(const Opm::EclipseGridParser& parser,
BoundaryConditionType bctype,
double perm_threshold,
double z_tolerance,
double residual_tolerance,
int linsolver_maxit,
double linsolver_prolongate_factor,
int linsolver_verbosity,
int linsolver_type,
bool twodim_hack,
int linsolver_smooth_steps)
BoundaryConditionType bctype,
double perm_threshold,
double z_tolerance,
double residual_tolerance,
int linsolver_verbosity,
int linsolver_type,
bool twodim_hack,
int linsolver_maxit,
double linsolver_prolongate_factor,
int linsolver_smooth_steps)
{
bctype_ = bctype;
residual_tolerance_ = residual_tolerance;

5
examples/upscale_relperm.cpp
View File

@ -950,8 +950,9 @@ int main(int varnum, char** vararg)
eclParser.convertToSI();
upscaler.init(eclParser, boundaryCondition,
Opm::unit::convert::from(minPerm, Opm::prefix::milli*Opm::unit::darcy),
ztol, linsolver_tolerance, linsolver_maxit, linsolver_prolongate_factor,
linsolver_verbosity, linsolver_type, twodim_hack, smooth_steps);
ztol, linsolver_tolerance,
linsolver_verbosity, linsolver_type, twodim_hack,
linsolver_maxit, linsolver_prolongate_factor, smooth_steps);
finish = clock(); timeused_tesselation = (double(finish)-double(start))/CLOCKS_PER_SEC;
if (isMaster) cout << " (" << timeused_tesselation <<" secs)" << endl;