OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #678 from GitPaean/remove-warnings

Browse Source 
silencing a few shadowing warnings.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-05-07 09:51:45 +02:00
commit 49d7cadaa5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/AutoDiffMatrix.hpp
View File

@ -662,11 +662,11 @@ namespace Opm
/**
* Constructor which sets all members
*/
AutoDiffMatrix(AudoDiffMatrixType type, int rows, int cols,
AutoDiffMatrix(AudoDiffMatrixType type, int rows_arg, int cols_arg,
DiagRep diag=DiagRep(), SparseRep sparse=SparseRep())
: type_(type),
rows_(rows),
cols_(cols),
rows_(rows_arg),
cols_(cols_arg),
diag_(diag),
sparse_(sparse)
{

4
opm/autodiff/NonlinearSolver_impl.hpp
View File

@ -29,9 +29,9 @@ namespace Opm
{
template <class PhysicalModel>
NonlinearSolver<PhysicalModel>::NonlinearSolver(const SolverParameters& param,
std::unique_ptr<PhysicalModel> model)
std::unique_ptr<PhysicalModel> model_arg)
: param_(param),
model_(std::move(model)),
model_(std::move(model_arg)),
nonlinearIterations_(0),
linearIterations_(0),
nonlinearIterationsLast_(0),

4
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@ -80,7 +80,7 @@ namespace Opm {
const DerivedGeology& geo,
const RockCompressibility* rock_comp_props,
const PolymerPropsAd& polymer_props_ad,
const Wells* wells,
const Wells* wells_arg,
const NewtonIterationBlackoilInterface& linsolver,
EclipseStateConstPtr eclipse_state,
const bool has_disgas,
@ -92,7 +92,7 @@ namespace Opm {
const std::vector<double>& wells_perf_length,
const std::vector<double>& wells_bore_diameter,
const bool terminal_output)
: Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver, eclipse_state,
: Base(param, grid, fluid, geo, rock_comp_props, wells_arg, linsolver, eclipse_state,
has_disgas, has_vapoil, terminal_output),
polymer_props_ad_(polymer_props_ad),
has_polymer_(has_polymer),