Support for NAN in Define expressions

OPM · Sep 2, 2022 · 7049a1f · 7049a1f
1 parent d50dbd0
commit 7049a1f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/appl/derived_smry.cpp b/appl/derived_smry.cpp
@@ -493,6 +493,29 @@ std::vector<float> DerivedSmry::calc_derived_vect(const std::string& expr,
     return derived_vect;
 }
 
+int DerivedSmry::replace_all(std::string& line, const std::string& repstr1, const std::string& repstr2, const std::string& newstr)
+{
+    int count = 0;
+
+    for (auto& repstr : {
+                repstr1, repstr2
+            }) {
+
+        int p1 = line.find(repstr);
+
+        while ( p1 != std::string::npos ) {
+
+            line.replace(p1, repstr.size(), newstr);
+            count ++;
+
+            p1 = line.find(repstr);
+        }
+    }
+
+    return count;
+}
+
+
 
 void DerivedSmry::calc_math_expr(std::vector<float>& derived_vect, const std::string& expr,
                                  const std::vector<std::string>& param_name_list,
@@ -599,6 +622,7 @@ void DerivedSmry::calc_derived_smry(const std::vector<FileType>& file_type,
             param_data.push_back(smry_vect);
         }
 
+        int ant = replace_all(expr_str, "NaN", "NAN", "0.0/0.0");
         auto derived_vect = calc_derived_vect(expr_str, param_name_list, time_vect, param_time_vect_ind, param_data);
 
         std::tuple<int, std::string> smry_key = std::make_tuple(var_smry_id, var_smry_key);

diff --git a/appl/derived_smry.hpp b/appl/derived_smry.hpp
@@ -79,10 +79,8 @@ class DerivedSmry
 
     std::map<std::tuple<int, std::string>, std::string> m_unit_list;
 
-
     std::vector<define_type> m_define_table;
 
-
     int param_exists(const param_list_type& param_list, int smry_id, const std::string& key);
     void make_define_table(const define_vect_type& define_vect);
 
@@ -118,6 +116,8 @@ class DerivedSmry
                         const std::vector<std::vector<float>>& param_vect);
 
 
+    int replace_all(std::string& line, const std::string& repstr1, const std::string& repstr2, const std::string& newstr);
+
 };
 
 #endif
diff --git a/tests/REF_DEFINE.DATA b/tests/REF_DEFINE.DATA
diff --git a/tests/cmd_files/test1h.txt b/tests/cmd_files/test1h.txt
@@ -1,6 +1,6 @@
 
 
-DEFINE ?:FOWR = IF(${FWPR}>25.0,${FOPR}/${FWPR},0.0)
+DEFINE ?:FOWR = IF(${FWPR}>25.0,${FOPR}/${FWPR},NAN)
 
 FOR SMRY_ID IN RANGE(1, $NUM_CASES)
     ADD CHART

diff --git a/tests/test_cmdf_define.cpp b/tests/test_cmdf_define.cpp
@@ -620,9 +620,9 @@ void TestQsummary::test_1h()
         ref_params_vect.resize(3);
         ref_expr_vect.resize(3);
 
-        ref_expr_vect[0] = "IF(X1>25.0,X2/X1,0.0)";
-        ref_expr_vect[1] = "IF(X1>25.0,X2/X1,0.0)";
-        ref_expr_vect[2] = "IF(X1>25.0,X2/X1,0.0)";
+        ref_expr_vect[0] = "IF(X1>25.0,X2/X1,NAN)";
+        ref_expr_vect[1] = "IF(X1>25.0,X2/X1,NAN)";
+        ref_expr_vect[2] = "IF(X1>25.0,X2/X1,NAN)";
 
         ref_var_vect[0] = {0, "FOWR", "None"};
         ref_var_vect[1] = {1, "FOWR", "None"};