diff --git a/flow/flow_blackoil_legacyassembly_main.cpp b/flow/flow_blackoil_legacyassembly_main.cpp index 9fdf41bcd..0924906dd 100644 --- a/flow/flow_blackoil_legacyassembly_main.cpp +++ b/flow/flow_blackoil_legacyassembly_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBlackoilMainStandalone(argc, argv); + return Opm::flowBlackoilMainStandalone(argc, argv); } diff --git a/flow/flow_blackoil_main.cpp b/flow/flow_blackoil_main.cpp index 67a7e8164..6ede564ee 100644 --- a/flow/flow_blackoil_main.cpp +++ b/flow/flow_blackoil_main.cpp @@ -21,5 +21,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBlackoilTpfaMainStandalone(argc, argv); + return Opm::flowBlackoilTpfaMainStandalone(argc, argv); } diff --git a/flow/flow_brine_energy_main.cpp b/flow/flow_brine_energy_main.cpp index 8c5a3c066..abb487716 100644 --- a/flow/flow_brine_energy_main.cpp +++ b/flow/flow_brine_energy_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBrineEnergyMain(argc, argv); + return Opm::flowBrineEnergyMain(argc, argv); } diff --git a/flow/flow_brine_main.cpp b/flow/flow_brine_main.cpp index c938d26f8..fbc3805a6 100644 --- a/flow/flow_brine_main.cpp +++ b/flow/flow_brine_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBrineMainStandalone(argc, argv); + return Opm::flowBrineMainStandalone(argc, argv); } diff --git a/flow/flow_brine_precsalt_vapwat_main.cpp b/flow/flow_brine_precsalt_vapwat_main.cpp index 1a93e3cfb..60cdada04 100644 --- a/flow/flow_brine_precsalt_vapwat_main.cpp +++ b/flow/flow_brine_precsalt_vapwat_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBrinePrecsaltVapwatMainStandalone(argc, argv); + return Opm::flowBrinePrecsaltVapwatMainStandalone(argc, argv); } diff --git a/flow/flow_brine_saltprecipitation_main.cpp b/flow/flow_brine_saltprecipitation_main.cpp index fea54837e..6b4478c0c 100644 --- a/flow/flow_brine_saltprecipitation_main.cpp +++ b/flow/flow_brine_saltprecipitation_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosBrineSaltPrecipitationMainStandalone(argc, argv); + return Opm::flowBrineSaltPrecipitationMainStandalone(argc, argv); } diff --git a/flow/flow_ebos_blackoil.cpp b/flow/flow_ebos_blackoil.cpp index a1e04ca47..7429f3321 100644 --- a/flow/flow_ebos_blackoil.cpp +++ b/flow/flow_ebos_blackoil.cpp @@ -45,7 +45,7 @@ namespace Opm { namespace Opm { std::unique_ptr> -flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles) +flowBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -56,7 +56,7 @@ flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool output } // ----------------- Main program ----------------- -int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -67,7 +67,7 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output return mainfunc.execute(); } -int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv) +int flowBlackoilTpfaMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowProblemTPFA; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_blackoil.hpp b/flow/flow_ebos_blackoil.hpp index 9c9e3b441..0820dfc46 100644 --- a/flow/flow_ebos_blackoil.hpp +++ b/flow/flow_ebos_blackoil.hpp @@ -29,16 +29,16 @@ namespace Opm::Properties::TTag { namespace Opm { //! \brief Main function used in flow binary. -int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles); template class FlowMain; //! \brief Initialization function used in flow binary and python simulator. std::unique_ptr> - flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles); +flowBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_brine binary. -int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv); +int flowBlackoilTpfaMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_blackoil_legacyassembly.cpp b/flow/flow_ebos_blackoil_legacyassembly.cpp index 7b62d10c7..6e89c2a59 100644 --- a/flow/flow_ebos_blackoil_legacyassembly.cpp +++ b/flow/flow_ebos_blackoil_legacyassembly.cpp @@ -25,7 +25,7 @@ namespace Opm { std::unique_ptr> -flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles) +flowBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -36,13 +36,13 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile } // ----------------- Main program ----------------- -int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles) { - auto mainfunc = flowEbosBlackoilMainInit(argc, argv, outputCout, outputFiles); + auto mainfunc = flowBlackoilMainInit(argc, argv, outputCout, outputFiles); return mainfunc->execute(); } -int flowEbosBlackoilMainStandalone(int argc, char** argv) +int flowBlackoilMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_blackoil_legacyassembly.hpp b/flow/flow_ebos_blackoil_legacyassembly.hpp index db2c19175..b94a9515f 100644 --- a/flow/flow_ebos_blackoil_legacyassembly.hpp +++ b/flow/flow_ebos_blackoil_legacyassembly.hpp @@ -29,14 +29,14 @@ class State; namespace Properties { namespace TTag { struct FlowProblem; } } //! \brief Main function used in flow binary. -int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Initialization function used in flow binary and python simulator. std::unique_ptr> - flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles); +flowBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_blackoil binary. -int flowEbosBlackoilMainStandalone(int argc, char** argv); +int flowBlackoilMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_brine.cpp b/flow/flow_ebos_brine.cpp index ea69b0025..419b5ad47 100644 --- a/flow/flow_ebos_brine.cpp +++ b/flow/flow_ebos_brine.cpp @@ -39,7 +39,7 @@ struct EnableBrine { namespace Opm { // ----------------- Main program ----------------- -int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -50,7 +50,7 @@ int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosBrineMainStandalone(int argc, char** argv) +int flowBrineMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowBrineProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_brine.hpp b/flow/flow_ebos_brine.hpp index 9f885d166..c4f14dd1a 100644 --- a/flow/flow_ebos_brine.hpp +++ b/flow/flow_ebos_brine.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_brine binary. -int flowEbosBrineMainStandalone(int argc, char** argv); +int flowBrineMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_brine_energy.cpp b/flow/flow_ebos_brine_energy.cpp index b209cea3f..ef42910e3 100644 --- a/flow/flow_ebos_brine_energy.cpp +++ b/flow/flow_ebos_brine_energy.cpp @@ -34,7 +34,7 @@ struct EnableEnergy { }; } -int flowEbosBrineEnergyMain(int argc, char** argv) +int flowBrineEnergyMain(int argc, char** argv) { using TypeTag = Opm::Properties::TTag::FlowBrineEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_brine_energy.hpp b/flow/flow_ebos_brine_energy.hpp index 6d7b7b187..38d7fe932 100644 --- a/flow/flow_ebos_brine_energy.hpp +++ b/flow/flow_ebos_brine_energy.hpp @@ -19,7 +19,7 @@ #define FLOW_EBOS_BRINE_ENERGY_HPP namespace Opm { - int flowEbosBrineEnergyMain(int argc, char** argv); + int flowBrineEnergyMain(int argc, char** argv); } #endif diff --git a/flow/flow_ebos_brine_precsalt_vapwat.cpp b/flow/flow_ebos_brine_precsalt_vapwat.cpp index af8307e75..690723b8d 100644 --- a/flow/flow_ebos_brine_precsalt_vapwat.cpp +++ b/flow/flow_ebos_brine_precsalt_vapwat.cpp @@ -49,7 +49,7 @@ struct EnableVapwat { namespace Opm { // ----------------- Main program ----------------- -int flowEbosBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -60,7 +60,7 @@ int flowEbosBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool return mainfunc.execute(); } -int flowEbosBrinePrecsaltVapwatMainStandalone(int argc, char** argv) +int flowBrinePrecsaltVapwatMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowBrinePrecsaltVapwatProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_brine_precsalt_vapwat.hpp b/flow/flow_ebos_brine_precsalt_vapwat.hpp index e333c9d68..fa28e6f55 100644 --- a/flow/flow_ebos_brine_precsalt_vapwat.hpp +++ b/flow/flow_ebos_brine_precsalt_vapwat.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowBrinePrecsaltVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_brine binary. -int flowEbosBrinePrecsaltVapwatMainStandalone(int argc, char** argv); +int flowBrinePrecsaltVapwatMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_brine_saltprecipitation.cpp b/flow/flow_ebos_brine_saltprecipitation.cpp index 77df14455..44979d2f7 100644 --- a/flow/flow_ebos_brine_saltprecipitation.cpp +++ b/flow/flow_ebos_brine_saltprecipitation.cpp @@ -44,7 +44,7 @@ struct EnableSaltPrecipitation namespace Opm { // ----------------- Main program ----------------- -int flowEbosBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -55,7 +55,7 @@ int flowEbosBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, b return mainfunc.execute(); } -int flowEbosBrineSaltPrecipitationMainStandalone(int argc, char** argv) +int flowBrineSaltPrecipitationMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowBrineSaltPrecipitationProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_brine_saltprecipitation.hpp b/flow/flow_ebos_brine_saltprecipitation.hpp index 0b18e94f1..9832ccc21 100644 --- a/flow/flow_ebos_brine_saltprecipitation.hpp +++ b/flow/flow_ebos_brine_saltprecipitation.hpp @@ -17,15 +17,13 @@ #ifndef FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP #define FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP -#include - namespace Opm { //! \brief Main function used in flow binary. -int flowEbosBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowBrineSaltPrecipitationMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_brine binary. -int flowEbosBrineSaltPrecipitationMainStandalone(int argc, char** argv); +int flowBrineSaltPrecipitationMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_energy.cpp b/flow/flow_ebos_energy.cpp index f97a346a8..7f47692d6 100644 --- a/flow/flow_ebos_energy.cpp +++ b/flow/flow_ebos_energy.cpp @@ -40,7 +40,7 @@ struct EnableEnergy { namespace Opm { // ----------------- Main program ----------------- -int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -51,7 +51,7 @@ int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosEnergyMainStandalone(int argc, char** argv) +int flowEnergyMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_energy.hpp b/flow/flow_ebos_energy.hpp index 2e275b918..d2f106557 100644 --- a/flow/flow_ebos_energy.hpp +++ b/flow/flow_ebos_energy.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_energy binary. -int flowEbosEnergyMainStandalone(int argc, char** argv); +int flowEnergyMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_extbo.cpp b/flow/flow_ebos_extbo.cpp index 48bac32c5..c037f1089 100644 --- a/flow/flow_ebos_extbo.cpp +++ b/flow/flow_ebos_extbo.cpp @@ -39,7 +39,7 @@ struct EnableExtbo { namespace Opm { // ----------------- Main program ----------------- -int flowEbosExtboMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowExtboMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -50,7 +50,7 @@ int flowEbosExtboMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosExtboMainStandalone(int argc, char** argv) +int flowExtboMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowExtboProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_extbo.hpp b/flow/flow_ebos_extbo.hpp index d1bba590f..78b2a9ad3 100644 --- a/flow/flow_ebos_extbo.hpp +++ b/flow/flow_ebos_extbo.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosExtboMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowExtboMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_extbo binary. -int flowEbosExtboMainStandalone(int argc, char** argv); +int flowExtboMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_foam.cpp b/flow/flow_ebos_foam.cpp index 84aa0c459..0fcae9065 100644 --- a/flow/flow_ebos_foam.cpp +++ b/flow/flow_ebos_foam.cpp @@ -39,7 +39,7 @@ struct EnableFoam { namespace Opm { // ----------------- Main program ----------------- -int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowFoamMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -50,7 +50,7 @@ int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosFoamMainStandalone(int argc, char** argv) +int flowFoamMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowFoamProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_foam.hpp b/flow/flow_ebos_foam.hpp index 275e330b1..684b578f3 100644 --- a/flow/flow_ebos_foam.hpp +++ b/flow/flow_ebos_foam.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosFoamMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowFoamMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_foam binary. -int flowEbosFoamMainStandalone(int argc, char** argv); +int flowFoamMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gasoil.cpp b/flow/flow_ebos_gasoil.cpp index 0321964c3..41ba6e6e4 100644 --- a/flow/flow_ebos_gasoil.cpp +++ b/flow/flow_ebos_gasoil.cpp @@ -72,7 +72,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -83,7 +83,7 @@ int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosGasOilMainStandalone(int argc, char** argv) +int flowGasOilMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasOilProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gasoil.hpp b/flow/flow_ebos_gasoil.hpp index c84ec249b..f40cebdf1 100644 --- a/flow/flow_ebos_gasoil.hpp +++ b/flow/flow_ebos_gasoil.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasOilMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gasoil binary. -int flowEbosGasOilMainStandalone(int argc, char** argv); +int flowGasOilMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gasoil_energy.cpp b/flow/flow_ebos_gasoil_energy.cpp index 546b04dc0..6cadd53ed 100644 --- a/flow/flow_ebos_gasoil_energy.cpp +++ b/flow/flow_ebos_gasoil_energy.cpp @@ -78,7 +78,7 @@ struct EnableDispersion { static constex namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasOilEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasOilEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -89,7 +89,7 @@ int flowEbosGasOilEnergyMain(int argc, char** argv, bool outputCout, bool output return mainfunc.execute(); } -int flowEbosGasOilEnergyMainStandalone(int argc, char** argv) +int flowGasOilEnergyMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasOilEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gasoil_energy.hpp b/flow/flow_ebos_gasoil_energy.hpp index d126a0a21..f8ccc23e0 100644 --- a/flow/flow_ebos_gasoil_energy.hpp +++ b/flow/flow_ebos_gasoil_energy.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasOilEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasOilEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gasoil_energy binary. -int flowEbosGasOilEnergyMainStandalone(int argc, char** argv); +int flowGasOilEnergyMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gasoildiffuse.cpp b/flow/flow_ebos_gasoildiffuse.cpp index 8b317fba9..6e9f37918 100644 --- a/flow/flow_ebos_gasoildiffuse.cpp +++ b/flow/flow_ebos_gasoildiffuse.cpp @@ -74,7 +74,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -85,7 +85,7 @@ int flowEbosGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outpu return mainfunc.execute(); } -int flowEbosGasOilDiffuseMainStandalone(int argc, char** argv) +int flowGasOilDiffuseMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasOilDiffuseProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gasoildiffuse.hpp b/flow/flow_ebos_gasoildiffuse.hpp index c770eec20..119bcfb6e 100644 --- a/flow/flow_ebos_gasoildiffuse.hpp +++ b/flow/flow_ebos_gasoildiffuse.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasOilDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gasoil binary. -int flowEbosGasOilDiffuseMainStandalone(int argc, char** argv); +int flowGasOilDiffuseMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater.cpp b/flow/flow_ebos_gaswater.cpp index 3168967e5..05b41e949 100644 --- a/flow/flow_ebos_gaswater.cpp +++ b/flow/flow_ebos_gaswater.cpp @@ -76,7 +76,7 @@ namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -87,7 +87,7 @@ int flowEbosGasWaterMain(int argc, char** argv, bool outputCout, bool outputFile return mainfunc.execute(); } -int flowEbosGasWaterMainStandalone(int argc, char** argv) +int flowGasWaterMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater.hpp b/flow/flow_ebos_gaswater.hpp index 4abca6aa4..b2eff23db 100644 --- a/flow/flow_ebos_gaswater.hpp +++ b/flow/flow_ebos_gaswater.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater binary. -int flowEbosGasWaterMainStandalone(int argc, char** argv); +int flowGasWaterMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_brine.cpp b/flow/flow_ebos_gaswater_brine.cpp index 309ec1f1c..df4ed245a 100644 --- a/flow/flow_ebos_gaswater_brine.cpp +++ b/flow/flow_ebos_gaswater_brine.cpp @@ -71,7 +71,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -82,7 +82,7 @@ int flowEbosGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu return mainfunc.execute(); } -int flowEbosGasWaterBrineMainStandalone(int argc, char** argv) +int flowGasWaterBrineMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterBrineProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_brine.hpp b/flow/flow_ebos_gaswater_brine.hpp index af416fe8a..36a4a2b29 100644 --- a/flow/flow_ebos_gaswater_brine.hpp +++ b/flow/flow_ebos_gaswater_brine.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_brine binary. -int flowEbosGasWaterBrineMainStandalone(int argc, char** argv); +int flowGasWaterBrineMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_dissolution.cpp b/flow/flow_ebos_gaswater_dissolution.cpp index 1bfffb7f6..7c14c49b1 100644 --- a/flow/flow_ebos_gaswater_dissolution.cpp +++ b/flow/flow_ebos_gaswater_dissolution.cpp @@ -86,7 +86,7 @@ namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -97,7 +97,7 @@ int flowEbosGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool return mainfunc.execute(); } -int flowEbosGasWaterDissolutionMainStandalone(int argc, char** argv) +int flowGasWaterDissolutionMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterDissolutionProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_dissolution.hpp b/flow/flow_ebos_gaswater_dissolution.hpp index 3bdd8f21f..e36ebf857 100644 --- a/flow/flow_ebos_gaswater_dissolution.hpp +++ b/flow/flow_ebos_gaswater_dissolution.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterDissolutionMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_dissolution binary. -int flowEbosGasWaterDissolutionMainStandalone(int argc, char** argv); +int flowGasWaterDissolutionMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp b/flow/flow_ebos_gaswater_dissolution_diffuse.cpp index c91289826..6fd4886a0 100644 --- a/flow/flow_ebos_gaswater_dissolution_diffuse.cpp +++ b/flow/flow_ebos_gaswater_dissolution_diffuse.cpp @@ -89,7 +89,7 @@ namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -100,7 +100,7 @@ int flowEbosGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCou return mainfunc.execute(); } -int flowEbosGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv) +int flowGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterDissolutionDiffuseProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_dissolution_diffuse.hpp b/flow/flow_ebos_gaswater_dissolution_diffuse.hpp index 120530c05..69aef5b72 100644 --- a/flow/flow_ebos_gaswater_dissolution_diffuse.hpp +++ b/flow/flow_ebos_gaswater_dissolution_diffuse.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterDissolutionDiffuseMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_dissolution binary. -int flowEbosGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv); +int flowGasWaterDissolutionDiffuseMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_energy.cpp b/flow/flow_ebos_gaswater_energy.cpp index bfc23105c..bb707c8d0 100644 --- a/flow/flow_ebos_gaswater_energy.cpp +++ b/flow/flow_ebos_gaswater_energy.cpp @@ -94,7 +94,7 @@ namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -105,7 +105,7 @@ int flowEbosGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outp return mainfunc.execute(); } -int flowEbosGasWaterEnergyMainStandalone(int argc, char** argv) +int flowGasWaterEnergyMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_energy.hpp b/flow/flow_ebos_gaswater_energy.hpp index cd3c83a85..b47cf9ba0 100644 --- a/flow/flow_ebos_gaswater_energy.hpp +++ b/flow/flow_ebos_gaswater_energy.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater binary. -int flowEbosGasWaterEnergyMainStandalone(int argc, char** argv); +int flowGasWaterEnergyMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_saltprec_energy.cpp b/flow/flow_ebos_gaswater_saltprec_energy.cpp index 91e70453f..441721cce 100644 --- a/flow/flow_ebos_gaswater_saltprec_energy.cpp +++ b/flow/flow_ebos_gaswater_saltprec_energy.cpp @@ -84,7 +84,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -95,7 +95,7 @@ int flowEbosGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, b return mainfunc.execute(); } -int flowEbosGasWaterSaltprecEnergyMainStandalone(int argc, char** argv) +int flowGasWaterSaltprecEnergyMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterSaltprecEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_saltprec_energy.hpp b/flow/flow_ebos_gaswater_saltprec_energy.hpp index 0baa3e5d3..5f5f3d8cc 100644 --- a/flow/flow_ebos_gaswater_saltprec_energy.hpp +++ b/flow/flow_ebos_gaswater_saltprec_energy.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterSaltprecEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_saltprec_energy binary. -int flowEbosGasWaterSaltprecEnergyMainStandalone(int argc, char** argv); +int flowGasWaterSaltprecEnergyMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp index 4d9d0ca6d..898c414d7 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.cpp +++ b/flow/flow_ebos_gaswater_saltprec_vapwat.cpp @@ -79,7 +79,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -90,7 +90,7 @@ int flowEbosGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, b return mainfunc.execute(); } -int flowEbosGasWaterSaltprecVapwatMainStandalone(int argc, char** argv) +int flowGasWaterSaltprecVapwatMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterSaltprecVapwatProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_saltprec_vapwat.hpp b/flow/flow_ebos_gaswater_saltprec_vapwat.hpp index 69b8af1d3..419b1f52e 100644 --- a/flow/flow_ebos_gaswater_saltprec_vapwat.hpp +++ b/flow/flow_ebos_gaswater_saltprec_vapwat.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterSaltprecVapwatMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_brine binary. -int flowEbosGasWaterSaltprecVapwatMainStandalone(int argc, char** argv); +int flowGasWaterSaltprecVapwatMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_gaswater_solvent.cpp b/flow/flow_ebos_gaswater_solvent.cpp index 44de475cb..eb4fcdbbd 100644 --- a/flow/flow_ebos_gaswater_solvent.cpp +++ b/flow/flow_ebos_gaswater_solvent.cpp @@ -69,7 +69,7 @@ namespace Opm { // ----------------- Main program ----------------- -int flowEbosGasWaterSolventMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowGasWaterSolventMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -80,7 +80,7 @@ int flowEbosGasWaterSolventMain(int argc, char** argv, bool outputCout, bool out return mainfunc.execute(); } -int flowEbosGasWaterSolventMainStandalone(int argc, char** argv) +int flowGasWaterSolventMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowGasWaterSolventProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_gaswater_solvent.hpp b/flow/flow_ebos_gaswater_solvent.hpp index 7b21bc16d..ca4bdfd06 100644 --- a/flow/flow_ebos_gaswater_solvent.hpp +++ b/flow/flow_ebos_gaswater_solvent.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosGasWaterSolventMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowGasWaterSolventMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_gaswater_solvent binary. -int flowEbosGasWaterSolventMainStandalone(int argc, char** argv); +int flowGasWaterSolventMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_micp.cpp b/flow/flow_ebos_micp.cpp index 00307c850..1ed91190d 100644 --- a/flow/flow_ebos_micp.cpp +++ b/flow/flow_ebos_micp.cpp @@ -63,7 +63,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosMICPMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowMICPMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -74,7 +74,7 @@ int flowEbosMICPMain(int argc, char** argv, bool outputCout, bool outputFiles) return mainfunc.execute(); } -int flowEbosMICPMainStandalone(int argc, char** argv) +int flowMICPMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowMICPProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_micp.hpp b/flow/flow_ebos_micp.hpp index 193a6f1dc..2ca8e583b 100644 --- a/flow/flow_ebos_micp.hpp +++ b/flow/flow_ebos_micp.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosMICPMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowMICPMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_micp binary. -int flowEbosMICPMainStandalone(int argc, char** argv); +int flowMICPMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_oilwater.cpp b/flow/flow_ebos_oilwater.cpp index f0d0f802e..99636659f 100644 --- a/flow/flow_ebos_oilwater.cpp +++ b/flow/flow_ebos_oilwater.cpp @@ -73,7 +73,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowOilWaterMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -84,7 +84,7 @@ int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFile return mainfunc.execute(); } -int flowEbosOilWaterMainStandalone(int argc, char** argv) +int flowOilWaterMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowOilWaterProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_oilwater.hpp b/flow/flow_ebos_oilwater.hpp index 205651782..e46f51ca1 100644 --- a/flow/flow_ebos_oilwater.hpp +++ b/flow/flow_ebos_oilwater.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main functon used in main flow binary. -int flowEbosOilWaterMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowOilWaterMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_oilwater binary. -int flowEbosOilWaterMainStandalone(int argc, char** argv); +int flowOilWaterMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_oilwater_brine.cpp b/flow/flow_ebos_oilwater_brine.cpp index 5f83ae669..032eea2cf 100644 --- a/flow/flow_ebos_oilwater_brine.cpp +++ b/flow/flow_ebos_oilwater_brine.cpp @@ -63,7 +63,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -74,7 +74,7 @@ int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outpu return mainfunc.execute(); } -int flowEbosOilWaterBrineMainStandalone(int argc, char** argv) +int flowOilWaterBrineMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowOilWaterBrineProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_oilwater_brine.hpp b/flow/flow_ebos_oilwater_brine.hpp index 66e41554d..06028d135 100644 --- a/flow/flow_ebos_oilwater_brine.hpp +++ b/flow/flow_ebos_oilwater_brine.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowOilWaterBrineMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_oilwater_brine binary. -int flowEbosOilWaterBrineMainStandalone(int argc, char** argv); +int flowOilWaterBrineMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_oilwater_polymer.cpp b/flow/flow_ebos_oilwater_polymer.cpp index e179dd13a..40b00bff3 100644 --- a/flow/flow_ebos_oilwater_polymer.cpp +++ b/flow/flow_ebos_oilwater_polymer.cpp @@ -63,7 +63,7 @@ public: namespace Opm { // ----------------- Main program ----------------- -int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -74,7 +74,7 @@ int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool out return mainfunc.execute(); } -int flowEbosOilWaterPolymerMainStandalone(int argc, char** argv) +int flowOilWaterPolymerMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowOilWaterPolymerProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_oilwater_polymer.hpp b/flow/flow_ebos_oilwater_polymer.hpp index 163eee207..d6e537fc4 100644 --- a/flow/flow_ebos_oilwater_polymer.hpp +++ b/flow/flow_ebos_oilwater_polymer.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main functon used in main flow binary. -int flowEbosOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowOilWaterPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_oilwater_polymer binary. -int flowEbosOilWaterPolymerMainStandalone(int argc, char** argv); +int flowOilWaterPolymerMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.cpp b/flow/flow_ebos_oilwater_polymer_injectivity.cpp index 8a9628ee4..2c3beaba3 100644 --- a/flow/flow_ebos_oilwater_polymer_injectivity.cpp +++ b/flow/flow_ebos_oilwater_polymer_injectivity.cpp @@ -68,16 +68,9 @@ public: }} namespace Opm { -/* void flowEbosOilWaterPolymerInjectivitySetDeck(Deck& deck, EclipseState& eclState) -{ - using TypeTag = Properties::TTag::EclFlowOilWaterPolymerInjectivityProblem; - using Vanguard = GetPropType; - - Vanguard::setExternalDeck(std::move(deck, &eclState)); -} */ // ----------------- Main program ----------------- -int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -88,7 +81,7 @@ int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCou return mainfunc.execute(); } -int flowEbosOilWaterPolymerInjectivityMainStandalone(int argc, char** argv) +int flowOilWaterPolymerInjectivityMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowOilWaterPolymerInjectivityProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_oilwater_polymer_injectivity.hpp b/flow/flow_ebos_oilwater_polymer_injectivity.hpp index fd6e467e3..23d58c0ac 100644 --- a/flow/flow_ebos_oilwater_polymer_injectivity.hpp +++ b/flow/flow_ebos_oilwater_polymer_injectivity.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowOilWaterPolymerInjectivityMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_oilwater_polymer_injectivity binary. -int flowEbosOilWaterPolymerInjectivityMainStandalone(int argc, char** argv); +int flowOilWaterPolymerInjectivityMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_onephase.cpp b/flow/flow_ebos_onephase.cpp index 5b4579c05..903f4105e 100644 --- a/flow/flow_ebos_onephase.cpp +++ b/flow/flow_ebos_onephase.cpp @@ -69,7 +69,7 @@ public: } // namespace Opm::Properties // ----------------- Main program ----------------- -int flowEbosWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -80,7 +80,7 @@ int flowEbosWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFil return mainfunc.execute(); } -int flowEbosWaterOnlyMainStandalone(int argc, char** argv) +int flowWaterOnlyMainStandalone(int argc, char** argv) { using TypeTag = Opm::Properties::TTag::FlowWaterOnlyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_onephase.hpp b/flow/flow_ebos_onephase.hpp index 3a7b4db92..fced20a67 100644 --- a/flow/flow_ebos_onephase.hpp +++ b/flow/flow_ebos_onephase.hpp @@ -25,10 +25,10 @@ namespace Opm { //! \brief Main functon used in main flow binary. -int flowEbosWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowWaterOnlyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_onephase binary. -int flowEbosWaterOnlyMainStandalone(int argc, char** argv); +int flowWaterOnlyMainStandalone(int argc, char** argv); } #endif diff --git a/flow/flow_ebos_onephase_energy.cpp b/flow/flow_ebos_onephase_energy.cpp index 1bd1e3b0b..9fd3d36cc 100644 --- a/flow/flow_ebos_onephase_energy.cpp +++ b/flow/flow_ebos_onephase_energy.cpp @@ -64,7 +64,7 @@ public: } // namespace Opm::Properties // ----------------- Main program ----------------- -int flowEbosWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -75,7 +75,7 @@ int flowEbosWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool out return mainfunc.execute(); } -int flowEbosWaterOnlyEnergyMainStandalone(int argc, char** argv) +int flowWaterOnlyEnergyMainStandalone(int argc, char** argv) { using TypeTag = Opm::Properties::TTag::FlowWaterOnlyEnergyProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_onephase_energy.hpp b/flow/flow_ebos_onephase_energy.hpp index 5e32654a3..6669969c3 100644 --- a/flow/flow_ebos_onephase_energy.hpp +++ b/flow/flow_ebos_onephase_energy.hpp @@ -25,10 +25,10 @@ namespace Opm { //! \brief Main functon used in main flow binary. -int flowEbosWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowWaterOnlyEnergyMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_onephase_energy binary. -int flowEbosWaterOnlyEnergyMainStandalone(int argc, char** argv); +int flowWaterOnlyEnergyMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_polymer.cpp b/flow/flow_ebos_polymer.cpp index b82a464af..eb3857a7d 100644 --- a/flow/flow_ebos_polymer.cpp +++ b/flow/flow_ebos_polymer.cpp @@ -39,7 +39,7 @@ struct EnablePolymer { namespace Opm { // ----------------- Main program ----------------- -int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -50,7 +50,7 @@ int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles return mainfunc.execute(); } -int flowEbosPolymerMainStandalone(int argc, char** argv) +int flowPolymerMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowPolymerProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_polymer.hpp b/flow/flow_ebos_polymer.hpp index 54900c38f..925286b59 100644 --- a/flow/flow_ebos_polymer.hpp +++ b/flow/flow_ebos_polymer.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles); +int flowPolymerMain(int argc, char** argv, bool outputCout, bool outputFiles); //! \brief Main function used in flow_polymer binary. -int flowEbosPolymerMainStandalone(int argc, char** argv); +int flowPolymerMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_solvent.cpp b/flow/flow_ebos_solvent.cpp index f1c4d5ce2..c7c51e7a0 100644 --- a/flow/flow_ebos_solvent.cpp +++ b/flow/flow_ebos_solvent.cpp @@ -39,7 +39,7 @@ struct EnableSolvent { namespace Opm { // ----------------- Main program ----------------- -int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowSolventMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -50,7 +50,7 @@ int flowEbosSolventMain(int argc, char** argv, bool outputCout, bool outputFiles return mainfunc.execute(); } -int flowEbosSolventMainStandalone(int argc, char** argv) +int flowSolventMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowSolventProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_solvent.hpp b/flow/flow_ebos_solvent.hpp index abf828e29..bd31114bf 100644 --- a/flow/flow_ebos_solvent.hpp +++ b/flow/flow_ebos_solvent.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosSolventMain(int argc, char** argv, bool outoutCout, bool outputFiles); +int flowSolventMain(int argc, char** argv, bool outoutCout, bool outputFiles); //! \brief Main function used in flow_solvent binary. -int flowEbosSolventMainStandalone(int argc, char** argv); +int flowSolventMainStandalone(int argc, char** argv); } diff --git a/flow/flow_ebos_solvent_foam.cpp b/flow/flow_ebos_solvent_foam.cpp index 892d8ba14..f8ad6585e 100644 --- a/flow/flow_ebos_solvent_foam.cpp +++ b/flow/flow_ebos_solvent_foam.cpp @@ -44,7 +44,7 @@ struct EnableFoam { namespace Opm { // ----------------- Main program ----------------- -int flowEbosSolventFoamMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowSolventFoamMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -55,7 +55,7 @@ int flowEbosSolventFoamMain(int argc, char** argv, bool outputCout, bool outputF return mainfunc.execute(); } -int flowEbosSolventFoamMainStandalone(int argc, char** argv) +int flowSolventFoamMainStandalone(int argc, char** argv) { using TypeTag = Properties::TTag::FlowSolventFoamProblem; auto mainObject = std::make_unique(argc, argv); diff --git a/flow/flow_ebos_solvent_foam.hpp b/flow/flow_ebos_solvent_foam.hpp index eddb10ca8..dd97d631c 100644 --- a/flow/flow_ebos_solvent_foam.hpp +++ b/flow/flow_ebos_solvent_foam.hpp @@ -20,10 +20,10 @@ namespace Opm { //! \brief Main function used in flow binary. -int flowEbosSolventFoamMain(int argc, char** argv, bool outoutCout, bool outputFiles); +int flowSolventFoamMain(int argc, char** argv, bool outoutCout, bool outputFiles); //! \brief Main function used in flow_solvent_foam binary. -int flowEbosSolventFoamMainStandalone(int argc, char** argv); +int flowSolventFoamMainStandalone(int argc, char** argv); } diff --git a/flow/flow_energy_main.cpp b/flow/flow_energy_main.cpp index fb94f313a..5fc2cbf90 100644 --- a/flow/flow_energy_main.cpp +++ b/flow/flow_energy_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosEnergyMainStandalone(argc, argv); + return Opm::flowEnergyMainStandalone(argc, argv); } diff --git a/flow/flow_extbo_main.cpp b/flow/flow_extbo_main.cpp index 283950645..9aa23e087 100644 --- a/flow/flow_extbo_main.cpp +++ b/flow/flow_extbo_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosExtboMainStandalone(argc, argv); + return Opm::flowExtboMainStandalone(argc, argv); } diff --git a/flow/flow_foam_main.cpp b/flow/flow_foam_main.cpp index 57fc375d5..07177843c 100644 --- a/flow/flow_foam_main.cpp +++ b/flow/flow_foam_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosFoamMainStandalone(argc, argv); + return Opm::flowFoamMainStandalone(argc, argv); } diff --git a/flow/flow_gasoil_energy_main.cpp b/flow/flow_gasoil_energy_main.cpp index a72a3a694..f3623ecd8 100644 --- a/flow/flow_gasoil_energy_main.cpp +++ b/flow/flow_gasoil_energy_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasOilEnergyMainStandalone(argc, argv); + return Opm::flowGasOilEnergyMainStandalone(argc, argv); } diff --git a/flow/flow_gasoil_main.cpp b/flow/flow_gasoil_main.cpp index 3cfd3d74a..6e1c38978 100644 --- a/flow/flow_gasoil_main.cpp +++ b/flow/flow_gasoil_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasOilMainStandalone(argc, argv); + return Opm::flowGasOilMainStandalone(argc, argv); } diff --git a/flow/flow_gasoildiffuse_main.cpp b/flow/flow_gasoildiffuse_main.cpp index 5e819958f..b3c91784a 100644 --- a/flow/flow_gasoildiffuse_main.cpp +++ b/flow/flow_gasoildiffuse_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasOilDiffuseMainStandalone(argc, argv); + return Opm::flowGasOilDiffuseMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_brine_main.cpp b/flow/flow_gaswater_brine_main.cpp index 1520ac4e9..f8cada61c 100644 --- a/flow/flow_gaswater_brine_main.cpp +++ b/flow/flow_gaswater_brine_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterBrineMainStandalone(argc, argv); + return Opm::flowGasWaterBrineMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_dissolution_diffuse_main.cpp b/flow/flow_gaswater_dissolution_diffuse_main.cpp index 1ba4a5967..fd6e86584 100644 --- a/flow/flow_gaswater_dissolution_diffuse_main.cpp +++ b/flow/flow_gaswater_dissolution_diffuse_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterDissolutionDiffuseMainStandalone(argc, argv); + return Opm::flowGasWaterDissolutionDiffuseMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_dissolution_main.cpp b/flow/flow_gaswater_dissolution_main.cpp index 43f11a1d3..6399dd633 100644 --- a/flow/flow_gaswater_dissolution_main.cpp +++ b/flow/flow_gaswater_dissolution_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterDissolutionMainStandalone(argc, argv); + return Opm::flowGasWaterDissolutionMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_energy_main.cpp b/flow/flow_gaswater_energy_main.cpp index b8136f099..815f52474 100644 --- a/flow/flow_gaswater_energy_main.cpp +++ b/flow/flow_gaswater_energy_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterEnergyMainStandalone(argc, argv); + return Opm::flowGasWaterEnergyMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_main.cpp b/flow/flow_gaswater_main.cpp index 30a4c821d..77a16ec04 100644 --- a/flow/flow_gaswater_main.cpp +++ b/flow/flow_gaswater_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterMainStandalone(argc, argv); + return Opm::flowGasWaterMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_saltprec_energy_main.cpp b/flow/flow_gaswater_saltprec_energy_main.cpp index 8cbf5ac75..12097208b 100644 --- a/flow/flow_gaswater_saltprec_energy_main.cpp +++ b/flow/flow_gaswater_saltprec_energy_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterSaltprecEnergyMainStandalone(argc, argv); + return Opm::flowGasWaterSaltprecEnergyMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_saltprec_vapwat_main.cpp b/flow/flow_gaswater_saltprec_vapwat_main.cpp index 0560a751e..e7d7e922d 100644 --- a/flow/flow_gaswater_saltprec_vapwat_main.cpp +++ b/flow/flow_gaswater_saltprec_vapwat_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterSaltprecVapwatMainStandalone(argc, argv); + return Opm::flowGasWaterSaltprecVapwatMainStandalone(argc, argv); } diff --git a/flow/flow_gaswater_solvent_main.cpp b/flow/flow_gaswater_solvent_main.cpp index eba1fe96d..9d074eaea 100644 --- a/flow/flow_gaswater_solvent_main.cpp +++ b/flow/flow_gaswater_solvent_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosGasWaterSolventMainStandalone(argc, argv); + return Opm::flowGasWaterSolventMainStandalone(argc, argv); } diff --git a/flow/flow_micp_main.cpp b/flow/flow_micp_main.cpp index e77c2e9e2..e28cc73d5 100644 --- a/flow/flow_micp_main.cpp +++ b/flow/flow_micp_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosMICPMainStandalone(argc, argv); + return Opm::flowMICPMainStandalone(argc, argv); } diff --git a/flow/flow_oilwater_brine_main.cpp b/flow/flow_oilwater_brine_main.cpp index 2f6a03103..d33bee4a5 100644 --- a/flow/flow_oilwater_brine_main.cpp +++ b/flow/flow_oilwater_brine_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosOilWaterBrineMainStandalone(argc, argv); + return Opm::flowOilWaterBrineMainStandalone(argc, argv); } diff --git a/flow/flow_oilwater_main.cpp b/flow/flow_oilwater_main.cpp index 40e13d435..d06d0e908 100644 --- a/flow/flow_oilwater_main.cpp +++ b/flow/flow_oilwater_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosOilWaterMainStandalone(argc, argv); + return Opm::flowOilWaterMainStandalone(argc, argv); } diff --git a/flow/flow_oilwater_polymer_injectivity_main.cpp b/flow/flow_oilwater_polymer_injectivity_main.cpp index db989e13e..5eea3829d 100644 --- a/flow/flow_oilwater_polymer_injectivity_main.cpp +++ b/flow/flow_oilwater_polymer_injectivity_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosOilWaterPolymerInjectivityMainStandalone(argc, argv); + return Opm::flowOilWaterPolymerInjectivityMainStandalone(argc, argv); } diff --git a/flow/flow_oilwater_polymer_main.cpp b/flow/flow_oilwater_polymer_main.cpp index 1e377bb19..d20bcf442 100644 --- a/flow/flow_oilwater_polymer_main.cpp +++ b/flow/flow_oilwater_polymer_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosOilWaterPolymerMainStandalone(argc, argv); + return Opm::flowOilWaterPolymerMainStandalone(argc, argv); } diff --git a/flow/flow_onephase_energy_main.cpp b/flow/flow_onephase_energy_main.cpp index 6c3e436b1..036eb969b 100644 --- a/flow/flow_onephase_energy_main.cpp +++ b/flow/flow_onephase_energy_main.cpp @@ -23,5 +23,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosWaterOnlyEnergyMainStandalone(argc,argv); + return Opm::flowWaterOnlyEnergyMainStandalone(argc,argv); } diff --git a/flow/flow_onephase_main.cpp b/flow/flow_onephase_main.cpp index b1133df38..0df28b999 100644 --- a/flow/flow_onephase_main.cpp +++ b/flow/flow_onephase_main.cpp @@ -24,5 +24,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosWaterOnlyMainStandalone(argc, argv); + return Opm::flowWaterOnlyMainStandalone(argc, argv); } diff --git a/flow/flow_polymer_main.cpp b/flow/flow_polymer_main.cpp index 127972785..29a466a77 100644 --- a/flow/flow_polymer_main.cpp +++ b/flow/flow_polymer_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosPolymerMainStandalone(argc, argv); + return Opm::flowPolymerMainStandalone(argc, argv); } diff --git a/flow/flow_solvent_foam_main.cpp b/flow/flow_solvent_foam_main.cpp index 688a11b32..f3f03c3fa 100644 --- a/flow/flow_solvent_foam_main.cpp +++ b/flow/flow_solvent_foam_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosSolventFoamMainStandalone(argc, argv); + return Opm::flowSolventFoamMainStandalone(argc, argv); } diff --git a/flow/flow_solvent_main.cpp b/flow/flow_solvent_main.cpp index 0c48f6874..df44a63e8 100644 --- a/flow/flow_solvent_main.cpp +++ b/flow/flow_solvent_main.cpp @@ -20,5 +20,5 @@ int main(int argc, char** argv) { - return Opm::flowEbosSolventMainStandalone(argc, argv); + return Opm::flowSolventMainStandalone(argc, argv); } diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index ba951807e..cb1a2f9ba 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -107,7 +107,7 @@ class WellTestState; // ----------------- Main program ----------------- template -int flowEbosMain(int argc, char** argv, bool outputCout, bool outputFiles) +int flowMain(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -172,17 +172,17 @@ public: using FlowMainType = FlowMain; // To be called from the Python interface code. Only do the - // initialization and then return a pointer to the FlowEbosMain + // initialization and then return a pointer to the FlowMain // object that can later be accessed directly from the Python interface // to e.g. advance the simulator one report step - std::unique_ptr initFlowEbosBlackoil(int& exitCode) + std::unique_ptr initFlowBlackoil(int& exitCode) { exitCode = EXIT_SUCCESS; if (initialize_(exitCode)) { // TODO: check that this deck really represents a blackoil // case. E.g. check that number of phases == 3 this->setupVanguard(); - return flowEbosBlackoilTpfaMainInit( + return flowBlackoilTpfaMainInit( argc_, argv_, outputCout_, outputFiles_); } else { //NOTE: exitCode was set by initialize_() above; @@ -282,7 +282,7 @@ private: int dispatchStatic_() { this->setupVanguard(); - return flowEbosMain(argc_, argv_, outputCout_, outputFiles_); + return flowMain(argc_, argv_, outputCout_, outputFiles_); } /// \brief Initialize @@ -470,10 +470,10 @@ private: return EXIT_FAILURE; } - return flowEbosMICPMain(this->argc_, - this->argv_, - this->outputCout_, - this->outputFiles_); + return flowMICPMain(this->argc_, + this->argv_, + this->outputCout_, + this->outputFiles_); } int runTwoPhase(const Phases& phases) @@ -485,9 +485,9 @@ private: // oil-gas if (phases.active( Phase::OIL ) && phases.active( Phase::GAS )) { if (diffusive) { - return flowEbosGasOilDiffuseMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasOilDiffuseMain(argc_, argv_, outputCout_, outputFiles_); } else { - return flowEbosGasOilMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasOilMain(argc_, argv_, outputCout_, outputFiles_); } } @@ -499,16 +499,16 @@ private: } return EXIT_FAILURE; } - return flowEbosOilWaterMain(argc_, argv_, outputCout_, outputFiles_); + return flowOilWaterMain(argc_, argv_, outputCout_, outputFiles_); } // gas-water else if ( phases.active( Phase::GAS ) && phases.active( Phase::WATER ) ) { if (disgasw || vapwat) { if (diffusive) { - return flowEbosGasWaterDissolutionDiffuseMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterDissolutionDiffuseMain(argc_, argv_, outputCout_, outputFiles_); } - return flowEbosGasWaterDissolutionMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterDissolutionMain(argc_, argv_, outputCout_, outputFiles_); } if (diffusive) { if (outputCout_) { @@ -517,7 +517,7 @@ private: return EXIT_FAILURE; } - return flowEbosGasWaterMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterMain(argc_, argv_, outputCout_, outputFiles_); } else { if (outputCout_) { @@ -543,20 +543,20 @@ private: if (phases.active(Phase::POLYMW)) { // only oil water two phase for now assert (phases.size() == 4); - return flowEbosOilWaterPolymerInjectivityMain(argc_, argv_, outputCout_, outputFiles_); + return flowOilWaterPolymerInjectivityMain(argc_, argv_, outputCout_, outputFiles_); } if (phases.size() == 3) { // oil water polymer case - return flowEbosOilWaterPolymerMain(argc_, argv_, outputCout_, outputFiles_); + return flowOilWaterPolymerMain(argc_, argv_, outputCout_, outputFiles_); } else { - return flowEbosPolymerMain(argc_, argv_, outputCout_, outputFiles_); + return flowPolymerMain(argc_, argv_, outputCout_, outputFiles_); } } int runFoam() { - return flowEbosFoamMain(argc_, argv_, outputCout_, outputFiles_); + return flowFoamMain(argc_, argv_, outputCout_, outputFiles_); } int runWaterOnly(const Phases& phases) @@ -569,7 +569,7 @@ private: return EXIT_FAILURE; } - return flowEbosWaterOnlyMain(argc_, argv_, outputCout_, outputFiles_); + return flowWaterOnlyMain(argc_, argv_, outputCout_, outputFiles_); } int runWaterOnlyEnergy(const Phases& phases) @@ -582,7 +582,7 @@ private: return EXIT_FAILURE; } - return flowEbosWaterOnlyEnergyMain(argc_, argv_, outputCout_, outputFiles_); + return flowWaterOnlyEnergyMain(argc_, argv_, outputCout_, outputFiles_); } int runBrine(const Phases& phases) @@ -598,30 +598,30 @@ private: if (phases.size() == 3) { if (phases.active(Phase::OIL)){ // oil water brine case - return flowEbosOilWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); + return flowOilWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); } if (phases.active(Phase::GAS)){ // gas water brine case if (eclipseState_->getSimulationConfig().hasPRECSALT() && eclipseState_->getSimulationConfig().hasVAPWAT()) { //case with water vaporization into gas phase and salt precipitation - return flowEbosGasWaterSaltprecVapwatMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterSaltprecVapwatMain(argc_, argv_, outputCout_, outputFiles_); } else { - return flowEbosGasWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); } } } else if (eclipseState_->getSimulationConfig().hasPRECSALT()) { if (eclipseState_->getSimulationConfig().hasVAPWAT()) { //case with water vaporization into gas phase and salt precipitation - return flowEbosBrinePrecsaltVapwatMain(argc_, argv_, outputCout_, outputFiles_); + return flowBrinePrecsaltVapwatMain(argc_, argv_, outputCout_, outputFiles_); } else { - return flowEbosBrineSaltPrecipitationMain(argc_, argv_, outputCout_, outputFiles_); + return flowBrineSaltPrecipitationMain(argc_, argv_, outputCout_, outputFiles_); } } else { - return flowEbosBrineMain(argc_, argv_, outputCout_, outputFiles_); + return flowBrineMain(argc_, argv_, outputCout_, outputFiles_); } return EXIT_FAILURE; @@ -630,16 +630,16 @@ private: int runSolvent(const Phases& phases) { if (phases.active(Phase::FOAM)) { - return flowEbosSolventFoamMain(argc_, argv_, outputCout_, outputFiles_); + return flowSolventFoamMain(argc_, argv_, outputCout_, outputFiles_); } // solvent + gas + water if (!phases.active( Phase::OIL ) && phases.active( Phase::WATER ) && phases.active( Phase::GAS )) { - return flowEbosGasWaterSolventMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterSolventMain(argc_, argv_, outputCout_, outputFiles_); } // solvent + gas + water + oil if (phases.active( Phase::OIL ) && phases.active( Phase::WATER ) && phases.active( Phase::GAS )) { - return flowEbosSolventMain(argc_, argv_, outputCout_, outputFiles_); + return flowSolventMain(argc_, argv_, outputCout_, outputFiles_); } if (outputCout_) @@ -651,26 +651,26 @@ private: int runExtendedBlackOil() { - return flowEbosExtboMain(argc_, argv_, outputCout_, outputFiles_); + return flowExtboMain(argc_, argv_, outputCout_, outputFiles_); } int runThermal(const Phases& phases) { // oil-gas-thermal if (!phases.active( Phase::WATER ) && phases.active( Phase::OIL ) && phases.active( Phase::GAS )) { - return flowEbosGasOilEnergyMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasOilEnergyMain(argc_, argv_, outputCout_, outputFiles_); } // water-gas-thermal if (!phases.active( Phase::OIL ) && phases.active( Phase::WATER ) && phases.active( Phase::GAS )) { if (phases.active(Phase::BRINE)){ - return flowEbosGasWaterSaltprecEnergyMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterSaltprecEnergyMain(argc_, argv_, outputCout_, outputFiles_); } - return flowEbosGasWaterEnergyMain(argc_, argv_, outputCout_, outputFiles_); + return flowGasWaterEnergyMain(argc_, argv_, outputCout_, outputFiles_); } - return flowEbosEnergyMain(argc_, argv_, outputCout_, outputFiles_); + return flowEnergyMain(argc_, argv_, outputCout_, outputFiles_); } int runBlackOil() @@ -679,9 +679,9 @@ private: if (diffusive) { // Use the traditional linearizer, as the TpfaLinearizer does not // support the diffusion module yet. - return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_); + return flowBlackoilMain(argc_, argv_, outputCout_, outputFiles_); } else { - return flowEbosBlackoilTpfaMain(argc_, argv_, outputCout_, outputFiles_); + return flowBlackoilTpfaMain(argc_, argv_, outputCout_, outputFiles_); } } diff --git a/python/simulators/PyBlackOilSimulator.cpp b/python/simulators/PyBlackOilSimulator.cpp index d71cf407c..5ccedbf6b 100644 --- a/python/simulators/PyBlackOilSimulator.cpp +++ b/python/simulators/PyBlackOilSimulator.cpp @@ -38,7 +38,7 @@ namespace Opm { std::unique_ptr> -flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles) +flowBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles) { // we always want to use the default locale, and thus spare us the trouble // with incorrect locale settings. @@ -218,7 +218,7 @@ int PyBlackOilSimulator::stepInit() this->main_ = std::make_unique( this->deck_filename_ ); } int exit_code = EXIT_SUCCESS; - this->main_ebos_ = this->main_->initFlowEbosBlackoil(exit_code); + this->main_ebos_ = this->main_->initFlowBlackoil(exit_code); if (this->main_ebos_) { int result = this->main_ebos_->executeInitStep(); this->has_run_init_ = true;