From a3fecc8edca79d600d07e095f2776e95d00afb87 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 17 Nov 2016 16:32:13 +0100 Subject: [PATCH] flow_ebos: fix the build this broke after the latest master merge (again, the reason were API changes. this time they did not lead to merge conflicts.) I've verified that flow_ebos works with Norne and that the performance did not regress. --- opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp | 2 +- opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp index a97530d5c..0c9c32f76 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp @@ -125,7 +125,7 @@ namespace Opm int wellStateStepNumber = ( ! substep && timer.reportStepNum() > 0) ? (timer.reportStepNum() - 1) : timer.reportStepNum(); // 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; diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp index 0e49d7f62..6443263e1 100644 --- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp +++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp @@ -178,7 +178,7 @@ namespace Opm const Opm::PhaseUsage &phaseUsage, const double* permeability ) : 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")) : "." ), output_interval_( output_ ? param.getDefault("output_interval", 1): 0 ), lastBackupReportStep_( -1 ),