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: remove support for internal deck handling in simulators

Browse Source
This commit is contained in:
Arne Morten Kvarving
2022-06-14 10:09:35 +02:00
parent c793aff5d1
commit 371c8058bc
23 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flow/flow_ebos_blackoil.cpp
View File

@@ -36,7 +36,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalUDQState(std::move(udqState));

2
flow/flow_ebos_brine.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_brine_precsalt_vapwat.cpp
View File

@@ -56,7 +56,7 @@ void flowEbosBrinePrecsaltVapwatSetDeck(double setupTime, std::shared_ptr<Deck>
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_brine_saltprecipitation.cpp
View File

@@ -51,7 +51,7 @@ void flowEbosBrineSaltPrecipitationSetDeck(double setupTime, std::shared_ptr<Dec
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_energy.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_extbo.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosExtboSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_foam.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosFoamSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_gasoil.cpp
View File

@@ -67,7 +67,7 @@ void flowEbosGasOilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_gasoil_energy.cpp
View File

@@ -71,7 +71,7 @@ void flowEbosGasOilEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_gaswater.cpp
View File

@@ -70,7 +70,7 @@ void flowEbosGasWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_gaswater_brine.cpp
View File

@@ -70,7 +70,7 @@ void flowEbosGasWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_gaswater_saltprec_vapwat.cpp
View File

@@ -81,7 +81,7 @@ void flowEbosGasWaterSaltprecVapwatSetDeck(double setupTime, std::shared_ptr<Dec
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_micp.cpp
View File

@@ -70,7 +70,7 @@ void flowEbosMICPSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_oilwater.cpp
View File

@@ -67,7 +67,7 @@ void flowEbosOilWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_oilwater_brine.cpp
View File

@@ -70,7 +70,7 @@ void flowEbosOilWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_oilwater_polymer.cpp
View File

@@ -70,7 +70,7 @@ void flowEbosOilWaterPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_onephase.cpp
View File

@@ -66,7 +66,7 @@ void flowEbosWaterOnlySetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_onephase_energy.cpp
View File

@@ -73,7 +73,7 @@ void flowEbosWaterOnlyEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_polymer.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));

2
flow/flow_ebos_solvent.cpp
View File

@@ -46,7 +46,7 @@ void flowEbosSolventSetDeck(double setupTime, std::shared_ptr<Deck> deck,
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
Vanguard::setSetupTime(setupTime);
Vanguard::setExternalDeck(std::move(deck));
Vanguard::setDeck(std::move(deck));
Vanguard::setExternalEclState(std::move(eclState));
Vanguard::setExternalSchedule(std::move(schedule));
Vanguard::setExternalSummaryConfig(std::move(summaryConfig));