Add PARSE_INVALID_KEYWORD_COMBINATION to default parsing

Makes ecl2df compatible with OPM==2021.04
equinor · May 5, 2021 · 3996200 · 3996200
1 parent 16d660f
commit 3996200
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/ecl2df/eclfiles.py b/ecl2df/eclfiles.py
@@ -22,16 +22,17 @@
 if HAVE_OPM:
     # Default parse option to opm.io for a very permissive parsing
     OPMIOPARSER_RECOVERY = [
+        ("PARSE_EXTRA_DATA", opm.io.action.ignore),
+        ("PARSE_EXTRA_RECORDS", opm.io.action.ignore),
+        ("PARSE_INVALID_KEYWORD_COMBINATION", opm.io.action.ignore),
+        ("PARSE_MISSING_DIMS_KEYWORD", opm.io.action.ignore),
+        ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
+        ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
+        ("PARSE_RANDOM_SLASH", opm.io.action.ignore),
+        ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
         ("PARSE_UNKNOWN_KEYWORD", opm.io.action.ignore),
         ("SUMMARY_UNKNOWN_GROUP", opm.io.action.ignore),
-        ("PARSE_RANDOM_SLASH", opm.io.action.ignore),
         ("UNSUPPORTED_*", opm.io.action.ignore),
-        ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
-        ("PARSE_MISSING_DIMS_KEYWORD", opm.io.action.ignore),
-        ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
-        ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
-        ("PARSE_EXTRA_RECORDS", opm.io.action.ignore),
-        ("PARSE_EXTRA_DATA", opm.io.action.ignore),
     ]
 
 

diff --git a/ecl2df/inferdims.py b/ecl2df/inferdims.py
@@ -52,12 +52,13 @@ def guess_dim(deckstring, dimkeyword, dimitem=0):
     # this one opm.io will fail if there are extra records
     # in tables (if NTSFUN in TABDIMS is wrong f.ex):
     opmioparser_recovery_fail_extra_records = [
+        ("PARSE_INVALID_KEYWORD_COMBINATION", opm.io.action.ignore),
+        ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
+        ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
+        ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
         ("PARSE_UNKNOWN_KEYWORD", opm.io.action.ignore),
         ("SUMMARY_UNKNOWN_GROUP", opm.io.action.ignore),
         ("UNSUPPORTED_*", opm.io.action.ignore),
-        ("PARSE_MISSING_SECTIONS", opm.io.action.ignore),
-        ("PARSE_RANDOM_TEXT", opm.io.action.ignore),
-        ("PARSE_MISSING_INCLUDE", opm.io.action.ignore),
     ]
 
     max_guess = 640  # This ought to be enough for everybody