GEOPY-2809: merge back release

docs/source/block_model.rst

@@ -3,13 +3,24 @@
 Block Model Creation
 ====================
 
-.. note::
+The ``Block Model Creation`` module has been developed as a user interface for the creation of regular (Tensor)
+BlockModel objects using the `discretize <https://discretize.simpeg.xyz/en/main/>`_ package.  A Block
+Model grid is a discretization of a 3D volume into a set of rectangular cells.
 
-    Under construction.
+.. figure:: /images/block_model_creation_result.png
+    :width: 800
 
-The ``Block Model`` module has been developed as a user-interface for the creation of regular (Tensor) BlockModel objects using the `discretize <https://discretize.simpeg.xyz/en/main/>`_ package.
+In order to determine the core extents of the block model, the user will select an input ``Object`` and
+``Core depth``.  The padding is controlled by ``Horizontal padding``, ``Bottom padding``, and
+``Expansion factor``.  The resolution is set per axis by the ``Minimum cell size`` parameters.
 
-# .. figure:: /images/octree_grid.png
-#    :width: 800
+.. figure:: /images/block_model_creation_uijson.png
+   :width: 500
 
-An Block Model grid is a discretization of a 3D volume into a set of rectangular cells.
+The resulting block model will have its core region set by the object and limited by the ``Core depth``
+parameter. The core region will contain cells at the requested ``Minimum cell size`` in all three
+Cartesian directions. ``Horizontal`` and ``Vertical padding`` will be applied outward from the
+core region to the specified distances.  Within the padding region, the cells expand outward at the
+provided ``Expansion factor`` rate.
+
+.. figure:: /images/block_model_creation_result.png

docs/source/block_model_to_octree.rst

@@ -3,14 +3,32 @@
 Block Model to Octree
 =====================
 
-.. note::
 
-    Under construction.
+The ``Block Model to Octree`` module has been developed as a user interface for the conversion between
+regular 3D grid (`BlockModel`) objects to Octree, using the `discretize <https://discretize.simpeg.xyz/en/main/>`_
+package.
 
-The ``Block model to Octree`` module has been developed as a user-interface for the conversion between regular (Tensor) BlockModel objects to Octree, using the `discretize <https://discretize.simpeg.xyz/en/main/>`_ package.
+.. figure:: /images/block_model_to_octree_advanced.png
+    :width: 800
 
-# .. figure:: /images/octree_grid.png
-#    :width: 800
+In its most simple form, the application creates an octree from the input block model.
 
-An octree mesh is a discretization of a 3D volume into a set of rectangular cells. The cells are defined by a tree
-structure, where each node has 8 children.
+.. figure:: /images/block_model_to_octree_uijson_basic.png
+   :width: 500
+
+In this case the application will create an octree with the core region matching the cells of
+the block model with a small padding region where the cells are allowed to expand to the closest
+octree level.
+
+.. figure:: /images/block_model_to_octree_basic_usage.png
+    :width: 800
+
+Optionally, users can select a model stored on the tensor mesh.
+
+.. figure:: /images/block_model_to_octree_uijson_advanced.png
+   :width: 500
+
+The octree will then be refined in areas that contain large gradients in the selected model.
+
+.. figure:: /images/block_model_to_octree_advanced.png
+    :width: 800

environments/py-3.12-linux-64-dev.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: ddc1ef05f5eda34fc0a7036911d4010fbc7c6f519f33466b4c10eee2559f219d
+# input_hash: 1dafb147f14260ff03c478aa59889d8ec2ac87a5441e62134e01ab9a622bb436
 
 channels:
   - conda-forge
@@ -10,123 +10,134 @@ dependencies:
   - alabaster=1.0.0=pyhd8ed1ab_1
   - annotated-types=0.7.0=pyhd8ed1ab_1
   - astroid=4.0.4=py312h7900ff3_0
-  - babel=2.18.0=pyhcf101f3_0
-  - backports.zstd=1.3.0=py312h90b7ffd_0
+  - aws-c-auth=0.10.1=ha62d5e7_3
+  - aws-c-cal=0.9.13=h2c9d079_1
+  - aws-c-common=0.12.6=hb03c661_0
+  - aws-c-compression=0.3.2=h8b1a151_0
+  - aws-c-http=0.10.13=h4bacb7b_0
+  - aws-c-io=0.26.3=hb18f61d_2
+  - aws-c-s3=0.12.2=he6ee468_1
+  - aws-c-sdkutils=0.2.4=h8b1a151_4
+  - aws-checksums=0.2.10=h8b1a151_0
+  - babel=2.18.0=pyhcf101f3_1
+  - backports.zstd=1.5.0=py312h90b7ffd_0
   - brotli=1.2.0=hed03a55_1
   - brotli-bin=1.2.0=hb03c661_1
   - brotli-python=1.2.0=py312hdb49522_1
   - bzip2=1.0.8=hda65f42_9
   - c-ares=1.34.6=hb03c661_0
-  - ca-certificates=2026.1.4=hbd8a1cb_0
+  - ca-certificates=2026.5.20=hbd8a1cb_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
-  - certifi=2026.1.4=pyhd8ed1ab_0
-  - charset-normalizer=3.4.4=pyhd8ed1ab_0
+  - certifi=2026.5.20=pyhd8ed1ab_0
+  - charset-normalizer=3.4.7=pyhd8ed1ab_0
   - colorama=0.4.6=pyhd8ed1ab_1
   - contourpy=1.3.3=py312h0a2e395_4
-  - coverage=7.13.4=py312h8a5da7c_0
+  - coverage=7.14.1=py312h8a5da7c_0
   - cycler=0.12.1=pyhcf101f3_2
   - dill=0.4.1=pyhcf101f3_0
   - discretize=0.12.0=np2py312h2a48985_1
   - docutils=0.21.2=pyhd8ed1ab_1
   - exceptiongroup=1.3.1=pyhd8ed1ab_0
-  - fonttools=4.61.1=py312h8a5da7c_0
-  - freetype=2.14.1=ha770c72_0
+  - fonttools=4.63.0=py312h8a5da7c_0
+  - freetype=2.14.3=ha770c72_0
   - h2=4.3.0=pyhcf101f3_0
-  - h5py=3.15.1=nompi_py312ha4f8f14_101
-  - hdf5=1.14.6=nompi_h19486de_106
+  - h5py=3.16.0=nompi_py312ha829cd9_102
+  - hdf5=2.1.0=nompi_h87a9417_105
   - hpack=4.1.0=pyhd8ed1ab_0
   - hyperframe=6.1.0=pyhd8ed1ab_0
-  - icu=78.2=h33c6efd_0
-  - idna=3.11=pyhd8ed1ab_0
-  - imagesize=1.4.1=pyhd8ed1ab_0
-  - importlib-metadata=8.7.0=pyhe01879c_1
+  - icu=78.3=h33c6efd_0
+  - idna=3.17=pyhcf101f3_0
+  - imagesize=2.0.0=pyhd8ed1ab_0
+  - importlib-metadata=9.0.0=pyhcf101f3_0
   - iniconfig=2.3.0=pyhd8ed1ab_0
-  - isort=7.0.0=pyhd8ed1ab_0
+  - isort=8.0.1=pyhd8ed1ab_0
   - jinja2=3.1.6=pyhcf101f3_1
   - keyutils=1.6.3=hb9d3cd8_0
-  - kiwisolver=1.4.9=py312h0a2e395_2
+  - kiwisolver=1.5.0=py312h0a2e395_0
   - krb5=1.22.2=ha1258a1_0
-  - lcms2=2.18=h0c24ade_0
-  - ld_impl_linux-64=2.45.1=default_hbd61a6d_101
-  - lerc=4.0.0=h0aef613_1
+  - lcms2=2.19.1=h0c24ade_1
+  - ld_impl_linux-64=2.45.1=default_hbd61a6d_102
+  - lerc=4.1.0=hdb68285_0
   - libaec=1.1.5=h088129d_0
-  - libblas=3.11.0=5_h5875eb1_mkl
+  - libblas=3.11.0=8_h5875eb1_mkl
   - libbrotlicommon=1.2.0=hb03c661_1
   - libbrotlidec=1.2.0=hb03c661_1
   - libbrotlienc=1.2.0=hb03c661_1
-  - libcblas=3.11.0=5_hfef963f_mkl
-  - libcurl=8.18.0=hcf29cc6_1
+  - libcblas=3.11.0=8_hfef963f_mkl
+  - libcurl=8.20.0=hcf29cc6_0
   - libdeflate=1.25=h17f619e_0
   - libedit=3.1.20250104=pl5321h7949ede_0
   - libev=4.33=hd590300_2
-  - libexpat=2.7.4=hecca717_0
+  - libexpat=2.8.1=hecca717_0
   - libffi=3.5.2=h3435931_0
-  - libfreetype=2.14.1=ha770c72_0
-  - libfreetype6=2.14.1=h73754d4_0
-  - libgcc=15.2.0=he0feb66_18
-  - libgcc-ng=15.2.0=h69a702a_18
-  - libgfortran=15.2.0=h69a702a_18
-  - libgfortran5=15.2.0=h68bc16d_18
-  - libhwloc=2.12.2=default_hafda6a7_1000
+  - libfreetype=2.14.3=ha770c72_0
+  - libfreetype6=2.14.3=h73754d4_0
+  - libgcc=15.2.0=he0feb66_19
+  - libgcc-ng=15.2.0=h69a702a_19
+  - libgfortran=15.2.0=h69a702a_19
+  - libgfortran5=15.2.0=h68bc16d_19
+  - libhwloc=2.13.0=default_he001693_1000
   - libiconv=1.18=h3b78370_2
-  - libjpeg-turbo=3.1.2=hb03c661_0
-  - liblapack=3.11.0=5_h5e43f62_mkl
-  - liblzma=5.8.2=hb03c661_0
-  - libnghttp2=1.67.0=had1ee68_0
+  - libjpeg-turbo=3.1.4.1=hb03c661_0
+  - liblapack=3.11.0=8_h5e43f62_mkl
+  - liblzma=5.8.3=hb03c661_0
+  - libnghttp2=1.68.1=h877daf1_0
   - libnsl=2.0.1=hb9d3cd8_1
-  - libpng=1.6.55=h421ea60_0
-  - libsqlite=3.51.2=hf4e2dac_0
+  - libpng=1.6.58=h421ea60_0
+  - libsqlite=3.53.1=h0c1763c_0
   - libssh2=1.11.1=hcf80075_0
-  - libstdcxx=15.2.0=h934c35e_18
-  - libstdcxx-ng=15.2.0=hdf11a46_18
+  - libstdcxx=15.2.0=h934c35e_19
+  - libstdcxx-ng=15.2.0=hdf11a46_19
   - libtiff=4.7.1=h9d88235_1
-  - libuuid=2.41.3=h5347b49_0
+  - libuuid=2.42.1=h5347b49_0
   - libwebp-base=1.6.0=hd42ef1d_0
   - libxcb=1.17.0=h8a09558_0
   - libxcrypt=4.4.36=hd590300_1
-  - libxml2=2.15.1=he237659_1
-  - libxml2-16=2.15.1=hca6bf5a_1
-  - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=21.1.8=h4922eb0_0
-  - markupsafe=3.0.3=py312h8a5da7c_0
-  - matplotlib-base=3.10.8=py312he3d6523_0
+  - libxml2=2.15.3=h49c6c72_0
+  - libxml2-16=2.15.3=hca6bf5a_0
+  - libzlib=1.3.2=h25fd6f3_2
+  - llvm-openmp=22.1.6=h4922eb0_0
+  - markupsafe=3.0.3=py312h8a5da7c_1
+  - matplotlib-base=3.10.9=py312he3d6523_0
   - mccabe=0.7.0=pyhd8ed1ab_1
-  - mkl=2025.3.0=h0e700b2_463
+  - mkl=2026.0.0=h0e700b2_915
   - munkres=1.1.4=pyhd8ed1ab_1
-  - ncurses=6.5=h2d0b736_3
-  - numpy=2.4.2=py312h33ff503_1
+  - ncurses=6.6=hdb14827_0
+  - numpy=2.4.6=py312h33ff503_0
+  - onemkl-license=2026.0.0=hf2ce2f3_915
   - openjpeg=2.5.4=h55fea9a_0
-  - openssl=3.6.1=h35e630c_1
-  - packaging=26.0=pyhcf101f3_0
-  - pillow=12.1.1=py312h50c33e8_0
-  - pip=26.0.1=pyh8b19718_0
-  - platformdirs=4.9.2=pyhcf101f3_0
+  - openssl=3.6.2=h35e630c_0
+  - packaging=26.2=pyhc364b38_0
+  - pillow=12.2.0=py312h50c33e8_0
+  - pip=26.1.2=pyh8b19718_0
+  - platformdirs=4.10.0=pyhcf101f3_0
   - pluggy=1.6.0=pyhf9edf01_1
+  - psutil=7.2.2=py312h5253ce2_0
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pydantic=2.12.5=pyhcf101f3_1
   - pydantic-core=2.41.5=py312h868fb18_1
-  - pygments=2.19.2=pyhd8ed1ab_0
-  - pylint=4.0.4=pyhcf101f3_0
+  - pygments=2.20.0=pyhd8ed1ab_0
+  - pylint=4.0.5=pyhcf101f3_0
   - pyparsing=3.3.2=pyhcf101f3_0
   - pysocks=1.7.1=pyha55dd90_7
-  - pytest=9.0.2=pyhcf101f3_0
-  - pytest-cov=7.0.0=pyhcf101f3_1
-  - python=3.12.12=hd63d673_2_cpython
+  - pytest=9.0.3=pyhc364b38_1
+  - pytest-cov=7.1.0=pyhcf101f3_0
+  - python=3.12.13=hd63d673_0_cpython
   - python-dateutil=2.9.0.post0=pyhe01879c_2
   - python_abi=3.12=8_cp312
-  - pytz=2025.2=pyhd8ed1ab_0
   - pyyaml=6.0.3=py312h8a5da7c_1
   - qhull=2020.2=h434a139_5
   - readline=8.3=h853b02a_0
-  - requests=2.32.5=pyhcf101f3_1
+  - requests=2.34.2=pyhcf101f3_0
   - roman-numerals=4.1.0=pyhd8ed1ab_0
   - roman-numerals-py=4.1.0=pyhd8ed1ab_0
-  - scipy=1.17.0=py312h54fa4ab_1
-  - setuptools=82.0.0=pyh332efcf_0
+  - s2n=1.7.3=hc5a330e_0
+  - scipy=1.17.1=py312h54fa4ab_1
+  - setuptools=82.0.1=pyh332efcf_0
   - six=1.17.0=pyhe01879c_1
-  - snowballstemmer=3.0.1=pyhd8ed1ab_0
-  - sphinx=8.2.3=pyhd8ed1ab_0
+  - snowballstemmer=3.1.0=pyhd8ed1ab_0
+  - sphinx=8.3.0=pyhd8ed1ab_0
   - sphinx-autodoc-typehints=3.5.2=pyhd8ed1ab_0
   - sphinx-rtd-theme=3.1.0=hd8ed1ab_0
   - sphinx_rtd_theme=3.1.0=pyha770c72_0
@@ -137,26 +148,26 @@ dependencies:
   - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
   - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
   - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
-  - tbb=2022.3.0=hb700be7_2
+  - tbb=2023.0.0=hab88423_2
   - tk=8.6.13=noxft_h366c992_103
-  - tomli=2.4.0=pyhcf101f3_0
-  - tomlkit=0.14.0=pyha770c72_0
+  - tomli=2.4.1=pyhcf101f3_0
+  - tomlkit=0.15.0=pyha770c72_0
   - typing-extensions=4.15.0=h396c80c_0
-  - typing-inspection=0.4.2=pyhd8ed1ab_1
+  - typing-inspection=0.4.2=pyhcf101f3_2
   - typing_extensions=4.15.0=pyhcf101f3_0
   - tzdata=2025c=hc9c84f9_1
   - unicodedata2=17.0.1=py312h4c3975b_0
-  - urllib3=2.6.3=pyhd8ed1ab_0
-  - wheel=0.46.3=pyhd8ed1ab_0
+  - urllib3=2.7.0=pyhd8ed1ab_0
+  - wheel=0.47.0=pyhd8ed1ab_0
   - xorg-libxau=1.0.12=hb03c661_1
   - xorg-libxdmcp=1.1.5=hb03c661_1
   - yaml=0.2.5=h280c20c_3
-  - zipp=3.23.0=pyhcf101f3_1
+  - zipp=4.1.0=pyhcf101f3_0
   - zlib-ng=2.3.3=hceb46e0_1
   - zstd=1.5.7=hb78ec9c_6
   - pip:
-    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@668a9e0da5214e4a3bce466321cd910f1bb00b02
-    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@9e0a86e5afadfe9c55e9811317827a4f6c2c70c4
+    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6222ed5be1a26e8db288d91b4fbccc891e3ca5d2
+    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@cbdabab52382413a3d6176262a2bf189a9b4cd24
 
 variables:
   KMP_WARNINGS: 0