Start using ecl output from Ebos

The wells, FIP and initial output of NNCs is still handled
by code in opm-simulators. The plan is to move more of the
functionality to ebos.

All tests pass and MPI restart works
This commit is contained in:
Tor Harald Sandve
2017-12-07 15:25:21 +01:00
parent bd8a31a5c0
commit 0e6fe26a61
6 changed files with 402 additions and 469 deletions

View File

@@ -539,6 +539,8 @@ namespace Opm
schedule(),
summaryConfig()));
eclIO_->writeInitial(computeLegacySimProps_(), int_vectors, nnc_);
Problem& problem = ebosProblem();
problem.setEclIO(std::move(eclIO_));
}
}
@@ -550,13 +552,10 @@ namespace Opm
// create output writer after grid is distributed, otherwise the parallel output
// won't work correctly since we need to create a mapping from the distributed to
// the global view
output_writer_.reset(new OutputWriter(grid(),
param_,
eclState(),
schedule(),
summaryConfig(),
std::move(eclIO_),
Opm::phaseUsageFromDeck(deck())) );
output_writer_.reset(new OutputWriter(*ebosSimulator_,
param_));
}
// Run the simulator.