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

Merge pull request #1613 from andlaus/cleanup_schedule_management

Browse Source 
flow: do not pass the schedule and summaryConfig objects anymore
This commit is contained in:
Andreas Lauser 2018-11-08 13:14:43 +01:00 committed by GitHub
commit 11fb836432
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 33 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flow/flow.cpp
View File

@ -167,20 +167,18 @@ int main(int argc, char** argv)
const auto& phases = runspec.phases(); const auto& phases = runspec.phases();
std::shared_ptr<Opm::EclipseState> eclipseState = std::make_shared< Opm::EclipseState > ( *deck, parseContext ); std::shared_ptr<Opm::EclipseState> eclipseState = std::make_shared< Opm::EclipseState > ( *deck, parseContext );
std::shared_ptr<Opm::Schedule> schedule = std::make_shared<Opm::Schedule>(*deck, eclipseState->getInputGrid(), eclipseState->get3DProperties(), runspec, parseContext); // Twophase cases
std::shared_ptr<Opm::SummaryConfig> summary_config = std::make_shared<Opm::SummaryConfig>(*deck, *schedule, eclipseState->getTableManager(), parseContext);
// Twophase cases
if( phases.size() == 2 ) { if( phases.size() == 2 ) {
// oil-gas // oil-gas
if (phases.active( Opm::Phase::GAS )) if (phases.active( Opm::Phase::GAS ))
{ {
Opm::flowEbosGasOilSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosGasOilSetDeck(*deck, *eclipseState);
return Opm::flowEbosGasOilMain(argc, argv); return Opm::flowEbosGasOilMain(argc, argv);
} }
// oil-water // oil-water
else if ( phases.active( Opm::Phase::WATER ) ) else if ( phases.active( Opm::Phase::WATER ) )
{ {
Opm::flowEbosOilWaterSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosOilWaterSetDeck(*deck, *eclipseState);
return Opm::flowEbosOilWaterMain(argc, argv); return Opm::flowEbosOilWaterMain(argc, argv);
} }
else { else {
@ -200,26 +198,26 @@ int main(int argc, char** argv)
} }
if ( phases.size() == 3 ) { // oil water polymer case if ( phases.size() == 3 ) { // oil water polymer case
Opm::flowEbosOilWaterPolymerSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosOilWaterPolymerSetDeck(*deck, *eclipseState);
return Opm::flowEbosOilWaterPolymerMain(argc, argv); return Opm::flowEbosOilWaterPolymerMain(argc, argv);
} else { } else {
Opm::flowEbosPolymerSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosPolymerSetDeck(*deck, *eclipseState);
return Opm::flowEbosPolymerMain(argc, argv); return Opm::flowEbosPolymerMain(argc, argv);
} }
} }
// Solvent case // Solvent case
else if ( phases.active( Opm::Phase::SOLVENT ) ) { else if ( phases.active( Opm::Phase::SOLVENT ) ) {
Opm::flowEbosSolventSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosSolventSetDeck(*deck, *eclipseState);
return Opm::flowEbosSolventMain(argc, argv); return Opm::flowEbosSolventMain(argc, argv);
} }
// Energy case // Energy case
else if ( phases.active( Opm::Phase::ENERGY ) ) { else if ( phases.active( Opm::Phase::ENERGY ) ) {
Opm::flowEbosEnergySetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosEnergySetDeck(*deck, *eclipseState);
return Opm::flowEbosEnergyMain(argc, argv); return Opm::flowEbosEnergyMain(argc, argv);
} }
// Blackoil case // Blackoil case
else if( phases.size() == 3 ) { else if( phases.size() == 3 ) {
Opm::flowEbosBlackoilSetDeck(*deck, *eclipseState, *schedule, *summary_config); Opm::flowEbosBlackoilSetDeck(*deck, *eclipseState);
return Opm::flowEbosBlackoilMain(argc, argv); return Opm::flowEbosBlackoilMain(argc, argv);
} }
else else

4
flow/flow_ebos_blackoil.cpp
View File

@ -34,12 +34,12 @@
namespace Opm { namespace Opm {
void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosBlackoilSetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowProblem) TypeTag; typedef TTAG(EclFlowProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }
// ----------------- Main program ----------------- // ----------------- Main program -----------------

4
flow/flow_ebos_blackoil.hpp
View File

@ -19,12 +19,10 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { 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); int flowEbosBlackoilMain(int argc, char** argv);
} }

4
flow/flow_ebos_energy.cpp
View File

@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowEnergyProblem, EnableEnergy, true);
}} }}
namespace Opm { namespace Opm {
void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowEnergyProblem) TypeTag; typedef TTAG(EclFlowEnergyProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }
// ----------------- Main program ----------------- // ----------------- Main program -----------------

4
flow/flow_ebos_energy.hpp
View File

@ -19,11 +19,9 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig); void flowEbosEnergySetDeck(Deck &deck, EclipseState& eclState);
int flowEbosEnergyMain(int argc, char** argv); int flowEbosEnergyMain(int argc, char** argv);
} }

4
flow/flow_ebos_gasoil.cpp
View File

@ -58,12 +58,12 @@ public:
}} }}
namespace Opm { namespace Opm {
void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowGasOilProblem) TypeTag; typedef TTAG(EclFlowGasOilProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }

6
flow/flow_ebos_gasoil.hpp
View File

@ -19,12 +19,10 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); void flowEbosGasOilSetDeck(Deck &deck, EclipseState& eclState);
int flowEbosGasOilMain(int argc, char** argv); int flowEbosGasOilMain(int argc, char** argv);
} }
#endif // FLOW_EBOS_GASOIL_HPP #endif // FLOW_EBOS_GASOIL_HPP

4
flow/flow_ebos_oilwater.cpp
View File

@ -58,12 +58,12 @@ public:
}} }}
namespace Opm { namespace Opm {
void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowOilWaterProblem) TypeTag; typedef TTAG(EclFlowOilWaterProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }
// ----------------- Main program ----------------- // ----------------- Main program -----------------

7
flow/flow_ebos_oilwater.hpp
View File

@ -19,13 +19,10 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); void flowEbosOilWaterSetDeck(Deck &deck, EclipseState& eclState);
int flowEbosOilWaterMain(int argc, char** argv); int flowEbosOilWaterMain(int argc, char** argv);
} }
#endif // FLOW_EBOS_OILWATER_HPP #endif // FLOW_EBOS_OILWATER_HPP

4
flow/flow_ebos_oilwater_polymer.cpp
View File

@ -59,12 +59,12 @@ public:
}} }}
namespace Opm { namespace Opm {
void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowOilWaterPolymerProblem) TypeTag; typedef TTAG(EclFlowOilWaterPolymerProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }
// ----------------- Main program ----------------- // ----------------- Main program -----------------

7
flow/flow_ebos_oilwater_polymer.hpp
View File

@ -19,13 +19,10 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); void flowEbosOilWaterPolymerSetDeck(Deck& deck, EclipseState& eclState);
int flowEbosOilWaterPolymerMain(int argc, char** argv); int flowEbosOilWaterPolymerMain(int argc, char** argv);
} }
#endif // FLOW_EBOS_OILWATER_POLYMER_HPP #endif // FLOW_EBOS_OILWATER_POLYMER_HPP

4
flow/flow_ebos_polymer.cpp
View File

@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowPolymerProblem, EnablePolymer, true);
}} }}
namespace Opm { namespace Opm {
void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowPolymerProblem) TypeTag; typedef TTAG(EclFlowPolymerProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }
// ----------------- Main program ----------------- // ----------------- Main program -----------------

4
flow/flow_ebos_polymer.hpp
View File

@ -19,11 +19,9 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig); void flowEbosPolymerSetDeck(Deck &deck, EclipseState& eclState);
int flowEbosPolymerMain(int argc, char** argv); int flowEbosPolymerMain(int argc, char** argv);
} }

4
flow/flow_ebos_solvent.cpp
View File

@ -36,12 +36,12 @@ SET_BOOL_PROP(EclFlowSolventProblem, EnableSolvent, true);
}} }}
namespace Opm { namespace Opm {
void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summaryConfig) void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState)
{ {
typedef TTAG(EclFlowSolventProblem) TypeTag; typedef TTAG(EclFlowSolventProblem) TypeTag;
typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard; typedef GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
Vanguard::setExternalDeck(&deck, &eclState, &schedule, &summaryConfig); Vanguard::setExternalDeck(&deck, &eclState);
} }

6
flow/flow_ebos_solvent.hpp
View File

@ -19,13 +19,11 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp> #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
namespace Opm { namespace Opm {
void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState, Schedule& schedule, SummaryConfig& summary_config); void flowEbosSolventSetDeck(Deck &deck, EclipseState& eclState);
int flowEbosSolventMain(int argc, char** argv); int flowEbosSolventMain(int argc, char** argv);
} }
#endif // FLOW_EBOS_SOLVENT_HPP #endif // FLOW_EBOS_SOLVENT_HPP