Use 32bit floats for surfaces

setup.py

@@ -8,7 +8,7 @@
 from skbuild import setup
 
 # list of pair of .proto file and out directory
 PROTOBUF_FILES = [("src/_ert_com_protocol/_schema.proto", "src/_ert_com_protocol")]
 
 
 def compile_protocol_buffers():
@@ -29,11 +29,11 @@
 
 
 class EggInfo(egg_info):
     """scikit-build uses the metadata of ert to determine what to include when building
     the project. This determination results in files being copied to a special build
     folder. If ert wants to compile e.g. protobuf files and have those included in the
     distribution, those files needs to be a part of the distribution metadata, i.e. it
     needs to happen in egg_info so that the compiled files are copied to the build
     folder."""
 
     def run(self):
@@ -145,7 +145,7 @@
         "httpx",
         "tables",
         "xarray",
-        "xtgeo",
+        "xtgeo >= 3.3.0",
         "netCDF4",
     ],
     entry_points={

src/ert/config/surface_config.py

@@ -4,6 +4,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, List
 
+import numpy as np
 import xarray as xr
 import xtgeo
 from typing_extensions import Self
@@ -19,7 +20,7 @@
 
 # pylint: disable=too-many-instance-attributes
 @dataclass
 class SurfaceConfig(ParameterConfig):  # pylint: disable=too-many-instance-attributes
     ncol: int
     nrow: int
     xori: float
@@ -46,7 +47,7 @@
                 ErrorInfo("Missing required OUTPUT_FILE").set_context(surface)
             )
         if not init_file:
             errors.append(ErrorInfo("Missing required INIT_FILES").set_context(surface))
         elif not forward_init and "%d" not in init_file:
             errors.append(
                 ErrorInfo(
@@ -59,7 +60,7 @@
             )
         elif not Path(base_surface).exists():
             errors.append(
                 ErrorInfo(f"BASE_SURFACE:{base_surface} not found").set_context(surface)
             )
         if errors:
             raise ConfigValidationError.from_collected(errors)
@@ -67,7 +68,9 @@
         assert out_file is not None
         assert base_surface is not None
         try:
-            surf = xtgeo.surface_from_file(base_surface, fformat="irap_ascii")
+            surf = xtgeo.surface_from_file(
+                base_surface, fformat="irap_ascii", dtype=np.float32
+            )
         except Exception as err:  # pylint: disable=broad-exception-caught
             raise ConfigValidationError.with_context(
                 f"Could not load surface {base_surface!r}", surface
@@ -99,7 +102,9 @@
                 f"'{self.name}' in file {file_name}: "
                 "File not found\n"
             )
-        surface = xtgeo.surface_from_file(file_path, fformat="irap_ascii")
+        surface = xtgeo.surface_from_file(
+            file_path, fformat="irap_ascii", dtype=np.float32
+        )
 
         da = xr.DataArray(
             surface.values,

src/ert/storage/local_experiment.py

@@ -5,13 +5,14 @@
 from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Union
 from uuid import UUID
 
+import numpy as np
 import xtgeo
 
 from ert.config import ExtParamConfig, Field, GenKwConfig, SurfaceConfig
 
 if TYPE_CHECKING:
     from ert.config.parameter_config import ParameterConfig
     from ert.storage.local_ensemble import LocalEnsembleAccessor, LocalEnsembleReader
     from ert.storage.local_storage import LocalStorageAccessor, LocalStorageReader
 
 
@@ -58,7 +59,9 @@
 
     def get_surface(self, name: str) -> xtgeo.RegularSurface:
         return xtgeo.surface_from_file(
-            str(self.mount_point / f"{name}.irap"), fformat="irap_ascii"
+            str(self.mount_point / f"{name}.irap"),
+            fformat="irap_ascii",
+            dtype=np.float32,
         )
 
     @property

src/ert/storage/migration/block_fs.py

@@ -205,7 +205,7 @@ def _migrate_surface(
             surface = surfaces[block.name]
         except KeyError:
             surface = surfaces[block.name] = xtgeo.surface_from_file(
-                config.base_surface_path, fformat="irap_ascii"
+                config.base_surface_path, fformat="irap_ascii", dtype=np.float32
             )
         array = data_file.load(block, np.prod(surface.dimensions)).reshape(
             surface.dimensions

tests/unit_tests/analysis/test_es_update.py

@@ -402,7 +402,7 @@ def sample_prior(nx, ny):
     surf_prior = ens_prior.load_parameters("TOP", list(range(ensemble_size)))
     for i in range(ensemble_size):
         _prior_init = xtgeo.surface_from_file(
-            f"surface/surf_init_{i}.irap", fformat="irap_ascii"
+            f"surface/surf_init_{i}.irap", fformat="irap_ascii", dtype=np.float32
         )
         np.testing.assert_array_equal(surf_prior[i], _prior_init.values.data)
 

tests/unit_tests/config/test_surface_config.py

@@ -55,7 +55,9 @@ def test_runpath_roundtrip(tmp_path, storage, surface):
 
     # compare contents
     # Data is saved as 'irap_ascii', which means that we only keep 6 significant digits
-    actual_surface = xtgeo.surface_from_file(tmp_path / "output", fformat="irap_ascii")
+    actual_surface = xtgeo.surface_from_file(
+        tmp_path / "output", fformat="irap_ascii", dtype=np.float32
+    )
     np.testing.assert_allclose(
         actual_surface.values, surface.values, rtol=0, atol=1e-06
     )

tests/unit_tests/storage/test_parameter_sample_types.py

@@ -674,7 +674,8 @@ def test_surface_param_update(tmpdir):
                                     values=values)
         surf.to_file("surf.irap", fformat="irap_ascii")
 
-    surf_fs = xtgeo.surface_from_file("surf.irap", fformat="irap_ascii")
+    surf_fs = xtgeo.surface_from_file("surf.irap", fformat="irap_ascii",
+                                    dtype=np.float32)
     a, b, c, *_ = surf_fs.values.data.ravel()
 
     output = [a * x**2 + b * x + c for x in range(10)]
@@ -748,6 +749,9 @@ def test_surface_param_update(tmpdir):
                 .T
             )
 
+            assert prior_param.dtype == np.float32
+            assert posterior_param.dtype == np.float32
+
             assert np.linalg.det(np.cov(prior_param[:3])) > np.linalg.det(
                 np.cov(posterior_param[:3])
             )
@@ -758,6 +762,7 @@ def test_surface_param_update(tmpdir):
         surf = xtgeo.surface_from_file(
             f"simulations/realization-{realizations_to_test[0]}/iter-1/surf.irap",
             fformat="irap_ascii",
+            dtype=np.float32,
         )
 
         assert base_surface.ncol == surf.ncol
@@ -772,6 +777,7 @@ def test_surface_param_update(tmpdir):
         surf2 = xtgeo.surface_from_file(
             f"simulations/realization-{realizations_to_test[1]}/iter-1/surf.irap",
             fformat="irap_ascii",
+            dtype=np.float32,
         )
 
         assert not (surf.values == surf2.values).any()