diff --git a/flow/flow.cpp b/flow/flow.cpp index b7b3cae02..bdbf08334 100644 --- a/flow/flow.cpp +++ b/flow/flow.cpp @@ -167,20 +167,18 @@ int main(int argc, char** argv) const auto& phases = runspec.phases(); std::shared_ptr eclipseState = std::make_shared< Opm::EclipseState > ( *deck, parseContext ); - std::shared_ptr schedule = std::make_shared(*deck, eclipseState->getInputGrid(), eclipseState->get3DProperties(), runspec, parseContext); - std::shared_ptr summary_config = std::make_shared(*deck, *schedule, eclipseState->getTableManager(), parseContext); - // Twophase cases + // Twophase cases if( phases.size() == 2 ) { // oil-gas if (phases.active( Opm::Phase::GAS )) { - Opm::flowEbosGasOilSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosGasOilSetDeck(*deck, *eclipseState); return Opm::flowEbosGasOilMain(argc, argv); } // oil-water else if ( phases.active( Opm::Phase::WATER ) ) { - Opm::flowEbosOilWaterSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosOilWaterSetDeck(*deck, *eclipseState); return Opm::flowEbosOilWaterMain(argc, argv); } else { @@ -200,26 +198,26 @@ int main(int argc, char** argv) } if ( phases.size() == 3 ) { // oil water polymer case - Opm::flowEbosOilWaterPolymerSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosOilWaterPolymerSetDeck(*deck, *eclipseState); return Opm::flowEbosOilWaterPolymerMain(argc, argv); } else { - Opm::flowEbosPolymerSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosPolymerSetDeck(*deck, *eclipseState); return Opm::flowEbosPolymerMain(argc, argv); } } // Solvent case else if ( phases.active( Opm::Phase::SOLVENT ) ) { - Opm::flowEbosSolventSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosSolventSetDeck(*deck, *eclipseState); return Opm::flowEbosSolventMain(argc, argv); } // Energy case else if ( phases.active( Opm::Phase::ENERGY ) ) { - Opm::flowEbosEnergySetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosEnergySetDeck(*deck, *eclipseState); return Opm::flowEbosEnergyMain(argc, argv); } // Blackoil case else if( phases.size() == 3 ) { - Opm::flowEbosBlackoilSetDeck(*deck, *eclipseState, *schedule, *summary_config); + Opm::flowEbosBlackoilSetDeck(*deck, *eclipseState); return Opm::flowEbosBlackoilMain(argc, argv); } else diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp index c872be8bf..1fbf2fc8e 100644 --- a/flow/flow_ebos_blackoil.cpp +++ b/flow/flow_ebos_blackoil.cpp @@ -34,12 +34,12 @@ namespace Opm { -void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } // ----------------- Main program ----------------- diff --git a/flow/flow_ebos_blackoil.hpp b/flow/flow_ebos_blackoil.hpp index 8b54455aa..69ace3071 100644 --- a/flow/flow_ebos_blackoil.hpp +++ b/flow/flow_ebos_blackoil.hpp @@ -19,12 +19,10 @@ #include #include -#include -#include namespace Opm { -void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); +void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState); int flowEbosBlackoilMain(int argc, char** argv); } diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_ebos_energy.cpp index df7b283e9..bc2b79da6 100644 --- a/flow/flow_ebos_energy.cpp +++ b/flow/flow_ebos_energy.cpp @@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowEnergyProblem, EnableEnergy, true); }} namespace Opm { -void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowEnergyProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } // ----------------- Main program ----------------- diff --git a/flow/flow_ebos_energy.hpp b/flow/flow_ebos_energy.hpp index 50f95e08b..32f41619d 100644 --- a/flow/flow_ebos_energy.hpp +++ b/flow/flow_ebos_energy.hpp @@ -19,11 +19,9 @@ #include #include -#include -#include namespace Opm { -void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig); +void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState); int flowEbosEnergyMain(int argc, char** argv); } diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_ebos_gasoil.cpp index c52f5a1f4..3484a5a7f 100644 --- a/flow/flow_ebos_gasoil.cpp +++ b/flow/flow_ebos_gasoil.cpp @@ -58,12 +58,12 @@ public: }} namespace Opm { -void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowGasOilProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } diff --git a/flow/flow_ebos_gasoil.hpp b/flow/flow_ebos_gasoil.hpp index 4c8f319a1..53916b902 100644 --- a/flow/flow_ebos_gasoil.hpp +++ b/flow/flow_ebos_gasoil.hpp @@ -19,12 +19,10 @@ #include #include -#include -#include namespace Opm { - void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); - int flowEbosGasOilMain(int argc, char** argv); +void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState); +int flowEbosGasOilMain(int argc, char** argv); } #endif // FLOW_EBOS_GASOIL_HPP diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_ebos_oilwater.cpp index 0bf0bb6ad..a69d996b4 100644 --- a/flow/flow_ebos_oilwater.cpp +++ b/flow/flow_ebos_oilwater.cpp @@ -58,12 +58,12 @@ public: }} namespace Opm { -void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowOilWaterProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } // ----------------- Main program ----------------- diff --git a/flow/flow_ebos_oilwater.hpp b/flow/flow_ebos_oilwater.hpp index 42338628e..c1eb0ff18 100644 --- a/flow/flow_ebos_oilwater.hpp +++ b/flow/flow_ebos_oilwater.hpp @@ -19,13 +19,10 @@ #include #include -#include -#include - namespace Opm { - void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); - int flowEbosOilWaterMain(int argc, char** argv); +void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState); +int flowEbosOilWaterMain(int argc, char** argv); } #endif // FLOW_EBOS_OILWATER_HPP diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp index 13e6c7a79..dd465db8b 100644 --- a/flow/flow_ebos_oilwater_polymer.cpp +++ b/flow/flow_ebos_oilwater_polymer.cpp @@ -59,12 +59,12 @@ public: }} namespace Opm { -void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState) { typedef TTAG(EclFlowOilWaterPolymerProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } // ----------------- Main program ----------------- diff --git a/flow/flow_ebos_oilwater_polymer.hpp b/flow/flow_ebos_oilwater_polymer.hpp index 938e187bd..778f41da0 100644 --- a/flow/flow_ebos_oilwater_polymer.hpp +++ b/flow/flow_ebos_oilwater_polymer.hpp @@ -19,13 +19,10 @@ #include #include -#include -#include - namespace Opm { - void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); - int flowEbosOilWaterPolymerMain(int argc, char** argv); +void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState); +int flowEbosOilWaterPolymerMain(int argc, char** argv); } #endif // FLOW_EBOS_OILWATER_POLYMER_HPP diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_ebos_polymer.cpp index 6cf2c140f..17fa846b8 100644 --- a/flow/flow_ebos_polymer.cpp +++ b/flow/flow_ebos_polymer.cpp @@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowPolymerProblem, EnablePolymer, true); }} namespace Opm { -void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowPolymerProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } // ----------------- Main program ----------------- diff --git a/flow/flow_ebos_polymer.hpp b/flow/flow_ebos_polymer.hpp index ee1696904..7eb81939d 100644 --- a/flow/flow_ebos_polymer.hpp +++ b/flow/flow_ebos_polymer.hpp @@ -19,11 +19,9 @@ #include #include -#include -#include namespace Opm { -void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig); +void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState); int flowEbosPolymerMain(int argc, char** argv); } diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_ebos_solvent.cpp index d70db6ad3..a9bdb8cd3 100644 --- a/flow/flow_ebos_solvent.cpp +++ b/flow/flow_ebos_solvent.cpp @@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowSolventProblem, EnableSolvent, true); }} namespace Opm { -void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) +void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState) { typedef TTAG(EclFlowSolventProblem) TypeTag; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; - Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); + Vanguard::setExternalDeck(&deck, &eclState); } diff --git a/flow/flow_ebos_solvent.hpp b/flow/flow_ebos_solvent.hpp index 0c1a4ab9b..45c562e2c 100644 --- a/flow/flow_ebos_solvent.hpp +++ b/flow/flow_ebos_solvent.hpp @@ -19,13 +19,11 @@ #include #include -#include -#include namespace Opm { - void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); - int flowEbosSolventMain(int argc, char** argv); +void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState); +int flowEbosSolventMain(int argc, char** argv); } #endif // FLOW_EBOS_SOLVENT_HPP