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 #1043 from andlaus/fix_build

Browse Source 
fix the build
This commit is contained in:
Atgeirr Flø Rasmussen 2017-01-27 14:51:04 +01:00 committed by GitHub
commit c9813886ba
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FlowMainEbos.hpp
View File

@ -556,10 +556,12 @@ namespace Opm
// output_writer_
void setupOutputWriter()
{
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck());
output_writer_.reset(new OutputWriter(grid(),
param_,
eclState(),
std::move(eclIO_));
*eclIO_,
pu));
}
// Run the simulator.

12
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp
View File

@ -156,7 +156,7 @@ namespace Opm
bool substep)
{
// ECL output
if ( eclIO_ )
if (output())
{
const auto& initConfig = eclipseState_.getInitConfig();
if (initConfig.restartRequested() && ((initConfig.getRestartStep()) == (timer.currentStepNum()))) {
@ -164,11 +164,11 @@ namespace Opm
} else {
data::Solution combined_sol = simToSolution(state, phaseUsage_); // Get "normal" data (SWAT, PRESSURE, ...)
combined_sol.insert(sol.begin(), sol.end()); // ... insert "extra" data (KR, VISC, ...)
eclIO_->writeTimeStep(timer.reportStepNum(),
substep,
timer.simulationTimeElapsed(),
combined_sol,
wellState.report(phaseUsage_));
eclIO_.writeTimeStep(timer.reportStepNum(),
substep,
timer.simulationTimeElapsed(),
combined_sol,
wellState.report(phaseUsage_));
}
}

11
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp
View File

@ -69,7 +69,7 @@ namespace Opm
BlackoilOutputWriterEbos(const Grid& grid,
const parameter::ParameterGroup& param,
const EclipseState& eclipseState,
std::unique_ptr<EclipseIO>&& eclIO,
EclipseIO& eclIO,
const Opm::PhaseUsage &phaseUsage);
/*!
@ -159,7 +159,7 @@ namespace Opm
std::ofstream backupfile_;
Opm::PhaseUsage phaseUsage_;
std::unique_ptr<EclipseIO> eclIO_;
EclipseIO& eclIO_;
const EclipseState& eclipseState_;
std::unique_ptr< ThreadHandle > asyncOutput_;
@ -177,7 +177,7 @@ namespace Opm
BlackoilOutputWriterEbos(const Grid& grid,
const parameter::ParameterGroup& param,
const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseIO>&& eclIO,
EclipseIO& eclIO,
const Opm::PhaseUsage &phaseUsage)
: output_( param.getDefault("output", true) ),
parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, phaseUsage ) : 0 ),
@ -185,13 +185,12 @@ namespace Opm
output_interval_( output_ ? param.getDefault("output_interval", 1): 0 ),
lastBackupReportStep_( -1 ),
phaseUsage_( phaseUsage ),
eclIO_(eclIO),
eclipseState_(eclipseState),
asyncOutput_()
{
// For output.
if (output_ && parallelOutput_->isIORank() ) {
eclIO_ = std::move(eclIO);
// Ensure that output dir exists
boost::filesystem::path fpath(outputDir_);
try {
@ -262,7 +261,7 @@ namespace Opm
const Wells* wells = wellsmanager.c_wells();
wellstate.resize(wells, simulatorstate, phaseusage ); //Resize for restart step
auto state = eclIO_->loadRestart(solution_keys);
auto state = eclIO_.loadRestart(solution_keys);
solutionToSim( state.first, phaseusage, simulatorstate );
wellsToState( state.second, phaseusage, wellstate );
}