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 #5031 from blattms/print-parallel-info-to-prt

Browse Source 
Also print information about parallel run to PRT file.
This commit is contained in:
Bård Skaflestad 2023-12-13 18:16:50 +01:00 committed by GitHub
commit b42b920b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,8 @@ unsigned long long getTotalSystemMemory()
namespace Opm { namespace Opm {
void printPRTHeader(const std::string& parameters, void printPRTHeader(const int nprocs, const int nthreads,
const std::string& parameters,
std::string_view moduleVersion, std::string_view moduleVersion,
std::string_view compileTimestamp) std::string_view compileTimestamp)
{ {
@ -85,7 +86,7 @@ void printPRTHeader(const std::string& parameters,
ss << "User = " << user << std::endl; ss << "User = " << user << std::endl;
} }
ss << "Simulation started on " << tmstr << " hrs\n"; ss << "Simulation started on " << tmstr << " hrs\n";
ss << "Using "<< nprocs << " MPI processes with "<< nthreads <<" OMP threads on each \n";
ss << "Parameters used by Flow:\n" << parameters; ss << "Parameters used by Flow:\n" << parameters;
OpmLog::note(ss.str()); OpmLog::note(ss.str());

3
opm/simulators/flow/Banners.hpp
View File

@ -31,7 +31,8 @@ struct SimulatorReport;
struct SimulatorReportSingle; struct SimulatorReportSingle;
// Print an ASCII-art header to the PRT and DEBUG files. // Print an ASCII-art header to the PRT and DEBUG files.
void printPRTHeader(const std::string& parameters, void printPRTHeader(const int nprocs, const int nthreads,
const std::string& parameters,
std::string_view moduleVersion, std::string_view moduleVersion,
std::string_view compileTimestamp); std::string_view compileTimestamp);

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

@ -182,6 +182,7 @@ void Main::readDeck(const std::string& deckFilename,
const bool allRanksDbgPrtLog, const bool allRanksDbgPrtLog,
const std::string& parsingStrictness, const std::string& parsingStrictness,
const int mpiRank, const int mpiRank,
const std::size_t numThreads,
const int output_param, const int output_param,
const std::string& parameters, const std::string& parameters,
std::string_view moduleVersion, std::string_view moduleVersion,
@ -194,7 +195,8 @@ void Main::readDeck(const std::string& deckFilename,
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog); outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
if (outputCout_) { if (outputCout_) {
printPRTHeader(parameters, moduleVersion, compileTimestamp); printPRTHeader(EclGenericVanguard::comm().size(), numThreads,
parameters, moduleVersion, compileTimestamp);
OpmLog::info("Reading deck file '" + deckFilename + "'"); OpmLog::info("Reading deck file '" + deckFilename + "'");
} }

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

@ -394,6 +394,7 @@ private:
EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning), EWOMS_GET_PARAM(PreTypeTag, bool, EnableLoggingFalloutWarning),
EWOMS_GET_PARAM(PreTypeTag, std::string, ParsingStrictness), EWOMS_GET_PARAM(PreTypeTag, std::string, ParsingStrictness),
mpiRank, mpiRank,
getNumThreads<PreTypeTag>(),
EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval), EWOMS_GET_PARAM(PreTypeTag, int, EclOutputInterval),
cmdline_params, cmdline_params,
Opm::moduleVersion(), Opm::moduleVersion(),
@ -668,6 +669,7 @@ private:
const bool allRanksDbgPrtLog, const bool allRanksDbgPrtLog,
const std::string& parsingStrictness, const std::string& parsingStrictness,
const int mpiRank, const int mpiRank,
const std::size_t numThreads,
const int output_param, const int output_param,
const std::string& parameters, const std::string& parameters,
std::string_view moduleVersion, std::string_view moduleVersion,