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 #724 from jokva/eclipse-writer-nnc-constructor

Browse Source 
Pass NNC to OutputWriter constructor
This commit is contained in:
Joakim Hove 2016-06-16 15:56:14 +02:00 committed by GitHub
commit d6b3650160
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -240,8 +240,8 @@ try
<< std::flush; << std::flush;
Opm::BlackoilOutputWriter Opm::BlackoilOutputWriter
outputWriter(cGrid, param, eclipseState, pu, outputWriter(cGrid, param, eclipseState, Opm::NNC(), pu,
new_props->permeability()); new_props->permeability() );
SimulatorReport fullReport; SimulatorReport fullReport;
// Create and run simulator. // Create and run simulator.

3
opm/autodiff/FlowMain.hpp
View File

@ -655,6 +655,7 @@ namespace Opm
output_writer_.reset(new BlackoilOutputWriter(grid_init_->grid(), output_writer_.reset(new BlackoilOutputWriter(grid_init_->grid(),
param_, param_,
eclipse_state_, eclipse_state_,
geoprops_->nonCartesianConnections(),
Opm::phaseUsageFromDeck(deck_), Opm::phaseUsageFromDeck(deck_),
fluidprops_->permeability())); fluidprops_->permeability()));
} }
@ -740,7 +741,7 @@ namespace Opm
fullReport.reportParam(tot_os); fullReport.reportParam(tot_os);
} }
} else { } else {
output_writer_->writeInit( geoprops_->nonCartesianConnections() ); output_writer_->writeInit();
if (output_cout_) { if (output_cout_) {
std::cout << "\n\n================ Simulation turned off ===============\n" << std::flush; std::cout << "\n\n================ Simulation turned off ===============\n" << std::flush;
} }

3
opm/autodiff/SimulatorBase_impl.hpp
View File

@ -109,8 +109,7 @@ namespace Opm
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) ); adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, terminal_output_ ) );
} }
// init output writer output_writer_.writeInit();
output_writer_.writeInit( geo_.nonCartesianConnections() );
std::string restorefilename = param_.getDefault("restorefile", std::string("") ); std::string restorefilename = param_.getDefault("restorefile", std::string("") );
if( ! restorefilename.empty() ) if( ! restorefilename.empty() )

2
opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment_impl.hpp
View File

@ -73,7 +73,7 @@ namespace Opm
} }
// init output writer // init output writer
output_writer_.writeInit( geo_.nonCartesianConnections()); output_writer_.writeInit();
std::string restorefilename = param_.getDefault("restorefile", std::string("") ); std::string restorefilename = param_.getDefault("restorefile", std::string("") );
if( ! restorefilename.empty() ) if( ! restorefilename.empty() )

4
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
View File

@ -247,10 +247,10 @@ namespace Opm
void void
BlackoilOutputWriter:: BlackoilOutputWriter::
writeInit(const NNC& nnc) writeInit()
{ {
if( eclWriter_ ) { if( eclWriter_ ) {
eclWriter_->writeInit( nnc ); eclWriter_->writeInit();
} }
} }

7
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -210,11 +210,12 @@ namespace Opm
BlackoilOutputWriter(const Grid& grid, BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param, const parameter::ParameterGroup& param,
Opm::EclipseStateConstPtr eclipseState, Opm::EclipseStateConstPtr eclipseState,
const NNC&,
const Opm::PhaseUsage &phaseUsage, const Opm::PhaseUsage &phaseUsage,
const double* permeability ); const double* permeability );
/** \copydoc Opm::OutputWriter::writeInit */ /** \copydoc Opm::OutputWriter::writeInit */
void writeInit(const NNC& non_cartesian_connections); void writeInit();
/** \copydoc Opm::OutputWriter::writeTimeStep */ /** \copydoc Opm::OutputWriter::writeTimeStep */
void writeTimeStep(const SimulatorTimerInterface& timer, void writeTimeStep(const SimulatorTimerInterface& timer,
@ -282,6 +283,7 @@ namespace Opm
BlackoilOutputWriter(const Grid& grid, BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param, const parameter::ParameterGroup& param,
Opm::EclipseStateConstPtr eclipseState, Opm::EclipseStateConstPtr eclipseState,
const NNC& nnc,
const Opm::PhaseUsage &phaseUsage, const Opm::PhaseUsage &phaseUsage,
const double* permeability ) const double* permeability )
: output_( param.getDefault("output", true) ), : output_( param.getDefault("output", true) ),
@ -299,7 +301,8 @@ namespace Opm
param.getDefault("output_ecl", true) ? param.getDefault("output_ecl", true) ?
new EclipseWriter(eclipseState, new EclipseWriter(eclipseState,
parallelOutput_->numCells(), parallelOutput_->numCells(),
parallelOutput_->globalCell() ) parallelOutput_->globalCell(),
nnc )
: 0 ), : 0 ),
eclipseState_(eclipseState), eclipseState_(eclipseState),
asyncOutput_() asyncOutput_()