resqpy 4.18.9__py3-none-any.whl → 4.18.11__py3-none-any.whl

resqpy/__init__.py

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

resqpy/multi_processing/wrappers/grid_surface_mp.py

@@ -43,6 +43,7 @@ def find_faces_to_represent_surface_regular_wrapper(index: int,
                                                     raw_bisector: bool = False,
                                                     use_pack: bool = False,
                                                     flange_radius = None,
+                                                    reorient = True,
                                                     n_threads = 20) -> Tuple[int, bool, str, List[Union[UUID, str]]]:
     """Multiprocessing wrapper function of find_faces_to_represent_surface_regular_optimised.
 
@@ -96,6 +97,8 @@ def find_faces_to_represent_surface_regular_wrapper(index: int,
            packed format, which will only be readable by resqpy based applications
         flange_radius (float, optional): the radial distance to use for outer flange extension points; if None,
            a large value will be calculated from the grid size; units are xy units of grid crs
+        reorient (bool, default True):  if True, the points are reoriented to minimise the
+              z range prior to retriangulation (ie. z axis is approximate normal to plane of points), to enhace the triangulation
         n_threads (int, default 20): the number of parallel threads to use in numba points in triangles function
 
     returns:
@@ -176,7 +179,7 @@ def find_faces_to_represent_surface_regular_wrapper(index: int,
         surf = rqs.Surface(model, crs_uuid = grid.crs.uuid, title = surf_title)
         flange_bool = surf.set_from_point_set(pset,
                                               convexity_parameter = 2.0,
-                                              reorient = True,
+                                              reorient = reorient,
                                               extend_with_flange = extend_fault_representation,
                                               flange_inner_ring = flange_inner_ring,
                                               saucer_parameter = saucer_parameter,

resqpy/olio/read_nexus_fault.py

@@ -64,7 +64,10 @@ def load_nexus_fault_mult_table_from_list(file_as_list):
                         outdata[mask] = np.concatenate(d_elems)
                         df = pd.DataFrame(outdata)
                         for column in df.columns:
-                            df[column] = pd.to_numeric(df[column], errors = 'ignore')
+                            try:
+                                df[column] = pd.to_numeric(df[column], errors = "coerce")
+                            except ValueError:
+                                pass
                         df.columns = ['i1', 'i2', 'j1', 'j2', 'k1', 'k2', 'mult']
                         df['grid'] = grid
                         df['name'] = name
@@ -114,7 +117,10 @@ def load_nexus_fault_mult_table_from_list(file_as_list):
                 outdata[mask] = np.concatenate(d_elems)
                 df = pd.DataFrame(outdata)
                 for column in df.columns:
-                    df[column] = pd.to_numeric(df[column], errors = 'ignore')
+                    try:
+                        df[column] = pd.to_numeric(df[column], errors = "coerce")
+                    except ValueError:
+                        pass
                 df.columns = ['i1', 'i2', 'j1', 'j2', 'k1', 'k2', 'mult']
                 df['grid'] = grid
                 df['name'] = name

resqpy/olio/relperm.py

@@ -91,7 +91,7 @@ class RelPerm(DataFrame):
             processed_phase_combo_checks.get(processed_phase_combo)(df)
             # ensure that missing capillary pressure values are stored as np.nan
             if 'Pc' in df.columns:
-                df['Pc'].replace('None', np.nan, inplace = True)
+                df['Pc'] = df['Pc'].replace('None', np.nan)
             # convert all values in the dataframe to numeric type
             df[df.columns] = df[df.columns].apply(pd.to_numeric, errors = 'coerce')
             # ensure that no other column besides Pc has missing values

resqpy/property/_collection_get_attributes.py

@@ -538,6 +538,8 @@ def _supporting_shape_polylineset(support, indexable_element):
         shape_list = [len(support.coordinates) - reduction]
     elif indexable_element == 'nodes':
         shape_list = [len(support.coordinates)]
+    elif indexable_element in ['patches', 'enumerated elements', 'contacts']:  # one value per polyline within the set
+        shape_list = [len(support.count_perpol)]
     return shape_list
 
 

resqpy/property/property_collection.py

@@ -141,20 +141,28 @@ class PropertyCollection():
         else:
             pcs._set_support_uuid_notnone(self, support, support_uuid, model, modify_parts)
 
-    def supporting_shape(self, indexable_element = None, direction = None):
+    def supporting_shape(self,
+                         indexable_element = None,
+                         direction = None,
+                         count = 1,
+                         points = False,
+                         pre_packed = False):
         """Return the shape of the supporting representation with respect to the given indexable element
 
         arguments:
            indexable_element (string, optional): if None, a hard-coded default depending on the supporting representation class
               will be used
            direction (string, optional): must be passed if required for the combination of support class and indexable element;
-              currently only used for Grid faces.
+              currently only used for Grid faces
+           count (int, default 1): the count parameter for the property
+           points (bool, default False): set True if the property is a points property
+           pre_packed (bool, default False): set True if the required shape is for a pre-packed boolean property
 
         returns:
            list of int, being required shape of numpy array, or None if not coded for
 
         note:
-           individual property arrays will only match this shape if they have the same indexable element and a count of one
+           individual property arrays will only match this shape if they have the same indexable element and matching count etc.
         """
 
         # when at global level was causing circular reference loading issues as grid imports this module
@@ -204,6 +212,14 @@ class PropertyCollection():
         else:
             raise Exception(f'unsupported support class {type(support)} for property')
 
+        if pre_packed:
+            shape_list[-1] = (shape_list[-1] - 1) // 8 + 1
+
+        if shape_list is not None:
+            if count > 1:
+                shape_list.append(count)
+            if points:
+                shape_list.append(3)
         return shape_list
 
     def populate_from_property_set(self, property_set_root):
@@ -744,7 +760,8 @@ class PropertyCollection():
                   title = None,
                   title_mode = None,
                   related_uuid = None,
-                  const_value = None):
+                  const_value = None,
+                  extra = None):
         """Returns a single part selected by those arguments which are not None.
 
            multiple_handling (string, default 'exception'): one of 'exception', 'none', 'first', 'oldest', 'newest'
@@ -783,7 +800,8 @@ class PropertyCollection():
                                                                 title = title,
                                                                 title_mode = title_mode,
                                                                 related_uuid = related_uuid,
-                                                                const_value = const_value)
+                                                                const_value = const_value,
+                                                                extra = extra)
         parts_list = temp_collection.parts()
         if len(parts_list) == 0:
             return None
@@ -816,7 +834,8 @@ class PropertyCollection():
                          title = None,
                          title_mode = None,
                          related_uuid = None,
-                         use_pack = True):
+                         use_pack = True,
+                         extra = None):
         """Returns the array of data for a single part selected by those arguments which are not None.
 
         arguments:
@@ -833,7 +852,7 @@ class PropertyCollection():
 
         Other optional arguments:
         realization, support_uuid, continuous, points, count, indexable, property_kind, facet_type, facet,
-        citation_title, time_series_uuid, time_index, uom, string_lookup_id, categorical, related_uuid:
+        citation_title, time_series_uuid, time_index, uom, string_lookup_id, categorical, related_uuid, extra:
 
         For each of these arguments: if None, then all members of collection pass this filter;
         if not None then only those members with the given value pass this filter;
@@ -869,7 +888,8 @@ class PropertyCollection():
                               multiple_handling = multiple_handling,
                               title = title,
                               title_mode = title_mode,
-                              related_uuid = related_uuid)
+                              related_uuid = related_uuid,
+                              extra = extra)
         if part is None:
             return None
         return self.cached_part_array_ref(part,
@@ -1867,7 +1887,7 @@ class PropertyCollection():
             shape = self.supporting_shape(indexable_element = self.indexable_for_part(part),
                                           direction = pcga._part_direction(self, part))
             assert shape is not None
-            return shape, (float if self.continuous_for_part(part) else int)
+            return tuple(shape), (float if self.continuous_for_part(part) else int)
 
         h5_key_pair = self._shape_and_type_of_part_get_h5keypair(part, part_node, model)
         if h5_key_pair is None:
@@ -2283,6 +2303,15 @@ class PropertyCollection():
         uuid = bu.new_uuid()
         cached_name = rqp_c._cache_name_for_uuid(uuid)
         if cached_array is not None:
+            direction = facet if facet_type == 'direction' else None
+            shape = self.supporting_shape(indexable_element = indexable_element,
+                                          direction = direction,
+                                          count = count,
+                                          points = points,
+                                          pre_packed = pre_packed)
+            assert shape is not None, f'unsupported indexable element {indexable_element} for supporting representation'
+            assert cached_array.shape == tuple(
+                shape), f'property array has shape {cached_array.shape} when expecting {tuple(shape)}'
             min_value, max_value = pcga._min_max_of_cached_array(self, cached_name, cached_array, null_value, discrete)
         else:
             if const_value == null_value or isinstance(const_value, bool) or (not discrete and np.isnan(const_value)):

resqpy/well/_blocked_well.py

@@ -877,10 +877,10 @@ class BlockedWell(BaseResqpy):
     @staticmethod
     def __cell_kji0_from_df(df, df_row):
         row = df.iloc[df_row]
-        if pd.isna(row[0]) or pd.isna(row[1]) or pd.isna(row[2]):
+        if pd.isna(row.iloc[0]) or pd.isna(row.iloc[1]) or pd.isna(row.iloc[2]):
             return None
         cell_kji0 = np.empty((3,), dtype = np.int32)
-        cell_kji0[:] = row[2], row[1], row[0]
+        cell_kji0[:] = row.iloc[2], row.iloc[1], row.iloc[0]
         cell_kji0[:] -= 1
         return cell_kji0
 

resqpy/well/_deviation_survey.py

@@ -233,9 +233,9 @@ class DeviationSurvey(BaseResqpy):
         """
 
         try:
-            df = pd.read_csv(deviation_survey_file,
-                             comment = comment_character,
-                             delim_whitespace = space_separated_instead_of_csv)
+            sep = r'\s+' if space_separated_instead_of_csv else ','
+
+            df = pd.read_csv(deviation_survey_file, comment = comment_character, sep = sep)
             if df is None:
                 raise Exception
         except Exception:

resqpy/well/_trajectory.py

@@ -510,9 +510,9 @@ class Trajectory(BaseResqpy):
             self.title = 'well trajectory'
 
         try:
-            df = pd.read_csv(trajectory_file,
-                             comment = comment_character,
-                             delim_whitespace = space_separated_instead_of_csv)
+            sep = r'\s+' if space_separated_instead_of_csv else ','
+
+            df = pd.read_csv(trajectory_file, comment = comment_character, sep = sep)
             if df is None:
                 raise Exception
         except Exception:

resqpy/well/well_object_funcs.py

@@ -77,9 +77,8 @@ def add_wells_from_ascii_file(model,
     assert crs_uuid is not None, 'coordinate reference system not found when trying to add wells'
 
     try:
-        df = pd.read_csv(trajectory_file,
-                         comment = comment_character,
-                         delim_whitespace = space_separated_instead_of_csv)
+        sep = r'\s+' if space_separated_instead_of_csv else ','
+        df = pd.read_csv(trajectory_file, comment = comment_character, sep = sep)
         if df is None:
             raise Exception
     except Exception:
@@ -350,7 +349,6 @@ def add_las_to_trajectory(las: lasio.LASFile, trajectory, realization = None, ch
 
     # Read in data from each curve in turn (skipping first curve which has depths)
     for curve in las.curves[1:]:
-
         collection.add_log(
             title = curve.mnemonic,
             data = curve.data,
@@ -444,7 +442,7 @@ def add_logs_from_cellio(blockedwell, cellio):
         df['cell_indices'] = grid.natural_cell_indices(
             np.array((df['k_index'] - 1, df['j_index'] - 1, df['i_index'] - 1), dtype = np.int32).T)
         df = df.drop(['i_index', 'j_index', 'k_index', 'x_in', 'y_in', 'z_in', 'x_out', 'y_out', 'z_out'], axis = 1)
-    assert (df['cell_indices'] == blockedwell.cell_indices).all(),  \
+    assert (df['cell_indices'] == blockedwell.cell_indices).all(), \
         'Cell indices do not match between blocked well and log inputs'
 
     # Work out if the data columns are continuous, categorical or discrete

{resqpy-4.18.9.dist-info → resqpy-4.18.11.dist-info}/METADATA

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

{resqpy-4.18.9.dist-info → resqpy-4.18.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=lB-7ZcQp9dDxWaqMRVMU8EvWJuaaUZH9Pp6m7NuwNiQ,556
+resqpy/__init__.py,sha256=Q8VnNi88WtbWxJhvhtNNgS1CS7UNFWW6Opjfub5WTXc,557
 resqpy/crs.py,sha256=R7DfcTP5xGv5pu9Y8RHA2WVM9DjBCSVMoHcz4RmQ7Yw,27646
 resqpy/derived_model/__init__.py,sha256=NFvMSOKI3cxmH7lAbddV43JjoUj-r2G7ExEfOqinD1I,1982
 resqpy/derived_model/_add_edges_per_column_property_array.py,sha256=cpW3gwp6MSYIrtvFmCjoJXcyUsgGuCDbgmwlJCJebUs,6410
@@ -69,7 +69,7 @@ resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczw
 resqpy/multi_processing/_multiprocessing.py,sha256=bnCKfSC1tWwvZmZ7BZqCyje0C93m6q7HZPxNpx8xoxA,7301
 resqpy/multi_processing/wrappers/__init__.py,sha256=7vjuTWdHnp3rN9Ud8ljpDnt1NbBAyhA08lv-sQ9Kf3o,72
 resqpy/multi_processing/wrappers/blocked_well_mp.py,sha256=_2fEsSmJVQCnbQIjTHqmnNEugfhN1KvX-o4ZbvtChdI,5952
-resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=QvfyGYVBPf5E_nLWUoG6OHxuvTdkqTPj-_w3Or_OSuI,25270
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=PWIJOmd9EnVfA4LlFdyO6myCZ9pMnxdpFD0nAfD5evI,25564
 resqpy/multi_processing/wrappers/mesh_mp.py,sha256=0VYoqtgBFfrlyYB6kkjbdrRQ5FKe6t5pHJO3wD9b8Fc,5793
 resqpy/olio/__init__.py,sha256=j2breqKYVufhw5k8qS2uZwB3tUKT7FhdZ23ninS75YA,84
 resqpy/olio/ab_toolbox.py,sha256=bZlAhOJVS0HvIYBW0Lg68re17N8eltoQhIUh0xuUyVc,2147
@@ -89,8 +89,8 @@ resqpy/olio/keyword_files.py,sha256=8hifLG00eUmHOylbSQNfPwPQWd05tT14bCmCRHteefc,
 resqpy/olio/load_data.py,sha256=koFJMo7kcn3wSkvUGCqhdIOb7hTADJaEYhzlu30oOwA,19204
 resqpy/olio/point_inclusion.py,sha256=yseq-iWdAypOiZg1vbsEmYhouqaYv0_P9kc_ifYHb1A,6628
 resqpy/olio/random_seed.py,sha256=ZcuaNKtUtVyp236uVQbEyFmb3122JiSsn1uiCCVfDxw,1103
-resqpy/olio/read_nexus_fault.py,sha256=vkMr-At7qFZGZ87gZ6QWzgpqwsDHFQf6m3rBTe-Hdrc,5441
-resqpy/olio/relperm.py,sha256=VSyqVz_OsjCL9tB7jBnjVdLA4F5yiKYJthIghux8_aI,17135
+resqpy/olio/read_nexus_fault.py,sha256=-KpinYLLWOy6JADCzI8u-J6HJQaiOrjF_ZGLsGCgqbQ,5659
+resqpy/olio/relperm.py,sha256=ONGdaYKv-yHbeXB3SSUvwwqCQO5RijhvmiOgNE_5MYo,17130
 resqpy/olio/simple_lines.py,sha256=qaR11W5UPgRmtMeFQ-pXg0jOvkJZ_XPzSUpAXqeYtlc,12189
 resqpy/olio/time.py,sha256=LtoSIf1A6wunHSpDgKsSGEr0rbcSQyy35TgJvY37PrI,760
 resqpy/olio/trademark.py,sha256=p_EWvUUnfalOA0RC94fSWMDgdGY9-FdZuGtAjg3wNcY,822
@@ -130,12 +130,12 @@ resqpy/organize/wellbore_interpretation.py,sha256=jRAHq90tR2dCQSXsZicujXhSVHOEPo
 resqpy/property/__init__.py,sha256=KegXDizklsMB-EnGFrzhCSszrXAHXEIoStdC5XmyifQ,2294
 resqpy/property/_collection_add_part.py,sha256=uM64TWqJ0aBUwP1u1OJNTUhKLGlmOQj14fGPLG-2pRs,17156
 resqpy/property/_collection_create_xml.py,sha256=p9GASodhg4vQqDDvCOHScto_Qtz_nDADGtvZY92Dcu8,13001
-resqpy/property/_collection_get_attributes.py,sha256=MlontPfGo00lxt0SpB49YG9PRsi5oXPqduDgCSOSmzs,32441
+resqpy/property/_collection_get_attributes.py,sha256=whWG3O3fIXi2TetUKQWC4JPjrKI9tPrYmw0d51HkJgY,32609
 resqpy/property/_collection_support.py,sha256=77_DG-0pzhMWdG_mNDiGfihXD7Pp-CvDSGCV8ZlDjj4,5889
 resqpy/property/_property.py,sha256=JcG7h6k4cJ4l3WC_VCsvoqHM3FBxrnUuxbIK2Ono1M0,24426
 resqpy/property/attribute_property_set.py,sha256=gATFe-vI00GrgaJNMHSKbM0xmlxIsO5DT1qRSU9snYI,12295
 resqpy/property/grid_property_collection.py,sha256=37dVQSBSTpX22UfBcpPvwGjd8H3O2MepKpWXYc4yJvM,66858
-resqpy/property/property_collection.py,sha256=RqFzbN60P_Q973R9UsxXo2gBnwv-9NSuNPpo38fQgxY,152986
+resqpy/property/property_collection.py,sha256=02T7q7r82uGDk3FG1CPn7ANZZindcBc4CuSj2xCKBbA,154558
 resqpy/property/property_common.py,sha256=wf429weNtgf6J4gCNNoRwj64elQvUPI_ZWzg4qI7l6c,35993
 resqpy/property/property_kind.py,sha256=6SK0La09eisHPYOSgdx69K_Ordrq0x2tz4IAyurVyY8,5557
 resqpy/property/string_lookup.py,sha256=eH-lbLRbb8JKtO91FTtyuYseRGwPkmsghcXbKUTvVgI,7737
@@ -184,17 +184,17 @@ resqpy/weights_and_measures/__init__.py,sha256=Kp1pPZFH4rS5_PkCERZBEzGoat6n_dSS0
 resqpy/weights_and_measures/nexus_units.py,sha256=pHqcFbe-8nyqozFgN5Ce-W-UvEnXQ6yiaX3dP1ONtAQ,5434
 resqpy/weights_and_measures/weights_and_measures.py,sha256=1WnrmhtcyCgY2crClNddmfwtf33JdVZy9wNhqPQIvuc,16210
 resqpy/well/__init__.py,sha256=v5_gd7sSPRM9q2KsLiLWaw3jbnXFZkou38qeB7_HSN4,990
-resqpy/well/_blocked_well.py,sha256=-6_ejZxMFAGpY4cCgKyVo-K8-nVG6nDf0IQY3DlBVSg,192451
-resqpy/well/_deviation_survey.py,sha256=d3u31JbBqMCsaz6MUrtZium90wrC3omtm46A755fvgk,23115
+resqpy/well/_blocked_well.py,sha256=xRxCPH8c7NxWO-5EErCsq3-e51H22rjgBeKnXWpw_TQ,192481
+resqpy/well/_deviation_survey.py,sha256=AsjTl56v8qa2lSxKAMn4vhEadqRTzwH98PmOObCBoe0,23086
 resqpy/well/_md_datum.py,sha256=rRrDQckTJwZtIEh28dlgXj32kcBSu-ZvHFYZOiQsyqg,7154
-resqpy/well/_trajectory.py,sha256=GOJsxh1FGEScg4ayQHSuIj05W0S7QNUmvyz8vSaM_4I,52781
+resqpy/well/_trajectory.py,sha256=lt2_MXeRWjsXTMqZZ5n4-fAT0d41RatCG9QUoYopjOQ,52752
 resqpy/well/_wellbore_frame.py,sha256=rzWsBnM-L2NbSpdk-6F5BKYeaqDWbwrIrlpkPjtt0kE,15192
 resqpy/well/_wellbore_marker.py,sha256=ZqcZC5Xmta3IJOAaZXZAWAQX9iaS312WjhnJSge8yks,8403
 resqpy/well/_wellbore_marker_frame.py,sha256=xvYH2_2Ie3a18LReFymbUrZboOx7Rhv5DODEVO4-B-k,20933
 resqpy/well/blocked_well_frame.py,sha256=Rx8jwkCjchseDZaTttPkA1-f6l7W6vRGrxWtDHlEPx8,22560
-resqpy/well/well_object_funcs.py,sha256=tWufc8wahihzMEO-Ou1dncIttrf4bNo1qmLgh3I2pOM,24717
+resqpy/well/well_object_funcs.py,sha256=1O4EVPuTn-kN3uT_V4TbSwehnMUMY0TX36XOUgasTcc,24689
 resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-resqpy-4.18.9.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
-resqpy-4.18.9.dist-info/METADATA,sha256=cgQ2tIjpkdQz_Eu2ccGfKDuF_zcmf6K2QIZmL4R8oIs,4028
-resqpy-4.18.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-resqpy-4.18.9.dist-info/RECORD,,
+resqpy-4.18.11.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-4.18.11.dist-info/METADATA,sha256=a_Tji4HNp0WYpwc3l1XEunljv4Ze2UpMzTNyua1yd38,4029
+resqpy-4.18.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-4.18.11.dist-info/RECORD,,