OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from andlaus/more_compile_fixes

Browse Source 
More compile fixes
This commit is contained in:
Atgeirr Flø Rasmussen 2014-03-18 15:36:36 +01:00
commit da91603cb5
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -126,8 +126,6 @@ namespace Opm
WellsManager& wells_manager_; WellsManager& wells_manager_;
const Wells* wells_; const Wells* wells_;
const PolymerInflowInterface& polymer_inflow_; const PolymerInflowInterface& polymer_inflow_;
const std::vector<double>& src_;
const FlowBoundaryConditions* bcs_;
const double* gravity_; const double* gravity_;
// Solvers // Solvers
CompressibleTpfaPolymer psolver_; CompressibleTpfaPolymer psolver_;
@ -190,8 +188,6 @@ namespace Opm
wells_manager_(wells_manager), wells_manager_(wells_manager),
wells_(wells_manager.c_wells()), wells_(wells_manager.c_wells()),
polymer_inflow_(polymer_inflow), polymer_inflow_(polymer_inflow),
src_(src),
bcs_(bcs),
gravity_(gravity), gravity_(gravity),
psolver_(grid, props, rock_comp_props, poly_props, linsolver, psolver_(grid, props, rock_comp_props, poly_props, linsolver,
param.getDefault("nl_pressure_residual_tolerance", 0.0), param.getDefault("nl_pressure_residual_tolerance", 0.0),

1
opm/polymer/SimulatorPolymer.cpp
View File

@ -203,7 +203,6 @@ namespace Opm
polymer_inflow_(polymer_inflow), polymer_inflow_(polymer_inflow),
src_(src), src_(src),
bcs_(bcs), bcs_(bcs),
gravity_(gravity),
psolver_(grid, props, rock_comp_props, poly_props, linsolver, psolver_(grid, props, rock_comp_props, poly_props, linsolver,
param.getDefault("nl_pressure_residual_tolerance", 0.0), param.getDefault("nl_pressure_residual_tolerance", 0.0),
param.getDefault("nl_pressure_change_tolerance", 1.0), param.getDefault("nl_pressure_change_tolerance", 1.0),

2
opm/polymer/TransportSolverTwophasePolymer.cpp
View File

@ -929,7 +929,7 @@ namespace Opm
tmp_x[1]=x[1]; tmp_x[1]=x[1];
} }
res_eq.computeJacobiRes(tmp_x, dres_s_dsdc, dres_c_dsdc); res_eq.computeJacobiRes(tmp_x, dres_s_dsdc, dres_c_dsdc);
double dFx_dx,dFx_dy,dFy_dx,dFy_dy; double dFx_dx(0),dFx_dy(0),dFy_dx(0),dFy_dy(0);
double det = dFx_dx*dFy_dy - dFy_dx*dFx_dy; double det = dFx_dx*dFy_dy - dFy_dx*dFx_dy;
if(use_sc){ if(use_sc){
dFx_dx=(dres_s_dsdc[0]-tmp_x[1]*dres_s_dsdc[1]/tmp_x[0]); dFx_dx=(dres_s_dsdc[0]-tmp_x[1]*dres_s_dsdc[1]/tmp_x[0]);