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 #4418 from akva2/fix_prt_header_regression

Browse Source 
fixed: regression from 82d2146c90
This commit is contained in:
Bård Skaflestad 2023-01-31 15:52:41 +01:00 committed by GitHub
commit 5daf355a7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -343,7 +343,6 @@ namespace Opm
}
// Print an ASCII-art header to the PRT and DEBUG files.
// \return Whether unkown keywords were seen during parsing.
static void printPRTHeader(bool output_cout)
{
if (output_cout) {

5
opm/simulators/flow/Main.cpp
View File

@ -171,7 +171,8 @@ void Main::readDeck(const std::string& deckFilename,
const bool allRanksDbgPrtLog,
const bool strictParsing,
const int mpiRank,
const int output_param)
const int output_param,
std::function<void(bool)> outputPrt)
{
auto omode = setupLogging(mpiRank,
deckFilename,
@ -179,6 +180,8 @@ void Main::readDeck(const std::string& deckFilename,
outputMode,
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
outputPrt(outputCout_);
if (outputCout_) {
OpmLog::info("Reading deck file '" + deckFilename + "'");
}

7
opm/simulators/flow/Main.hpp
View File

@ -68,6 +68,7 @@
#include <cassert>
#include <cstdlib>
#include <functional>
#include <iostream>
#include <memory>
#include <stdexcept>
@ -366,7 +367,8 @@ private:
EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning),
EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing),
mpiRank,
EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval));
EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval),
FlowMainEbos<PreTypeTag>::printPRTHeader);
setupTime_ = externalSetupTimer.elapsed();
}
catch (const std::invalid_argument& e)
@ -609,7 +611,8 @@ private:
const bool allRanksDbgPrtLog,
const bool strictParsing,
const int mpiRank,
const int output_param);
const int output_param,
std::function<void(bool)> outputPrt);
void setupVanguard();