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

Correctly mark transfer of ownership for ouptut writer

Browse Source
This commit is contained in:
Markus Blatt 2016-11-10 12:41:13 +01:00
parent 077dc02481
commit 3eba3353d0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/sim_poly_fi2p_comp_ad.cpp
View File

@ -245,7 +245,7 @@ try
::createEclipseGrid( cGrid , ::createEclipseGrid( cGrid ,
eclipseState->getInputGrid()))); eclipseState->getInputGrid())));
Opm::BlackoilOutputWriter Opm::BlackoilOutputWriter
outputWriter(cGrid, param, *eclipseState, eclipseWriter, pu, outputWriter(cGrid, param, *eclipseState, std::move(eclipseWriter), pu,
new_props->permeability() ); new_props->permeability() );
SimulatorReport fullReport; SimulatorReport fullReport;

2
opm/autodiff/FlowMain.hpp
View File

@ -773,7 +773,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_,
eclipse_writer_, std::move(eclipse_writer_),
Opm::phaseUsageFromDeck(*deck_), Opm::phaseUsageFromDeck(*deck_),
fluidprops_->permeability())); fluidprops_->permeability()));
} }

8
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -214,7 +214,7 @@ namespace Opm
BlackoilOutputWriter(const Grid& grid, BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param, const parameter::ParameterGroup& param,
const Opm::EclipseState& eclipseState, const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseWriter>& eclWriter, std::unique_ptr<EclipseWriter>&& eclWriter,
const Opm::PhaseUsage &phaseUsage, const Opm::PhaseUsage &phaseUsage,
const double* permeability ); const double* permeability );
@ -329,7 +329,7 @@ namespace Opm
BlackoilOutputWriter(const Grid& grid, BlackoilOutputWriter(const Grid& grid,
const parameter::ParameterGroup& param, const parameter::ParameterGroup& param,
const Opm::EclipseState& eclipseState, const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseWriter>& eclWriter, std::unique_ptr<EclipseWriter>&& eclWriter,
const Opm::PhaseUsage &phaseUsage, const Opm::PhaseUsage &phaseUsage,
const double* permeability ) const double* permeability )
: output_( param.getDefault("output", true) ), : output_( param.getDefault("output", true) ),
@ -345,8 +345,8 @@ namespace Opm
new BlackoilMatlabWriter< Grid >( grid, outputDir_ ) : 0 ), new BlackoilMatlabWriter< Grid >( grid, outputDir_ ) : 0 ),
eclWriter_( output_ && parallelOutput_->isIORank() && eclWriter_( output_ && parallelOutput_->isIORank() &&
param.getDefault("output_ecl", true) ? param.getDefault("output_ecl", true) ?
eclWriter.release() std::move(eclWriter)
: 0 ), : std::move(std::unique_ptr<EclipseWriter>()) ),
eclipseState_(eclipseState), eclipseState_(eclipseState),
asyncOutput_() asyncOutput_()
{ {