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 #161 from andlaus/implement_MULTFLT_in_SCHEDULE_section

Browse Source 
adapt to the "mutable geology" changes from opm-autodiff
This commit is contained in:
Atgeirr Flø Rasmussen 2015-11-27 14:11:50 +01:00
commit d31857a165
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/flow_polymer.cpp
View File

@ -315,7 +315,7 @@ try
std::cout << "\n\n================ Starting main simulation loop ===============\n" std::cout << "\n\n================ Starting main simulation loop ===============\n"
<< std::flush; << std::flush;
SimulatorReport fullReport = simulator.run(simtimer, state); SimulatorReport fullReport = simulator.run(eclipseState, simtimer, state);
std::cout << "\n\n================ End of simulation ===============\n\n"; std::cout << "\n\n================ End of simulation ===============\n\n";
fullReport.report(std::cout); fullReport.report(std::cout);

2
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -254,7 +254,7 @@ try
deck, deck,
*fis_solver, *fis_solver,
grav); grav);
fullReport= simulator.run(simtimer, state); fullReport= simulator.run(eclipseState, simtimer, state);
std::cout << "\n\n================ End of simulation ===============\n\n"; std::cout << "\n\n================ End of simulation ===============\n\n";
fullReport.report(std::cout); fullReport.report(std::cout);

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
View File

@ -107,7 +107,7 @@ namespace Opm
public: public:
SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param, SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
const GridT& grid, const GridT& grid,
const DerivedGeology& geo, DerivedGeology& geo,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props, const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
View File

@ -25,7 +25,7 @@ namespace Opm
SimulatorFullyImplicitBlackoilPolymer<GridT>:: SimulatorFullyImplicitBlackoilPolymer<GridT>::
SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param, SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
const GridT& grid, const GridT& grid,
const DerivedGeology& geo, DerivedGeology& geo,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props, const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
View File

@ -99,7 +99,7 @@ namespace Opm
/// Initialise from parameters and objects to observe. /// Initialise from parameters and objects to observe.
SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param, SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
const GridT& grid, const GridT& grid,
const DerivedGeology& geo, DerivedGeology& geo,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props, const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,

2
opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp
View File

@ -28,7 +28,7 @@ template <class GridT>
SimulatorFullyImplicitCompressiblePolymer<GridT>:: SimulatorFullyImplicitCompressiblePolymer<GridT>::
SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param, SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
const GridT& grid, const GridT& grid,
const DerivedGeology& geo, DerivedGeology& geo,
BlackoilPropsAdInterface& props, BlackoilPropsAdInterface& props,
const PolymerPropsAd& polymer_props, const PolymerPropsAd& polymer_props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,