mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
parent
87a357f77e
commit
385f526d77
@ -343,7 +343,6 @@ namespace Opm
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Print an ASCII-art header to the PRT and DEBUG files.
|
// 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)
|
static void printPRTHeader(bool output_cout)
|
||||||
{
|
{
|
||||||
if (output_cout) {
|
if (output_cout) {
|
||||||
|
@ -171,7 +171,8 @@ void Main::readDeck(const std::string& deckFilename,
|
|||||||
const bool allRanksDbgPrtLog,
|
const bool allRanksDbgPrtLog,
|
||||||
const bool strictParsing,
|
const bool strictParsing,
|
||||||
const int mpiRank,
|
const int mpiRank,
|
||||||
const int output_param)
|
const int output_param,
|
||||||
|
std::function<void(bool)> outputPrt)
|
||||||
{
|
{
|
||||||
auto omode = setupLogging(mpiRank,
|
auto omode = setupLogging(mpiRank,
|
||||||
deckFilename,
|
deckFilename,
|
||||||
@ -179,6 +180,8 @@ void Main::readDeck(const std::string& deckFilename,
|
|||||||
outputMode,
|
outputMode,
|
||||||
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
|
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
|
||||||
|
|
||||||
|
outputPrt(outputCout_);
|
||||||
|
|
||||||
if (outputCout_) {
|
if (outputCout_) {
|
||||||
OpmLog::info("Reading deck file '" + deckFilename + "'");
|
OpmLog::info("Reading deck file '" + deckFilename + "'");
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,7 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <functional>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@ -366,7 +367,8 @@ private:
|
|||||||
EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning),
|
EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning),
|
||||||
EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing),
|
EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing),
|
||||||
mpiRank,
|
mpiRank,
|
||||||
EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval));
|
EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval),
|
||||||
|
FlowMainEbos<PreTypeTag>::printPRTHeader);
|
||||||
setupTime_ = externalSetupTimer.elapsed();
|
setupTime_ = externalSetupTimer.elapsed();
|
||||||
}
|
}
|
||||||
catch (const std::invalid_argument& e)
|
catch (const std::invalid_argument& e)
|
||||||
@ -609,7 +611,8 @@ private:
|
|||||||
const bool allRanksDbgPrtLog,
|
const bool allRanksDbgPrtLog,
|
||||||
const bool strictParsing,
|
const bool strictParsing,
|
||||||
const int mpiRank,
|
const int mpiRank,
|
||||||
const int output_param);
|
const int output_param,
|
||||||
|
std::function<void(bool)> outputPrt);
|
||||||
|
|
||||||
void setupVanguard();
|
void setupVanguard();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user