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

changed: simplify mpi setup

Browse Source 
no need for a separate reference to the parallel state any longer
This commit is contained in:
Arne Morten Kvarving
2020-03-12 12:38:11 +01:00
parent 3389db4f4c
commit 05286d8900
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flow/flow.cpp
View File

@@ -352,9 +352,6 @@ int main(int argc, char** argv)
Opm::FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout);
#if HAVE_MPI
Opm::ParallelEclipseState* parState;
#endif
if (mpiRank == 0) {
deck.reset( new Opm::Deck( parser.parseFile(deckFilename , parseContext, errorGuard)));
Opm::MissingFeatures::checkKeywords(*deck, parseContext, errorGuard);
@@ -362,8 +359,7 @@ int main(int argc, char** argv)
Opm::checkDeck(*deck, parser, parseContext, errorGuard);
#if HAVE_MPI
parState = new Opm::ParallelEclipseState(*deck);
eclipseState.reset(parState);
eclipseState.reset(new Opm::ParallelEclipseState(*deck));
#else
eclipseState.reset(new Opm::EclipseState(*deck));
#endif
@@ -390,12 +386,11 @@ int main(int argc, char** argv)
else {
summaryConfig.reset(new Opm::SummaryConfig);
schedule.reset(new Opm::Schedule);
parState = new Opm::ParallelEclipseState;
eclipseState.reset(parState);
eclipseState.reset(new Opm::ParallelEclipseState);
}
Opm::EclMpiSerializer ser(mpiHelper.getCollectiveCommunication());
ser.broadcast(*summaryConfig);
ser.broadcast(*parState);
ser.broadcast(*eclipseState);
ser.broadcast(*schedule);
#endif