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

Passing keys to the restart load function.

Browse Source 
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
This commit is contained in:
Joakim Hove
2017-01-06 15:13:53 +01:00
parent 4ff9996f80
commit 270e5f9c0e
8 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/FlowMainEbos.hpp
View File

@@ -545,8 +545,8 @@ namespace Opm
if( output && output_ecl && output_cout_)
{
const EclipseGrid& inputGrid = eclState().getInputGrid();
eclipse_writer_.reset(new EclipseWriter(eclState(), UgGridHelpers::createEclipseGrid( grid , inputGrid )));
eclipse_writer_->writeInitial(geoprops_->simProps(grid),
eclIO_.reset(new EclipseIO(eclState(), UgGridHelpers::createEclipseGrid( grid , inputGrid )));
eclIO_->writeInitial(geoprops_->simProps(grid),
geoprops_->nonCartesianConnections());
}
}
@@ -562,7 +562,7 @@ namespace Opm
output_writer_.reset(new OutputWriter(grid(),
param_,
eclState(),
std::move(eclipse_writer_),
std::move(eclIO_),
Opm::phaseUsageFromDeck(deck()),
fluidprops_->permeability()));
}
@@ -725,7 +725,7 @@ namespace Opm
std::unique_ptr<BlackoilPropsAdFromDeck> fluidprops_;
std::unique_ptr<DerivedGeology> geoprops_;
std::unique_ptr<ReservoirState> state_;
std::unique_ptr<EclipseWriter> eclipse_writer_;
std::unique_ptr<EclipseIO> eclIO_;
std::unique_ptr<OutputWriter> output_writer_;
boost::any parallel_information_;
std::unique_ptr<NewtonIterationBlackoilInterface> fis_solver_;