From 738877fc1bb532e4ccbb35a9a723b3ad18e4dd2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ove=20S=C3=A6vareid?= <ovsa@norceresearch.no>
Date: Tue, 6 Jul 2021 17:06:10 +0200
Subject: [PATCH] Default activation of tracer model.

---
 ebos/eclproblem.hh                            |  2 +-
 .../utils/PartiallySupportedFlowKeywords.cpp  | 37 +++++++++++++++++++
 .../utils/UnsupportedFlowKeywords.cpp         |  2 -
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index 88ff7129e..e19104727 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -541,7 +541,7 @@ struct EnableThermalFluxBoundaries<TypeTag, TTag::EclBaseProblem> {
 
 template<class TypeTag>
 struct EnableTracerModel<TypeTag, TTag::EclBaseProblem> {
-    static constexpr bool value = false;
+    static constexpr bool value = true;
 };
 
 // By default, simulators derived from the EclBaseProblem are production simulators,
diff --git a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
index f37ba813f..7af99e6e5 100644
--- a/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
+++ b/opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
@@ -142,6 +142,20 @@ partiallySupported()
                {25,{false, allow_values<std::string> {}, "RESVED should be defaulted (1*) - ignored as not used"}}, // RESERVED
             },
          },
+         {
+            "TRACER",
+            {
+               {4,{false, allow_values<std::string> {}, "SOLUTION_PHASE: not supported - ignored as not used"}}, // SOLUTION_PHASE
+               {6,{false, allow_values<std::string> {}, "ADSORB_PHASE: not supported - ignored as not used"}}, // ADSORB_PHASE
+            },
+         },
+         {
+            "TRACERS",
+            {
+               {5,{false, allow_values<std::string> {"NODIFF"}, "NUMERIC_DIFF: not supported - ignored as not used"}}, // NUMERIC_DIFF
+               {8,{false, allow_values<std::string> {"NO"}, "PASSIVE_NONLINEAR: not supported - ignored as not used"}}, // PASSIVE_NONLINEAR
+            },
+         },
          {
             "UDQDIMS",
             {
@@ -251,6 +265,23 @@ partiallySupported()
                {24,{false, allow_values<int> {0}, "MXNKVT should be defaulted (0) - ignored as not used"}}, // NUM_KVALUE_TABLES
             },
          },
+         {
+            "TRACER",
+            {
+               {5,{false, allow_values<int> {0}, "NUM_PART_TABLE should be defaulted (0) - ignored as not used"}}, // NUM_PART_TABLE
+            },
+         },
+         {
+            "TRACERS",
+            {
+               {4,{false, allow_values<int> {0}, "MAX_ENV_TRACERS: not supported - ignored as not used"}}, // MAX_ENV_TRACERS
+               {6,{false, allow_values<int> {12}, "MAX_ITER: not supported - ignored as not used"}}, // MAX_ITER
+               {7,{false, allow_values<int> {1}, "MIN_ITER: not supported - ignored as not used"}}, // MIN_ITER
+               {9,{false, allow_values<int> {}, "ONEOFF_LIN_TIGHT: not supported - ignored as not used"}}, // ONEOFF_LIN_TIGHT
+               {10,{false, allow_values<int> {}, "ONEOFF_NLIN_TIGHT: not supported - ignored as not used"}}, // ONEOFF_NLIN_TIGHT
+               {12,{false, allow_values<int> {0}, "NTIGHTFACTORS: not supported - ignored as not used"}}, // NTIGHTFACTORS
+            },
+         },
          {
             "UDADIMS",
             {
@@ -338,6 +369,12 @@ partiallySupported()
                {4,{false, allow_values<double> {0}, "CARKZEXP transmissibility dependent on porosity model is not supported"}}, // CARKZEXP
             },
          },
+         {
+            "TRACERS",
+            {
+               {11,{false, allow_values<double> {1.0}, "TIGHTENING_FACTORS: not supported - ignored as not used"}}, // TIGHTENING_FACTORS
+            },
+         },
    };
 
    return partially_supported_keywords_double;
diff --git a/opm/simulators/utils/UnsupportedFlowKeywords.cpp b/opm/simulators/utils/UnsupportedFlowKeywords.cpp
index 0d57da9af..793776828 100644
--- a/opm/simulators/utils/UnsupportedFlowKeywords.cpp
+++ b/opm/simulators/utils/UnsupportedFlowKeywords.cpp
@@ -645,8 +645,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords()
         {"TRACERKP", {false, std::nullopt}},
         {"TRACITVD", {false, std::nullopt}},
         {"TRACTVD", {false, std::nullopt}},
-        {"TRACER", {false, std::nullopt}},
-        {"TRACERS", {false, std::nullopt}},
         {"TRACITVD", {false, std::nullopt}},
         {"TRADS", {false, std::nullopt}},
         {"TRANGL", {false, std::nullopt}},