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

move PRT header to the top

Browse Source
This commit is contained in:
Tor Harald Sandve
2019-10-03 12:13:13 +02:00
parent 1544f84fb4
commit aeb29a5412
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flow/flow.cpp
View File

@@ -340,6 +340,8 @@ int main(int argc, char** argv)
parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN); parseContext.update(Opm::ParseContext::SUMMARY_UNKNOWN_GROUP, Opm::InputError::WARN);
} }
Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout);
deck.reset( new Opm::Deck( parser.parseFile(deckFilename , parseContext, errorGuard))); deck.reset( new Opm::Deck( parser.parseFile(deckFilename , parseContext, errorGuard)));
Opm::MissingFeatures::checkKeywords(*deck, parseContext, errorGuard); Opm::MissingFeatures::checkKeywords(*deck, parseContext, errorGuard);
if ( outputCout ) if ( outputCout )

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

@@ -240,7 +240,6 @@ namespace Opm
setupParallelism(); setupParallelism();
setupEbosSimulator(output_cout); setupEbosSimulator(output_cout);
printPRTHeader(output_cout);
runDiagnostics(output_cout); runDiagnostics(output_cout);
createSimulator(); createSimulator();
@@ -271,33 +270,9 @@ namespace Opm
} }
} }
protected:
void setupParallelism()
{
// determine the rank of the current process and the number of processes
// involved in the simulation. MPI must have already been initialized
// here. (yes, the name of this method is misleading.)
#if HAVE_MPI
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank_);
MPI_Comm_size(MPI_COMM_WORLD, &mpi_size_);
#else
mpi_rank_ = 0;
mpi_size_ = 1;
#endif
#if _OPENMP
// if openMP is available, default to 2 threads per process.
if (!getenv("OMP_NUM_THREADS"))
omp_set_num_threads(std::min(2, omp_get_num_procs()));
#endif
typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager;
ThreadManager::init();
}
// 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. // \return Whether unkown keywords were seen during parsing.
void printPRTHeader(bool output_cout) static void printPRTHeader(bool output_cout)
{ {
if (output_cout) { if (output_cout) {
const std::string version = moduleVersion(); const std::string version = moduleVersion();
@@ -339,6 +314,32 @@ namespace Opm
} }
} }
protected:
void setupParallelism()
{
// determine the rank of the current process and the number of processes
// involved in the simulation. MPI must have already been initialized
// here. (yes, the name of this method is misleading.)
#if HAVE_MPI
MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank_);
MPI_Comm_size(MPI_COMM_WORLD, &mpi_size_);
#else
mpi_rank_ = 0;
mpi_size_ = 1;
#endif
#if _OPENMP
// if openMP is available, default to 2 threads per process.
if (!getenv("OMP_NUM_THREADS"))
omp_set_num_threads(std::min(2, omp_get_num_procs()));
#endif
typedef typename GET_PROP_TYPE(TypeTag, ThreadManager) ThreadManager;
ThreadManager::init();
}
void mergeParallelLogFiles(bool output_to_files) void mergeParallelLogFiles(bool output_to_files)
{ {
// force closing of all log files. // force closing of all log files.
@@ -495,7 +496,7 @@ namespace Opm
simulator_.reset(new Simulator(*ebosSimulator_)); simulator_.reset(new Simulator(*ebosSimulator_));
} }
unsigned long long getTotalSystemMemory() static unsigned long long getTotalSystemMemory()
{ {
long pages = sysconf(_SC_PHYS_PAGES); long pages = sysconf(_SC_PHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE); long page_size = sysconf(_SC_PAGE_SIZE);