OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-04 09:33:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2397 from akva2/no_serialization_fluidsystem

Browse Source 
changed: no need to serialize the FluidSystem any more
This commit is contained in:
Bård Skaflestad
2020-03-03 21:51:10 -06:00
committed by GitHub
parent 93964b2fa8 03a2129df3
commit 6688c19a77
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebos/eclproblem.hh
+3 -8
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_()