Make the Python interface use the TpfaLinearizer.

flow/flow_ebos_blackoil.cpp

@@ -26,16 +26,6 @@
 #include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
 #include <opm/models/discretization/common/tpfalinearizer.hh>
 
-namespace Opm {
-    namespace Properties {
-        namespace TTag {
-            struct EclFlowProblemTPFA {
-            using InheritsFrom = std::tuple<EclFlowProblem>;
-            };
-        }
-   }
-}
-
 namespace Opm {
     namespace Properties {
 
@@ -54,6 +44,16 @@ namespace Opm {
 
 namespace Opm
 {
+std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>
+flowEbosBlackoilTpfaMainInit(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.
+    resetLocale();
+
+    return std::make_unique<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>(
+        argc, argv, outputCout, outputFiles);
+}
 
 // ----------------- Main program -----------------
 int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles)

flow/flow_ebos_blackoil.hpp

@@ -17,11 +17,34 @@
 #ifndef FLOW_EBOS_BLACKOIL_TPFA_HPP
 #define FLOW_EBOS_BLACKOIL_TPFA_HPP
 
+#include <memory>
+
 namespace Opm {
+    namespace Properties {
+        namespace TTag {
+
+            struct EclFlowProblem;
+
+            struct EclFlowProblemTPFA {
+            using InheritsFrom = std::tuple<EclFlowProblem>;
+            };
+
+        }
+   }
+}
+
+namespace Opm {
+
 
 //! \brief Main function used in flow binary.
 int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool outputFiles);
 
+template<class TypeTag> class FlowMainEbos;
+
+//! \brief Initialization function used in flow binary and python simulator.
+std::unique_ptr<FlowMainEbos<Properties::TTag::EclFlowProblemTPFA>>
+    flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
+
 //! \brief Main function used in flow_brine binary.
 int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv);