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

Removed leftover getDefault("output", ...) where bool was expected.

Browse Source
This commit is contained in:
Markus Blatt 2017-06-20 13:11:16 +02:00
parent 9c6e9b3715
commit 1f8b747299
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/FlowMainEbos.hpp
View File

@ -608,7 +608,7 @@ namespace Opm
void writeInit() void writeInit()
{ {
bool output = param_.getDefault("output", true); bool output = ( output_ > OUTPUT_NONE );
bool output_ecl = param_.getDefault("output_ecl", true); bool output_ecl = param_.getDefault("output_ecl", true);
if( output && output_ecl && grid().comm().rank() == 0 ) if( output && output_ecl && grid().comm().rank() == 0 )
{ {

11
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -338,7 +338,16 @@ namespace Opm
const Opm::EclipseState& eclipseState, const Opm::EclipseState& eclipseState,
std::unique_ptr<EclipseIO>&& eclIO, std::unique_ptr<EclipseIO>&& eclIO,
const Opm::PhaseUsage &phaseUsage) const Opm::PhaseUsage &phaseUsage)
: output_( param.getDefault("output", true) ), : output_( [&param](){
// If output parameter is true or all, then we do output
std::string outputString = param.getDefault("output", std::string("all"));
if ( outputString == "all" || outputString == "log" ||
outputString == "true" )
{
return true;
}
return false;}()
),
parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, phaseUsage ) : 0 ), parallelOutput_( output_ ? new ParallelDebugOutput< Grid >( grid, eclipseState, phaseUsage.num_phases, phaseUsage ) : 0 ),
outputDir_( eclipseState.getIOConfig().getOutputDir() ), outputDir_( eclipseState.getIOConfig().getOutputDir() ),
restart_double_si_( output_ ? param.getDefault("restart_double_si", false) : false ), restart_double_si_( output_ ? param.getDefault("restart_double_si", false) : false ),