Merge pull request #3318 from akva2/eclwellmodel_no_default

changed: do not set the ebos well model as default type

ebos/ebos_plain.cc

@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include "eclproblem.hh"
+#include "eclwellmanager.hh"
 
 #include <opm/models/utils/start.hh>
 
@@ -39,6 +40,11 @@ struct EbosPlainTypeTag {
 };
 }
 
+template<class TypeTag>
+struct EclWellModel<TypeTag, TTag::EbosPlainTypeTag> {
+    using type = EclWellManager<TypeTag>;
+};
+
 } // namespace Opm::Properties
 
 int main(int argc, char **argv)

ebos/eclproblem.hh

@@ -53,7 +53,6 @@
 #include "eclcpgridvanguard.hh"
 #endif
 
-#include "eclwellmanager.hh"
 #include "eclequilinitializer.hh"
 #include "eclwriter.hh"
 #include "ecloutputblackoilmodule.hh"
@@ -297,12 +296,6 @@ struct EclAquiferModel<TypeTag, TTag::EclBaseProblem> {
     using type = EclBaseAquiferModel<TypeTag>;
 };
 
-// use the built-in proof of concept well model by default
-template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::EclBaseProblem> {
-    using type = EclWellManager<TypeTag>;
-};
-
 // Enable aquifers by default in experimental mode
 template<class TypeTag>
 struct EclEnableAquifers<TypeTag, TTag::EclBaseProblem> {