Merge pull request #5 from deepfield-team/norne

Norne

Author: dvoloskov

resdp/_data_directory.py

@@ -2319,6 +2319,72 @@ def _get_reaction_number(data: DataType | None = None):
         ),
         (SECTIONS.SCHEDULE,),
     ),
+    'MULTFLT': KeywordSpecification(
+        'MULTFLT',
+        DataTypes.STATEMENT_LIST,
+        StatementSpecification(
+            columns=['NAME', 'TRANSMISSIBILITY_MULT', 'THERMAL_MULT'],
+            dtypes=('text', 'float', 'float'),
+            terminated=True,
+        ),
+        (SECTIONS.GRID, SECTIONS.EDIT, SECTIONS.SCHEDULE),
+    ),
+    'EQUALS': KeywordSpecification(
+        'EQUALS',
+        DataTypes.STATEMENT_LIST,
+        StatementSpecification(
+            columns=(
+                'ARR',
+                'MULTIPLYER',
+                'IMIN',
+                'IMAX',
+                'JMIN',
+                'JMAX',
+                'KMIN',
+                'KMAX',
+            ),
+            dtypes=cast(list[DTypeString], ['text', 'float'] + ['int'] * 6),
+            terminated=True,
+        ),
+        (
+            SECTIONS.GRID,
+            SECTIONS.EDIT,
+            SECTIONS.REGIONS,
+            SECTIONS.PROPS,
+            SECTIONS.SOLUTION,
+        ),
+    ),
+    'FLUXNUM': KeywordSpecification(
+        'FLUXNUM', DataTypes.ARRAY, ArraySpecification(dtype=int), (SECTIONS.GRID,)
+    ),
+    'MULTREGT': KeywordSpecification(
+        'MULTREGT',
+        DataTypes.STATEMENT_LIST,
+        StatementSpecification(
+            columns=[
+                'START_REGION',
+                'END_REGION',
+                'MULT',
+                'DIRECTION',
+                'NNC',
+                'REGION_TYPE',
+            ],
+            dtypes=('int', 'int', 'float', 'text', 'text', 'text'),
+            terminated=True,
+        ),
+        (SECTIONS.GRID, SECTIONS.EDIT, SECTIONS.SCHEDULE),
+    ),
+    'SWATINIT': KeywordSpecification(
+        'SWATINIT', DataTypes.ARRAY, ArraySpecification(dtype=float), (SECTIONS.PROPS,)
+    ),
+    'TRACER': KeywordSpecification(
+        'TRACER',
+        DataTypes.STATEMENT_LIST,
+        StatementSpecification(
+            columns=['INDICATOR', 'FLUID'], dtypes=['text', 'text'], terminated=True
+        ),
+        (SECTIONS.PROPS,),
+    ),
 }
 
 

resdp/_dump_utils.py

@@ -363,17 +363,15 @@ def _dump_no_data(
         keyword_spec, val, buf
     ),
     None: lambda keyword_spec, _, buf, ___: _dump_no_data(keyword_spec, buf),
-    DataTypes.SINGLE_STATEMENT: lambda keyword_spec,
-    val,
-    buf,
-    _: _dump_single_statement(keyword_spec, val, buf),
+    DataTypes.SINGLE_STATEMENT: lambda keyword_spec, val, buf, _: (
+        _dump_single_statement(keyword_spec, val, buf)
+    ),
     DataTypes.RECORDS: lambda keyword_spec, val, buf, _: _dump_records(
         keyword_spec, val, buf
     ),
-    DataTypes.ARRAY_WITH_UNITS: lambda keyword_spec,
-    val,
-    buf,
-    _: _dump_array_with_units(keyword_spec, val, buf),
+    DataTypes.ARRAY_WITH_UNITS: lambda keyword_spec, val, buf, _: (
+        _dump_array_with_units(keyword_spec, val, buf)
+    ),
 }