Drop ebos in function names

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

flow/flow_ebos_blackoil.cpp

@@ -45,7 +45,7 @@ namespace Opm {
 namespace Opm
 {
 std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
-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<Opm::Main>(argc, argv);

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 TypeTag> class FlowMain;
 
 //! \brief Initialization function used in flow binary and python simulator.
 std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
-    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);
 
 }
 

flow/flow_ebos_blackoil_legacyassembly.cpp

@@ -25,7 +25,7 @@
 namespace Opm {
 
 std::unique_ptr<FlowMain<Properties::TTag::FlowProblem>>
-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<Opm::Main>(argc, argv);

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<FlowMain<Properties::TTag::FlowProblem>>
-    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);
 
 }
 

flow/flow_ebos_brine.cpp

@@ -39,7 +39,7 @@ struct EnableBrine<TypeTag, TTag::FlowBrineProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_brine_energy.cpp

@@ -34,7 +34,7 @@ struct EnableEnergy<TypeTag, TTag::FlowBrineEnergyProblem> {
 };
 }
 
-int flowEbosBrineEnergyMain(int argc, char** argv)
+int flowBrineEnergyMain(int argc, char** argv)
 {
     using TypeTag = Opm::Properties::TTag::FlowBrineEnergyProblem;
     auto mainObject = std::make_unique<Opm::Main>(argc, argv);

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

flow/flow_ebos_brine_precsalt_vapwat.cpp

@@ -49,7 +49,7 @@ struct EnableVapwat<TypeTag, TTag::FlowBrinePrecsaltVapwatProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_brine_saltprecipitation.cpp

@@ -44,7 +44,7 @@ struct EnableSaltPrecipitation<TypeTag, TTag::FlowBrineSaltPrecipitationProblem>
 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<Opm::Main>(argc, argv);

flow/flow_ebos_brine_saltprecipitation.hpp

@@ -17,15 +17,13 @@
 #ifndef FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
 #define FLOW_EBOS_BRINE_SALTPRECIPITATION_HPP
 
-#include <memory>
-
 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);
 
 }
 

flow/flow_ebos_energy.cpp

@@ -40,7 +40,7 @@ struct EnableEnergy<TypeTag, TTag::FlowEnergyProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_extbo.cpp

@@ -39,7 +39,7 @@ struct EnableExtbo<TypeTag, TTag::FlowExtboProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_foam.cpp

@@ -39,7 +39,7 @@ struct EnableFoam<TypeTag, TTag::FlowFoamProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_gasoil_energy.cpp

@@ -78,7 +78,7 @@ struct EnableDispersion<TypeTag, TTag::FlowGasOilEnergyProblem> { 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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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);
 
 }
 

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<TypeTag, Properties::Vanguard>;
-
-    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<Opm::Main>(argc, argv);

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);
 
 }
 

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<Opm::Main>(argc, argv);

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

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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_polymer.cpp

@@ -39,7 +39,7 @@ struct EnablePolymer<TypeTag, TTag::FlowPolymerProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_solvent.cpp

@@ -39,7 +39,7 @@ struct EnableSolvent<TypeTag, TTag::FlowSolventProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

flow/flow_ebos_solvent_foam.cpp

@@ -44,7 +44,7 @@ struct EnableFoam<TypeTag, TTag::FlowSolventFoamProblem> {
 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<Opm::Main>(argc, argv);

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);
 
 }
 

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

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);
 }

opm/simulators/flow/Main.hpp

@@ -107,7 +107,7 @@ class WellTestState;
 
 // ----------------- Main program -----------------
 template <class TypeTag>
-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<Properties::TTag::FlowProblemTPFA>;
     // 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<FlowMainType> initFlowEbosBlackoil(int& exitCode)
+    std::unique_ptr<FlowMainType> initFlowBlackoil(int& exitCode)
     {
         exitCode = EXIT_SUCCESS;
         if (initialize_<Properties::TTag::FlowEarlyBird>(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<TypeTag>(argc_, argv_, outputCout_, outputFiles_);
+        return flowMain<TypeTag>(argc_, argv_, outputCout_, outputFiles_);
     }
 
     /// \brief Initialize
@@ -470,10 +470,10 @@ private:
             return EXIT_FAILURE;
         }
 
-        return flowEbosMICPMain(this->argc_,
+        return flowMICPMain(this->argc_,
-                                this->argv_,
+                            this->argv_,
-                                this->outputCout_,
+                            this->outputCout_,
-                                this->outputFiles_);
+                            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_);
         }
     }
 

python/simulators/PyBlackOilSimulator.cpp

@@ -38,7 +38,7 @@
 namespace Opm {
 
 std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
-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<Opm::Main>( 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;