BUG: Fix gridproperty unrst importing non-str date

Author: eivindjahren

src/xtgeo/grid3d/_find_gridprop_in_eclrun.py

@@ -3,7 +3,7 @@
 import operator
 import pathlib
 import warnings
-from typing import Dict, List, Union
+from typing import Dict, List, Optional, Union
 
 import ecl_data_io as eclio
 import numpy as np
@@ -349,7 +349,7 @@ def make_gridprop_values(values, grid, fracture):
     return np.ma.masked_where(grid.get_actnum().values < 1, values)
 
 
-def date_from_intehead(intehead):
+def date_from_intehead(intehead: InteHead) -> Optional[int]:
     """Returns date format for use in GridProperty name given intehead."""
     if any(val is None for val in [intehead.day, intehead.month, intehead.year]):
         return None
@@ -360,7 +360,7 @@ def gridprop_params(values, name, date, grid, fracture):
     """Make dictionary of GridProperty parameters from imported values."""
     result = dict()
     result["name"] = name
-    result["date"] = date
+    result["date"] = str(date) if date is not None else None
     result["fracture"] = fracture
 
     result["ncol"], result["nrow"], result["nlay"] = grid.dimensions

src/xtgeo/grid3d/grid_property.py

@@ -656,12 +656,12 @@ def roxar_dtype(self, dtype):
             )
 
     @property
-    def date(self):
-        """Returns or rename the property date on YYYYMMDD numerical format."""
+    def date(self) -> Optional[str]:
+        """Returns or rename the property date as string on YYYYMMDD format."""
         return self._date
 
     @date.setter
-    def date(self, date):
+    def date(self, date: Optional[str]):
         self._date = date
 
     @property

tests/test_grid3d/test_eclrun.py

@@ -80,10 +80,10 @@ def test_roundtrip_satnum(fformat, tmp_path, ecl_runs):
 
 def test_first_and_last_dates(ecl_runs):
     po = ecl_runs.get_property_from_restart("PRESSURE", date="first")
-    assert po.date == min(ecl_runs.expected_dates)
+    assert int(po.date) == min(ecl_runs.expected_dates)
 
     px = ecl_runs.get_property_from_restart("PRESSURE", date="last")
-    assert px.date == max(ecl_runs.expected_dates)
+    assert int(px.date) == max(ecl_runs.expected_dates)
 
 
 def test_dual_runs_general_grid(tmpdir, dual_runs):

tests/test_grid3d/test_gridprop_import_eclrun.py

@@ -243,6 +243,44 @@ def test_pick_dualporo_values():
     )
 
 
+@pytest.mark.parametrize("discrete, dtype", [(True, np.int32), (False, np.float64)])
+def test_gridprop_params(discrete, dtype):
+    grid = xtgeo.create_box_grid((2, 5, 1))
+    params = xtg_im_ecl.gridprop_params(
+        values=np.zeros(10, dtype=dtype),
+        name="myprop",
+        date=19991231,
+        grid=grid,
+        fracture=False,
+    )
+
+    assert params["name"] == "myprop"
+    assert params["date"] == "19991231"
+    assert params["dualporo"] == grid.dualporo
+    assert params["dualperm"] == grid.dualperm
+    assert params["discrete"] is discrete
+    assert params["values"].shape == (2, 5, 1)
+
+
+@pytest.mark.parametrize("discrete, dtype", [(True, np.int32), (False, np.float64)])
+def test_gridprop_params_no_date(discrete, dtype):
+    grid = xtgeo.create_box_grid((2, 5, 1))
+    params = xtg_im_ecl.gridprop_params(
+        values=np.zeros(10, dtype=dtype),
+        name="myprop",
+        grid=grid,
+        fracture=False,
+        date=None,
+    )
+
+    assert params["name"] == "myprop"
+    assert date not in params
+    assert params["dualporo"] == grid.dualporo
+    assert params["dualperm"] == grid.dualperm
+    assert params["discrete"] is discrete
+    assert params["values"].shape == (2, 5, 1)
+
+
 def test_match_dualporo():
     grid = xtgeo.Grid()
     grid._dualporo = True
@@ -442,7 +480,7 @@ def test_gridprop_unrst_date_correct(ecl_run, use_alterate_date_form, use_first)
     )
 
     assert gridprop.name == ecl_run.property_name + "_" + str(ecl_run.xtgeo_step_date)
-    assert gridprop.date == ecl_run.xtgeo_step_date
+    assert int(gridprop.date) == ecl_run.xtgeo_step_date
 
 
 @settings(deadline=None, suppress_health_check=[HealthCheck.function_scoped_fixture])

tests/test_opm_integration/test_gridprop_io.py

@@ -242,7 +242,7 @@ def test_init_props_reading(case):
     )
 
     np.testing.assert_allclose(poro.values, case.poro)
-    assert poro.date == 20000101
+    assert poro.date == "20000101"
 
 
 @pytest.mark.requires_opm
@@ -261,4 +261,4 @@ def test_restart_prop_reading(case):
     )
 
     assert pressure.name == "PRESSURE_20010101"
-    assert pressure.date == 20010101
+    assert pressure.date == "20010101"