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

resqpy/well/_md_datum.py

@@ -80,19 +80,6 @@ class MdDatum(BaseResqpy):
             assert md_reference in valid_md_reference_list
             assert len(location) == 3
 
-    def _load_from_xml(self):
-        md_datum_root = self.root
-        assert md_datum_root is not None
-        location_node = rqet.find_tag(md_datum_root, 'Location')
-        self.location = (rqet.find_tag_float(location_node,
-                                             'Coordinate1'), rqet.find_tag_float(location_node, 'Coordinate2'),
-                         rqet.find_tag_float(location_node, 'Coordinate3'))
-        self.md_reference = rqet.node_text(rqet.find_tag(md_datum_root, 'MdReference')).strip().lower()
-        assert self.md_reference in valid_md_reference_list
-        self.crs_uuid = self.extract_crs_uuid()
-
-    # todo: the following function is almost identical to one in the grid module: it should be made common and put in model.py
-
     def extract_crs_uuid(self):
         """Returns uuid for coordinate reference system, as stored in reference node of this md datum's xml tree."""
 
@@ -103,14 +90,6 @@ class MdDatum(BaseResqpy):
         self.crs_uuid = bu.uuid_from_string(uuid_str)
         return self.crs_uuid
 
-    def create_part(self):
-        """Creates xml for this md datum object and adds to parent model as a part; returns root node for part."""
-
-        # note: deprecated, call create_xml() directly
-        assert self.root is None
-        assert self.location is not None
-        self.create_xml(add_as_part = True)
-
     def create_xml(self, add_as_part = True, add_relationships = True, title = None, originator = None):
         """Creates xml for a measured depth datum element; crs node must already exist; optionally adds as part.
 
@@ -164,3 +143,14 @@ class MdDatum(BaseResqpy):
         if self.md_reference != other.md_reference or not np.allclose(self.location, other.location):
             return False
         return bu.matching_uuids(self.crs_uuid, other.crs_uuid)
+
+    def _load_from_xml(self):
+        md_datum_root = self.root
+        assert md_datum_root is not None
+        location_node = rqet.find_tag(md_datum_root, 'Location')
+        self.location = (rqet.find_tag_float(location_node,
+                                             'Coordinate1'), rqet.find_tag_float(location_node, 'Coordinate2'),
+                         rqet.find_tag_float(location_node, 'Coordinate3'))
+        self.md_reference = rqet.node_text(rqet.find_tag(md_datum_root, 'MdReference')).strip().lower()
+        assert self.md_reference in valid_md_reference_list
+        self.crs_uuid = self.extract_crs_uuid()

resqpy/well/_wellbore_frame.py

@@ -106,7 +106,11 @@ class WellboreFrame(BaseResqpy):
             assert self.node_mds is not None and self.node_mds.ndim == 1
 
     def _load_from_xml(self):
-        """Loads the wellbore frame object from an xml node (and associated hdf5 data)."""
+        """Loads the wellbore frame object from an xml node.
+
+        Also loads the associated data either from an hdf5 file or generated from a
+        lattice array definition.
+        """
 
         # NB: node is the root level xml node, not a node in the md list!
 
@@ -126,7 +130,11 @@ class WellboreFrame(BaseResqpy):
 
         mds_node = rqet.find_tag(node, 'NodeMd')
         assert mds_node is not None, 'wellbore frame measured depths hdf5 reference not found in xml'
-        rqwu.load_hdf5_array(self, mds_node, 'node_mds')
+        if rqet.node_type(mds_node) == "DoubleLatticeArray":
+            rqwu.load_lattice_array(self, mds_node, "node_mds", self.trajectory)
+            self.node_count = self.node_mds.size
+        else:
+            rqwu.load_hdf5_array(self, mds_node, "node_mds")
 
         assert self.node_mds is not None and self.node_mds.ndim == 1 and self.node_mds.size == self.node_count
 

resqpy/well/well_utils.py

@@ -35,6 +35,39 @@ def load_hdf5_array(object, node, array_attribute, tag = 'Values', dtype = 'floa
                                   array_attribute = array_attribute)
 
 
+def load_lattice_array(object, node, array_attribute, trajectory):
+    """Loads the property array data as an attribute of object, from the lattice array referenced in xml node.
+
+    This loader expects the XML node to be in the form of a lattice array, which is a
+    variant of NodeMd data defined as a series of regularly spaced measured depth values
+    computed from the metadata in the XML (start_value, offset, step_value, step_count).
+    Checks that the computed NodeMds are valid on the trajectory, and only loads those.
+
+    :param: object: The object to load the data into (typically a WellboreFrame)
+    :param: node: The XML node to load the metadata from
+    :param: array_attribute: The name of the attribute on 'object' to load the data into
+    :param: trajectory: The trajectory object to use to check the validity of the data
+
+    :meta private:
+    """
+
+    def check_md(md: float, trajectory) -> bool:
+        xyz = np.array(trajectory.xyz_for_md(md))
+        return isinstance(xyz, np.ndarray) and xyz.shape == (3,)
+
+    if array_attribute is not None and getattr(object, array_attribute, None) is not None:
+        return
+
+    start_value = rqet.find_tag_float(node, "StartValue", must_exist = True)
+    offset = rqet.find_tag(node, "Offset", must_exist = True)
+    step_value = rqet.find_tag_float(offset, "Value", must_exist = True)
+    step_count = rqet.find_tag_int(offset, "Count", must_exist = True)
+    if step_count > 0:
+        step_mds = start_value + np.arange(step_count) * step_value
+        valid_mds = [md for md in step_mds if check_md(md, trajectory)]
+        object.__dict__[array_attribute] = np.array(valid_mds)
+
+
 def extract_xyz(xyz_node):
     """Extracts an x,y,z coordinate from a solitary point xml node.
 

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: resqpy
-Version: 4.18.11
+Version: 5.0.0
 Summary: Python API for working with RESQML models
 Home-page: https://github.com/bp/resqpy
 License: MIT
 Keywords: RESQML
 Author: BP
-Requires-Python: >=3.8.1,<3.12
+Requires-Python: >=3.9,<3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -14,17 +14,17 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: System :: Filesystems
 Requires-Dist: h5py (>=3.7,<4.0)
 Requires-Dist: joblib (>=1.2,<2.0)
 Requires-Dist: lasio (>=0.31,<0.32)
-Requires-Dist: lxml (>=4.9,<5.0)
-Requires-Dist: numba (>=0.56,<1.0)
-Requires-Dist: numpy (>=1.23,<2.0)
-Requires-Dist: pandas (>=1.4,<2.0)
+Requires-Dist: lxml (>=5.1,<6.0)
+Requires-Dist: numba (>=0.59,<1.0)
+Requires-Dist: numpy (>=1.26,<2.0)
+Requires-Dist: pandas (>=2.2,<3.0)
 Requires-Dist: scipy (>=1.9,<2.0)
 Project-URL: Documentation, https://resqpy.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/bp/resqpy

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

@@ -1,4 +1,4 @@
-resqpy/__init__.py,sha256=Q8VnNi88WtbWxJhvhtNNgS1CS7UNFWW6Opjfub5WTXc,557
+resqpy/__init__.py,sha256=7QLJBGZRJzBFqxailgyyliMgfPLS0xUKGDr9BfDS-Oc,555
 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
@@ -26,7 +26,7 @@ resqpy/derived_model/_zone_layer_ranges_from_array.py,sha256=4pHkp7yqvkif_pC59VE
 resqpy/fault/__init__.py,sha256=IStX_EhPnppIExf_mgYrBddC4KP26VcqblcfXiBT614,996
 resqpy/fault/_gcs_functions.py,sha256=NRyhKkYChRaKDUIQ6pfVQiD67e4TTm3LnBvWEPtpkDU,29569
 resqpy/fault/_grid_connection_set.py,sha256=xStOkWHsbh9m6lql7f2PDURnoFOIM1mFmx-QG6yPaKo,126124
-resqpy/grid/__init__.py,sha256=WsfOnR5lHcnpJEx8ZZ3lhd4dImEiieJLM7eFPxMi3u8,692
+resqpy/grid/__init__.py,sha256=FTeNW9kJ8By6gA2-x-NisQQ8cY8RHCAro0lT-3ssxYQ,601
 resqpy/grid/_cell_properties.py,sha256=pbyAK2eV9n4teOxm2q5hyBinohEbevFPrCfMcpGiqUU,20689
 resqpy/grid/_connection_sets.py,sha256=-277bh9pMoeESSzy9oZehL-vc82aMGZuSLQs2KJ4Wfg,10120
 resqpy/grid/_create_grid_xml.py,sha256=p-jKo1BZ-DlhEYixVzadtY-QsqA8ygcXvMYS_TvQCjg,22837
@@ -34,10 +34,9 @@ resqpy/grid/_defined_geometry.py,sha256=QYQ3wLbPrlPobgUi9R1izTD4JD9qMGf5eyqbM68H
 resqpy/grid/_extract_functions.py,sha256=pOVC2vv4dJ9G7e6p3uh2mz4QPb6W7_pKiaq8HAWeyzg,28263
 resqpy/grid/_face_functions.py,sha256=0I7O6DDz7nJWczi_G2bE3L2XUr4acxREwKygXWEp6F4,16516
 resqpy/grid/_faults.py,sha256=OmukVoLpdrndqDxwE6Rj7Ul5tj3FUQVPhE0raH2FHpg,12236
-resqpy/grid/_grid.py,sha256=d4hSTmtdfmuEiQIjOhSAAlJZNlYBf0Fui4PPGJE5I4U,136144
+resqpy/grid/_grid.py,sha256=-OhJpi9x8r74_7_CBrQsanqhFiZQcCiJkvbnhPRq2qQ,135758
 resqpy/grid/_grid_types.py,sha256=YAmRrrm-J2HKuuwCRCAkE3ppcQLiwc4EEc6dc-sy9Fc,4362
 resqpy/grid/_intervals_info.py,sha256=ODjDz22n8U9pSpO0Muj8mJr2hYWauFDzgcVQ0RM3csQ,338
-resqpy/grid/_moved_functions.py,sha256=XboxA0pE55j-P_x5g051WheVamxkAatQGbU5aq2GkaE,604
 resqpy/grid/_pillars.py,sha256=WXvLjORlNHnm0KI3qgoRtCyXdcT9vQBkJDQWL2wtJwg,7243
 resqpy/grid/_pixel_maps.py,sha256=Aqn9dpDKjX_v8BnWMdN__ulqjeuXfE6W2_Z7EDaUqdE,5386
 resqpy/grid/_points_functions.py,sha256=72dCLWHrOUM9xSwSaEuxPUA__b6WAdk5rbeWatILdaI,70585
@@ -48,14 +47,14 @@ resqpy/grid/_write_nexus_corp.py,sha256=yEVfiObsedEAXX6UG6ZTf56kZnQVkd3lLqE2NpL-
 resqpy/grid/_xyz.py,sha256=RLQWOdM_DRoCj4JypwB5gUJ78HTdk5JnZHSeAzuU634,13087
 resqpy/grid_surface/__init__.py,sha256=IlPwm6G7P_Vg_w7JHqSs-d_oxk2QmFtWGTk_vvr1qm8,2911
 resqpy/grid_surface/_blocked_well_populate.py,sha256=Lme1AR-nLWOUlNnmHMVThk6jEg_lAZxWWtL82Yksppw,35867
-resqpy/grid_surface/_find_faces.py,sha256=kTytXfYqhcSES-Mnn1gDcdtvX-Ably1FAV3AILGMYUk,106788
+resqpy/grid_surface/_find_faces.py,sha256=NBr0DF7rfBnPY5KtHJNp4oXW6N870mTGYXdu_jg04Yk,107108
 resqpy/grid_surface/_grid_skin.py,sha256=D0cjHkcuT5KCKb-8EZfXgh0GgJj3kzOBS2wVNXg4bfY,26056
 resqpy/grid_surface/_grid_surface.py,sha256=l2NJo7Kiucolbb_TlLPC7NGdksg_JahkihfsrJVq99w,14379
 resqpy/grid_surface/_trajectory_intersects.py,sha256=Och9cZYU9Y7ofovhPzsLyIblRUl2xj9_5nHH3fMZp-A,22498
 resqpy/grid_surface/grid_surface_cuda.py,sha256=RVhrhzuQOIl3QlUocUeHdmmv6M_HNXe5UH3sDTZRIQI,40016
 resqpy/lines/__init__.py,sha256=zE7j-BeqkOowj_tsZWd2X_fT-RpbuIh17zfEyj2N0oY,539
 resqpy/lines/_common.py,sha256=nlgVgZ8utHXuHDyzuP0IpkUJViDNmmy7EBqwLzxSI2M,11960
-resqpy/lines/_polyline.py,sha256=37E0pGDDaBuqtmvXq2zHyYO97uUIUWljZoSWNibQemc,42659
+resqpy/lines/_polyline.py,sha256=boiVQ2lBLp3c0b1bEA2T_j_a5gNsMI2orxZnitZVdSY,42227
 resqpy/lines/_polyline_set.py,sha256=3K3z_G9l_3mfjLdCL-YVscyj1FA6DHh1uj9rXPtWFOY,27986
 resqpy/model/__init__.py,sha256=hbxO-IpCOH_82TZqj6e1FjrWxO0tZu2gj2HCN9x-Svw,378
 resqpy/model/_catalogue.py,sha256=duvZlNlTPjAfXyqae0J9lMSEx_8-WIcrw2MYxnNEg_Q,30487
@@ -63,13 +62,13 @@ resqpy/model/_context.py,sha256=0tLBVMcuuIj3i87Ig8lhFMLHE5GHgEA2PEl1NjKaohc,2840
 resqpy/model/_forestry.py,sha256=QYE3P9uSsh77J6ghcgp2cBQP6UKrs8edF-m05sqgboo,34518
 resqpy/model/_grids.py,sha256=d7hRQRmni5pJrm1CY31D2icJV1XDar7xTmUexq_eVGY,3371
 resqpy/model/_hdf5.py,sha256=-dq2r3HzBKf0F43kwPy--MZOOjQZlDS4RJ6nG3VOeSs,14448
-resqpy/model/_model.py,sha256=8kBehyWplIi_zYy_TVJY2V0MaVaROfOKAGEBvvrRfxk,106033
+resqpy/model/_model.py,sha256=YEcDgjs4l0lZ059UdV9v4y7FdFs4tS81moFzOteKhvY,106328
 resqpy/model/_xml.py,sha256=TiZKHZezMdcjRvHSa-HzzrYe9kyDdd8L4hacNV0bjEg,24402
 resqpy/multi_processing/__init__.py,sha256=ZRudHfN9aaZjxvat7t8BZr6mwMi9baiCNjczwwT0WjI,909
 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=PWIJOmd9EnVfA4LlFdyO6myCZ9pMnxdpFD0nAfD5evI,25564
+resqpy/multi_processing/wrappers/grid_surface_mp.py,sha256=mpv-EgtlRA5XIINdGU6UgnDTD_MhsrXAfqvMU6iBT6Y,25568
 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
@@ -95,11 +94,11 @@ resqpy/olio/simple_lines.py,sha256=qaR11W5UPgRmtMeFQ-pXg0jOvkJZ_XPzSUpAXqeYtlc,1
 resqpy/olio/time.py,sha256=LtoSIf1A6wunHSpDgKsSGEr0rbcSQyy35TgJvY37PrI,760
 resqpy/olio/trademark.py,sha256=p_EWvUUnfalOA0RC94fSWMDgdGY9-FdZuGtAjg3wNcY,822
 resqpy/olio/transmission.py,sha256=auz_12TKtSPy6Fv3wmKn5lXPRAEnn2tYVyTQfsj37xU,61869
-resqpy/olio/triangulation.py,sha256=0WkN93PzBZ_hfAQ-CYNFldfW88koehPEL62GAjY7ZeM,45928
+resqpy/olio/triangulation.py,sha256=9G9GIBdhoRRRRzZwn-HV3dIJWF6idC7XVkxl6L9v_ic,45989
 resqpy/olio/uuid.py,sha256=JRMi-RZNeGm8tGNloIwTATzNtdj29lBQDV9OILboPRI,7324
 resqpy/olio/vdb.py,sha256=lQYuK1kr1Wnucq2EoKgT6lrR7vloCemnCKZktzBcLUc,45231
 resqpy/olio/vector_utilities.py,sha256=B354cr9-nqqPcb3SAx1jD9Uk51sjkV95xToAiF3-WHA,61127
-resqpy/olio/volume.py,sha256=F1pMnDoJ4ricy4dfdLuLuK1xkVgJckL9V06tUeyK6Wc,6185
+resqpy/olio/volume.py,sha256=inKZzW8UiYvyetltz_r_OgO3UzVtqdOz_RMg-WqlyDo,5475
 resqpy/olio/wellspec_keywords.py,sha256=ad3B727golWYiko54OZOw7vG21IvpNxCMCyLv8jSkcI,26533
 resqpy/olio/write_data.py,sha256=bIX7ilMkXWCMz_zQh-Gqk56sNzng4W5l4BahW2EV7Kw,5142
 resqpy/olio/write_hdf5.py,sha256=iUIYPWlbJsSSq9UXXiXAW_S6TeK-N2M7QvlJJE43EK8,19015
@@ -127,7 +126,7 @@ resqpy/organize/structural_organization_interpretation.py,sha256=xEpm1KKiP9dKktW
 resqpy/organize/tectonic_boundary_feature.py,sha256=mMSsIW8YJ6qpeOe-6gRFaQbK39-WIiGunxPSnwxFyqY,2675
 resqpy/organize/wellbore_feature.py,sha256=E2gFwgPZGr8nkhRHAIR0wTZ8uwcze7y2WBIV7AXeW2A,1843
 resqpy/organize/wellbore_interpretation.py,sha256=jRAHq90tR2dCQSXsZicujXhSVHOEPoGjFgh5S87SMAI,6973
-resqpy/property/__init__.py,sha256=KegXDizklsMB-EnGFrzhCSszrXAHXEIoStdC5XmyifQ,2294
+resqpy/property/__init__.py,sha256=gRnzjdn6bxCQStfHL5qMOs43okVRW168TjqU0C9oL2g,2360
 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=whWG3O3fIXi2TetUKQWC4JPjrKI9tPrYmw0d51HkJgY,32609
@@ -146,7 +145,7 @@ resqpy/property/well_log_collection.py,sha256=BvvRjDkXjuX2iGUwAGmnIvj6L3zIYAP0db
 resqpy/rq_import/__init__.py,sha256=JV6wDE-_oJ-wY5O5Adaqxoti44NC0QLqrU2esyXvyHA,713
 resqpy/rq_import/_add_ab_properties.py,sha256=r9MogJr8QYTVFqKHKv8LQv_PYaDZmA_-aaYy-qeAfTE,4493
 resqpy/rq_import/_add_surfaces.py,sha256=wl8COboHnvfE-rPWZ0pwjNZZbCR3GBKvHQYkEOOViVk,6161
-resqpy/rq_import/_grid_from_cp.py,sha256=5XUDDAWKXPgSCgG2oDwq4wZpl_8QOxlr4JajLIEHDXA,32019
+resqpy/rq_import/_grid_from_cp.py,sha256=I_TIUjtpc1QwUBxis5URywoirAqMiYqbPWepsqgEKfs,31996
 resqpy/rq_import/_import_nexus.py,sha256=cOLVS6CNSOE-nuTV7tkNZTYtTzwIaclu0HaBGJFUeZw,35266
 resqpy/rq_import/_import_vdb_all_grids.py,sha256=m2B4o-_Mmv9YkeIyVI_oQnnB7DNytN3WGfpm3rF_q-A,6942
 resqpy/rq_import/_import_vdb_ensemble.py,sha256=CeoNVeJ88lbPq19gNNvpZNFQmCQE0K7iEEd2cVKjml8,21284
@@ -163,12 +162,12 @@ resqpy/surface/_base_surface.py,sha256=LsWrDrbuuaEVRgf2Dlbc-6ZvGQpjtrKuxF7Jjebvl
 resqpy/surface/_combined_surface.py,sha256=8TnNbSywjej6tW_vRr5zoVgBbvnadCaqWk6WyHWHTYQ,3082
 resqpy/surface/_mesh.py,sha256=yEFldNWT2g8MCGcU4mTeWzDrLHHGLLGLIle1gAjJ_lg,42352
 resqpy/surface/_pointset.py,sha256=niTkBik9hAvqrY8340K1TRG7mg4FMQbbp12WZiiXPMs,27416
-resqpy/surface/_surface.py,sha256=pGVpZiIoaZm7UA26VnEEthMdKr3XtNIIhWFV8mOVDXY,73491
+resqpy/surface/_surface.py,sha256=6Gq90nRWCuIoZ6S9XvOysXV7Z-lNbZsnz3Z45ZPqMwc,85155
 resqpy/surface/_tri_mesh.py,sha256=EmV4FhyjuusQFruW1SseufbnHF5YFoJ6Uvb07UJbH6s,26609
 resqpy/surface/_tri_mesh_stencil.py,sha256=eXt_HIKvsXGsjQ7nm_NbozR6ProQxPbeO52r79j80ig,16087
 resqpy/surface/_triangulated_patch.py,sha256=FKn_Irzp4aLFkkN_-tx1MLMKjEAiOLE8636sOA481TQ,26802
 resqpy/time_series/__init__.py,sha256=jiB3HJUWe47OOJTVmRJ4Gh5vm-XdMaMXmD52kAGr2zY,1074
-resqpy/time_series/_any_time_series.py,sha256=43q5hV-VKReZ6rRMEFHx977OVcOKwPvWOJbB9fj3SFQ,8755
+resqpy/time_series/_any_time_series.py,sha256=PabSxptRcvxsr3bY0tDGHGHm02Fn8meBuIqBAgyMNOU,8953
 resqpy/time_series/_from_nexus_summary.py,sha256=LWTcJNx_rDFNGP2iWk74ABip_f__iYNBE0R8lVzHOYo,6617
 resqpy/time_series/_functions.py,sha256=D5Wzb7RRfNmmNipQj9DSH-I3eQewP7Zqzkb2T1EGeYk,6366
 resqpy/time_series/_geologic_time_series.py,sha256=-4oMxE0R_ZEqyxb9qckawiHS0SJ-rVSZZ11pF6yYn3M,3349
@@ -184,17 +183,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=xRxCPH8c7NxWO-5EErCsq3-e51H22rjgBeKnXWpw_TQ,192481
+resqpy/well/_blocked_well.py,sha256=Greo8r4AD_TRoclboIn5jO0_7v2rLN-GXYApPQ6ScOo,192741
 resqpy/well/_deviation_survey.py,sha256=AsjTl56v8qa2lSxKAMn4vhEadqRTzwH98PmOObCBoe0,23086
-resqpy/well/_md_datum.py,sha256=rRrDQckTJwZtIEh28dlgXj32kcBSu-ZvHFYZOiQsyqg,7154
+resqpy/well/_md_datum.py,sha256=O_rPuKsITUi5JD8OzJsf4a6TpWNDCEmjDk8wpQFgJGQ,6709
 resqpy/well/_trajectory.py,sha256=lt2_MXeRWjsXTMqZZ5n4-fAT0d41RatCG9QUoYopjOQ,52752
-resqpy/well/_wellbore_frame.py,sha256=rzWsBnM-L2NbSpdk-6F5BKYeaqDWbwrIrlpkPjtt0kE,15192
+resqpy/well/_wellbore_frame.py,sha256=7pAJN-yjvyxg8rXzfRDSpHGoE31T7TaLxkyRiUcsm6o,15502
 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=1O4EVPuTn-kN3uT_V4TbSwehnMUMY0TX36XOUgasTcc,24689
-resqpy/well/well_utils.py,sha256=zwpYjT85nXAwWBhYB1Pygu2SgouZ-44k6hEOnpoMfBI,5969
-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,,
+resqpy/well/well_utils.py,sha256=-g_pg2v5XD9g4SQz9sk7KK-x2xEQZHzWehCQqiEGo6M,7627
+resqpy-5.0.0.dist-info/LICENSE,sha256=2duHPIkKQyESMdQ4hKjL8CYEsYRHXaYxt0YQkzsUYE4,1059
+resqpy-5.0.0.dist-info/METADATA,sha256=ZE6vaH5k2arTksxYGev-YVR-JKV4SRm0-XWRrYJyuHk,4026
+resqpy-5.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+resqpy-5.0.0.dist-info/RECORD,,

resqpy/grid/_moved_functions.py

@@ -1,15 +0,0 @@
-"""Submodule containing some general grid functions that have now been moved. This file will be deleted in a later release."""
-
-import warnings
-
-import resqpy.grid._points_functions as pf
-import resqpy.property.property_kind as pk
-
-
-def establish_zone_property_kind(model):
-    """MOVED: Returns zone local property kind object, creating the xml and adding as part if not found in model."""
-    warnings.warn(
-        'This function has been moved to property/property_kind. Please update your code to the new '
-        'location.', DeprecationWarning)
-
-    return pk.establish_zone_property_kind(model)