resqpy 4.12.1__tar.gz → 4.12.2__tar.gz

{resqpy-4.12.1 → resqpy-4.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: resqpy
-Version: 4.12.1
+Version: 4.12.2
 Summary: Python API for working with RESQML models
 Home-page: https://github.com/bp/resqpy
 License: MIT

{resqpy-4.12.1 → resqpy-4.12.2}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "resqpy"
-version = "4.12.1" # Set at build time
+version = "4.12.2" # Set at build time
 description = "Python API for working with RESQML models"
 authors = ["BP"]
 license = "MIT"

{resqpy-4.12.1 → resqpy-4.12.2}/resqpy/__init__.py

@@ -28,6 +28,6 @@
 
 import logging
 
-__version__ = "4.12.1"  # Set at build time
+__version__ = "4.12.2"  # Set at build time
 log = logging.getLogger(__name__)
 log.info(f"Imported resqpy version {__version__}")

{resqpy-4.12.1 → resqpy-4.12.2}/resqpy/well/_blocked_well.py

@@ -1,7 +1,7 @@
 """BlockedWell class."""
 
 # Nexus is a registered trademark of the Halliburton Company
-# RMS and ROXAR are registered trademarks of Roxar Software Solutions AS, an Emerson company
+# RMS and ROXAR are registered trademarks of Roxar Software Solutions AS, an AspenTech company
 
 import logging
 
@@ -301,7 +301,20 @@ class BlockedWell(BaseResqpy):
         gi_node = rqet.find_tag(node, 'GridIndices')
         assert gi_node is not None, 'blocked well grid indices hdf5 reference not found in xml'
         rqwu.load_hdf5_array(self, gi_node, 'grid_indices', dtype = 'int')
-        assert self.grid_indices is not None and self.grid_indices.ndim == 1 and self.grid_indices.size == self.node_count - 1
+        # assert self.grid_indices is not None and self.grid_indices.ndim == 1 and self.grid_indices.size == self.node_count - 1
+        # temporary code to handle blocked wells with incorrectly shaped grid indices wrt. nodes
+        assert self.grid_indices is not None and self.grid_indices.ndim == 1
+        if self.grid_indices.size != self.node_count - 1:
+            if self.grid_indices.size == self.cell_count and self.node_count == 2 * self.cell_count:
+                log.warning(f'handling node duplication or missing unblocked intervals in blocked well: {self.title}')
+
+                expanded_grid_indices = np.full(self.node_count - 1, -1, dtype = int)
+                expanded_grid_indices[::2] = self.grid_indices
+                self.grid_indices = expanded_grid_indices
+            else:
+                raise ValueError(
+                    f'incorrect grid indices size with respect to node count in blocked well: {self.title}')
+        # end of temporary code
         unique_grid_indices = np.unique(self.grid_indices)  # sorted list of unique values
         self.gridind_null = rqet.find_tag_int(gi_node, 'NullValue')
         if self.gridind_null is None:
@@ -1477,6 +1490,10 @@ class BlockedWell(BaseResqpy):
 
         grid_crs_list = self.__verify_number_of_grids_and_crs_units(column_list = column_list)
 
+        if doing_kh or doing_xyz or doing_angles or doing_entry_exit:
+            for grid in self.grid_list:
+                grid.cache_all_geometry_arrays()
+
         k_face_check = np.zeros((2, 2), dtype = int)
         k_face_check[1, 1] = 1  # now represents entry, exit of K-, K+
         k_face_check_end = k_face_check.copy()
@@ -3057,7 +3074,7 @@ class BlockedWell(BaseResqpy):
                     if BlockedWell.__is_float_column(col_name):
                         form = '{0:>' + str(width) + '.3f}'
                         value = row[col_name]
-                        if col_name == 'ANGLA' and (np.isnan(value) or value is None):
+                        if col_name == 'ANGLA' and (pd.isna(row[col_name]) or value is None or np.isnan(value)):
                             value = 0.0
                         fp.write(sep + form.format(float(value)))
                     else: