changed: no need to serialize the FluidSystem any more

setup is now done all from state, which means it can be done
independently on all processes
This commit is contained in:
Arne Morten Kvarving
2020-03-03 14:23:47 +01:00
parent 1301e80628
commit 03a2129df3
2 changed files with 10 additions and 14 deletions

View File

@@ -610,7 +610,7 @@ public:
const auto& vanguard = simulator.vanguard();
const auto& comm = this->gridView().comm();
if (comm.rank() == 0) {
SolventModule::initFromDeck(vanguard.deck(), vanguard.eclState());
SolventModule::initFromDeck(vanguard.deck(), vanguard.eclState(), vanguard.schedule());
PolymerModule::initFromDeck(vanguard.deck(), vanguard.eclState());
FoamModule::initFromDeck(vanguard.deck(), vanguard.eclState());
BrineModule::initFromDeck(vanguard.deck(), vanguard.eclState());
@@ -2380,15 +2380,10 @@ private:
void initFluidSystem_()
{
const auto& simulator = this->simulator();
const auto& deck = simulator.vanguard().deck();
const auto& eclState = simulator.vanguard().eclState();
const auto& comm = simulator.gridView().comm();
const auto& schedule = simulator.vanguard().schedule();
if (comm.rank() == 0)
FluidSystem::initFromDeck(deck, eclState);
EclMpiSerializer ser(comm);
ser.staticBroadcast<FluidSystem>();
FluidSystem::initFromState(eclState, schedule);
}
void readInitialCondition_()