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 #935 from andlaus/frankenstein_fix_build

Browse Source 
flow_ebos: fix the build
This commit is contained in:
Andreas Lauser 2016-11-17 16:53:52 +01:00 committed by GitHub
commit f8874a2f19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp
View File

@ -125,7 +125,7 @@ namespace Opm
int wellStateStepNumber = ( ! substep && timer.reportStepNum() > 0) ? int wellStateStepNumber = ( ! substep && timer.reportStepNum() > 0) ?
(timer.reportStepNum() - 1) : timer.reportStepNum(); (timer.reportStepNum() - 1) : timer.reportStepNum();
// collect all solutions to I/O rank // collect all solutions to I/O rank
isIORank = parallelOutput_->collectToIORank( localState, localWellState, wellStateStepNumber ); isIORank = parallelOutput_->collectToIORank( localState, localWellState, sol, wellStateStepNumber );
} }
const SimulationDataContainer& state = (parallelOutput_ && parallelOutput_->isParallel() ) ? parallelOutput_->globalReservoirState() : localState; const SimulationDataContainer& state = (parallelOutput_ && parallelOutput_->isParallel() ) ? parallelOutput_->globalReservoirState() : localState;

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp
View File

@ -178,7 +178,7 @@ namespace Opm
const Opm::PhaseUsage &phaseUsage, const Opm::PhaseUsage &phaseUsage,
const double* permeability ) const double* permeability )
: output_( param.getDefault("output", true) ), : output_( param.getDefault("output", true) ),
parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, permeability ) : 0 ), parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, permeability, phaseUsage ) : 0 ),
outputDir_( output_ ? param.getDefault("output_dir", std::string("output")) : "." ), outputDir_( output_ ? param.getDefault("output_dir", std::string("output")) : "." ),
output_interval_( output_ ? param.getDefault("output_interval", 1): 0 ), output_interval_( output_ ? param.getDefault("output_interval", 1): 0 ),
lastBackupReportStep_( -1 ), lastBackupReportStep_( -1 ),