fixed: consistently use #if MPI instead of #ifdef MPI

This commit is contained in:
Arne Morten Kvarving 2020-03-12 12:16:07 +01:00
parent 9cf815ab95
commit 3389db4f4c

View File

@ -352,7 +352,7 @@ int main(int argc, char** argv)
Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout); Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout);
#ifdef HAVE_MPI #if HAVE_MPI
Opm::ParallelEclipseState* parState; Opm::ParallelEclipseState* parState;
#endif #endif
if (mpiRank == 0) { if (mpiRank == 0) {
@ -361,7 +361,7 @@ int main(int argc, char** argv)
if ( outputCout ) if ( outputCout )
Opm::checkDeck(*deck, parser, parseContext, errorGuard); Opm::checkDeck(*deck, parser, parseContext, errorGuard);
#ifdef HAVE_MPI #if HAVE_MPI
parState = new Opm::ParallelEclipseState(*deck); parState = new Opm::ParallelEclipseState(*deck);
eclipseState.reset(parState); eclipseState.reset(parState);
#else #else
@ -386,7 +386,7 @@ int main(int argc, char** argv)
setupMessageLimiter(schedule->getMessageLimits(), "STDOUT_LOGGER"); setupMessageLimiter(schedule->getMessageLimits(), "STDOUT_LOGGER");
summaryConfig.reset( new Opm::SummaryConfig(*deck, *schedule, eclipseState->getTableManager(), parseContext, errorGuard)); summaryConfig.reset( new Opm::SummaryConfig(*deck, *schedule, eclipseState->getTableManager(), parseContext, errorGuard));
} }
#ifdef HAVE_MPI #if HAVE_MPI
else { else {
summaryConfig.reset(new Opm::SummaryConfig); summaryConfig.reset(new Opm::SummaryConfig);
schedule.reset(new Opm::Schedule); schedule.reset(new Opm::Schedule);