mirror of
				https://github.com/OPM/opm-simulators.git
				synced 2025-02-25 18:55:30 -06:00 
			
		
		
		
	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.
This commit is contained in:
		@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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 ),
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user