Skip to content

Commit ca758e5

Browse files
authored
Merge pull request #20 from MiraGeoscience/GEOPY-1508
GEOPY-1508: Convert BlockModel to octree
2 parents 6d63c90 + 22e5488 commit ca758e5

28 files changed

Lines changed: 945 additions & 368 deletions

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 8605c205c41d52721e74d85b03b24735be01c07d2f41ce73ef3dc6f84544b0ad
3+
# input_hash: 0f015520b955e36b3889c3abc40eacae0c503368502cf452f27ee4aaa6e40ca5
44

55
channels:
66
- conda-forge
@@ -21,10 +21,10 @@ dependencies:
2121
- discretize=0.11.2=py310ha2bacc8_1
2222
- exceptiongroup=1.2.2=pyhd8ed1ab_1
2323
- freetype=2.13.3=ha770c72_1
24-
- h5py=3.13.0=nompi_py310h60e0fe6_100
25-
- hdf5=1.14.3=nompi_h2d575fe_109
24+
- h5py=3.13.0=nompi_py310h2a0e991_101
25+
- hdf5=1.14.6=nompi_h2d575fe_101
2626
- iniconfig=2.0.0=pyhd8ed1ab_1
27-
- isort=6.0.1=pyhd8ed1ab_0
27+
- isort=6.0.1=pyhd8ed1ab_1
2828
- jinja2=3.1.6=pyhd8ed1ab_0
2929
- keyutils=1.6.1=h166bdaf_0
3030
- krb5=1.21.3=h659f571_0
@@ -69,25 +69,25 @@ dependencies:
6969
- ncurses=6.5=h2d0b736_3
7070
- numpy=1.26.4=py310hb13e2d6_0
7171
- openjpeg=2.5.3=h5fbd93e_0
72-
- openssl=3.5.0=h7b32b05_0
72+
- openssl=3.5.0=h7b32b05_1
7373
- packaging=25.0=pyh29332c3_1
7474
- pillow=10.3.0=py310hebfe307_1
75-
- pip=25.1=pyh8b19718_0
75+
- pip=25.1.1=pyh8b19718_0
7676
- platformdirs=4.3.7=pyh29332c3_0
7777
- pluggy=1.5.0=pyhd8ed1ab_1
7878
- pthread-stubs=0.4=hb9d3cd8_1002
7979
- pydantic=2.11.3=pyh3cfb1c2_0
8080
- pydantic-core=2.33.1=py310hc1293b2_0
8181
- pygments=2.19.1=pyhd8ed1ab_0
82-
- pylint=3.3.6=pyh29332c3_0
82+
- pylint=3.3.7=pyhe01879c_0
8383
- pytest=8.3.5=pyhd8ed1ab_0
8484
- pytest-cov=6.1.1=pyhd8ed1ab_0
8585
- python=3.10.17=hd6af730_0_cpython
8686
- python_abi=3.10=7_cp310
8787
- pyyaml=6.0.2=py310h89163eb_2
8888
- readline=8.2=h8c095d6_2
8989
- scipy=1.14.1=py310hfcf56fc_2
90-
- setuptools=79.0.1=pyhff2d567_0
90+
- setuptools=80.1.0=pyhff2d567_0
9191
- tk=8.6.13=noxft_h4845f30_101
9292
- toml=0.10.2=pyhd8ed1ab_1
9393
- tomli=2.2.1=pyhd8ed1ab_1
@@ -102,8 +102,9 @@ dependencies:
102102
- yaml=0.2.5=h7f98852_2
103103
- zstd=1.5.7=hb8e6e7a_2
104104
- pip:
105-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
106-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
105+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
106+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
107+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
107108

108109
variables:
109110
KMP_WARNINGS: 0

environments/py-3.10-linux-64.conda.lock.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 8605c205c41d52721e74d85b03b24735be01c07d2f41ce73ef3dc6f84544b0ad
3+
# input_hash: 0f015520b955e36b3889c3abc40eacae0c503368502cf452f27ee4aaa6e40ca5
44

55
channels:
66
- conda-forge
@@ -16,8 +16,8 @@ dependencies:
1616
- cached_property=1.5.2=pyha770c72_1
1717
- discretize=0.11.2=py310ha2bacc8_1
1818
- freetype=2.13.3=ha770c72_1
19-
- h5py=3.13.0=nompi_py310h60e0fe6_100
20-
- hdf5=1.14.3=nompi_h2d575fe_109
19+
- h5py=3.13.0=nompi_py310h2a0e991_101
20+
- hdf5=1.14.6=nompi_h2d575fe_101
2121
- keyutils=1.6.1=h166bdaf_0
2222
- krb5=1.21.3=h659f571_0
2323
- lcms2=2.17=h717163a_0
@@ -59,17 +59,17 @@ dependencies:
5959
- ncurses=6.5=h2d0b736_3
6060
- numpy=1.26.4=py310hb13e2d6_0
6161
- openjpeg=2.5.3=h5fbd93e_0
62-
- openssl=3.5.0=h7b32b05_0
62+
- openssl=3.5.0=h7b32b05_1
6363
- pillow=10.3.0=py310hebfe307_1
64-
- pip=25.1=pyh8b19718_0
64+
- pip=25.1.1=pyh8b19718_0
6565
- pthread-stubs=0.4=hb9d3cd8_1002
6666
- pydantic=2.11.3=pyh3cfb1c2_0
6767
- pydantic-core=2.33.1=py310hc1293b2_0
6868
- python=3.10.17=hd6af730_0_cpython
6969
- python_abi=3.10=7_cp310
7070
- readline=8.2=h8c095d6_2
7171
- scipy=1.14.1=py310hfcf56fc_2
72-
- setuptools=79.0.1=pyhff2d567_0
72+
- setuptools=80.1.0=pyhff2d567_0
7373
- tk=8.6.13=noxft_h4845f30_101
7474
- typing-extensions=4.13.2=h0e9735f_0
7575
- typing-inspection=0.4.0=pyhd8ed1ab_0
@@ -80,8 +80,9 @@ dependencies:
8080
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
8181
- zstd=1.5.7=hb8e6e7a_2
8282
- pip:
83-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
84-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
83+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
84+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
85+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
8586

8687
variables:
8788
KMP_WARNINGS: 0

environments/py-3.10-win-64-dev.conda.lock.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: win-64
3-
# input_hash: 531e7165329dd0ff4aabb7756986b28aa184847a0850f9ff511c9ef1fbec2692
3+
# input_hash: e50b8da34486dd25c5e35cf43b44b856b84eb6db4cdab3610dd02b8bec307e67
44

55
channels:
66
- conda-forge
@@ -19,11 +19,11 @@ dependencies:
1919
- discretize=0.11.2=py310h3e8ed56_1
2020
- exceptiongroup=1.2.2=pyhd8ed1ab_1
2121
- freetype=2.13.3=h57928b3_1
22-
- h5py=3.13.0=nompi_py310h2b0be38_100
23-
- hdf5=1.14.3=nompi_hb2c4d47_109
22+
- h5py=3.13.0=nompi_py310hd6dd405_101
23+
- hdf5=1.14.6=nompi_hd5d9e70_101
2424
- iniconfig=2.0.0=pyhd8ed1ab_1
2525
- intel-openmp=2024.2.1=h57928b3_1083
26-
- isort=6.0.1=pyhd8ed1ab_0
26+
- isort=6.0.1=pyhd8ed1ab_1
2727
- jinja2=3.1.6=pyhd8ed1ab_0
2828
- krb5=1.21.3=hdf4eb48_0
2929
- lcms2=2.17=hbcf6048_0
@@ -58,24 +58,24 @@ dependencies:
5858
- mkl=2024.2.2=h66d3029_15
5959
- numpy=1.26.4=py310hf667824_0
6060
- openjpeg=2.5.3=h4d64b90_0
61-
- openssl=3.5.0=ha4e3fda_0
61+
- openssl=3.5.0=ha4e3fda_1
6262
- packaging=25.0=pyh29332c3_1
6363
- pillow=10.3.0=py310h3e38d90_1
64-
- pip=25.1=pyh8b19718_0
64+
- pip=25.1.1=pyh8b19718_0
6565
- platformdirs=4.3.7=pyh29332c3_0
6666
- pluggy=1.5.0=pyhd8ed1ab_1
6767
- pthread-stubs=0.4=h0e40799_1002
6868
- pydantic=2.11.3=pyh3cfb1c2_0
6969
- pydantic-core=2.33.1=py310h7c79e54_0
7070
- pygments=2.19.1=pyhd8ed1ab_0
71-
- pylint=3.3.6=pyh29332c3_0
71+
- pylint=3.3.7=pyhe01879c_0
7272
- pytest=8.3.5=pyhd8ed1ab_0
7373
- pytest-cov=6.1.1=pyhd8ed1ab_0
7474
- python=3.10.17=h8c5b53a_0_cpython
7575
- python_abi=3.10=7_cp310
7676
- pyyaml=6.0.2=py310h38315fa_2
7777
- scipy=1.14.1=py310hbd0dde3_2
78-
- setuptools=79.0.1=pyhff2d567_0
78+
- setuptools=80.1.0=pyhff2d567_0
7979
- tbb=2021.13.0=h62715c5_1
8080
- tk=8.6.13=h5226925_1
8181
- toml=0.10.2=pyhd8ed1ab_1
@@ -95,8 +95,9 @@ dependencies:
9595
- yaml=0.2.5=h8ffe710_2
9696
- zstd=1.5.7=hbeecb71_2
9797
- pip:
98-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
99-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
98+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
99+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
100+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
100101

101102
variables:
102103
KMP_WARNINGS: 0

environments/py-3.10-win-64.conda.lock.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: win-64
3-
# input_hash: 531e7165329dd0ff4aabb7756986b28aa184847a0850f9ff511c9ef1fbec2692
3+
# input_hash: e50b8da34486dd25c5e35cf43b44b856b84eb6db4cdab3610dd02b8bec307e67
44

55
channels:
66
- conda-forge
@@ -14,8 +14,8 @@ dependencies:
1414
- cached_property=1.5.2=pyha770c72_1
1515
- discretize=0.11.2=py310h3e8ed56_1
1616
- freetype=2.13.3=h57928b3_1
17-
- h5py=3.13.0=nompi_py310h2b0be38_100
18-
- hdf5=1.14.3=nompi_hb2c4d47_109
17+
- h5py=3.13.0=nompi_py310hd6dd405_101
18+
- hdf5=1.14.6=nompi_hd5d9e70_101
1919
- intel-openmp=2024.2.1=h57928b3_1083
2020
- krb5=1.21.3=hdf4eb48_0
2121
- lcms2=2.17=hbcf6048_0
@@ -48,16 +48,16 @@ dependencies:
4848
- mkl=2024.2.2=h66d3029_15
4949
- numpy=1.26.4=py310hf667824_0
5050
- openjpeg=2.5.3=h4d64b90_0
51-
- openssl=3.5.0=ha4e3fda_0
51+
- openssl=3.5.0=ha4e3fda_1
5252
- pillow=10.3.0=py310h3e38d90_1
53-
- pip=25.1=pyh8b19718_0
53+
- pip=25.1.1=pyh8b19718_0
5454
- pthread-stubs=0.4=h0e40799_1002
5555
- pydantic=2.11.3=pyh3cfb1c2_0
5656
- pydantic-core=2.33.1=py310h7c79e54_0
5757
- python=3.10.17=h8c5b53a_0_cpython
5858
- python_abi=3.10=7_cp310
5959
- scipy=1.14.1=py310hbd0dde3_2
60-
- setuptools=79.0.1=pyhff2d567_0
60+
- setuptools=80.1.0=pyhff2d567_0
6161
- tbb=2021.13.0=h62715c5_1
6262
- tk=8.6.13=h5226925_1
6363
- typing-extensions=4.13.2=h0e9735f_0
@@ -72,8 +72,9 @@ dependencies:
7272
- xorg-libxdmcp=1.1.5=h0e40799_0
7373
- zstd=1.5.7=hbeecb71_2
7474
- pip:
75-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
76-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
75+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
76+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
77+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
7778

7879
variables:
7980
KMP_WARNINGS: 0

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 0c80b5c6f8edf5dbcc4a9eeee78d6459ddca3dff80bdbc2145fcbcfc163079e3
3+
# input_hash: d7c08e4dd04604cd41f664f4685f9f15e23e254627bb57b106817c2ae6efff98
44

55
channels:
66
- conda-forge
@@ -21,10 +21,10 @@ dependencies:
2121
- discretize=0.11.2=py311h5b7b71f_1
2222
- exceptiongroup=1.2.2=pyhd8ed1ab_1
2323
- freetype=2.13.3=ha770c72_1
24-
- h5py=3.13.0=nompi_py311hb639ac4_100
25-
- hdf5=1.14.3=nompi_h2d575fe_109
24+
- h5py=3.13.0=nompi_py311h38436b4_101
25+
- hdf5=1.14.6=nompi_h2d575fe_101
2626
- iniconfig=2.0.0=pyhd8ed1ab_1
27-
- isort=6.0.1=pyhd8ed1ab_0
27+
- isort=6.0.1=pyhd8ed1ab_1
2828
- jinja2=3.1.6=pyhd8ed1ab_0
2929
- keyutils=1.6.1=h166bdaf_0
3030
- krb5=1.21.3=h659f571_0
@@ -69,25 +69,25 @@ dependencies:
6969
- ncurses=6.5=h2d0b736_3
7070
- numpy=1.26.4=py311h64a7726_0
7171
- openjpeg=2.5.3=h5fbd93e_0
72-
- openssl=3.5.0=h7b32b05_0
72+
- openssl=3.5.0=h7b32b05_1
7373
- packaging=25.0=pyh29332c3_1
7474
- pillow=10.3.0=py311h82a398c_1
75-
- pip=25.1=pyh8b19718_0
75+
- pip=25.1.1=pyh8b19718_0
7676
- platformdirs=4.3.7=pyh29332c3_0
7777
- pluggy=1.5.0=pyhd8ed1ab_1
7878
- pthread-stubs=0.4=hb9d3cd8_1002
7979
- pydantic=2.11.3=pyh3cfb1c2_0
8080
- pydantic-core=2.33.1=py311h687327b_0
8181
- pygments=2.19.1=pyhd8ed1ab_0
82-
- pylint=3.3.6=pyh29332c3_0
82+
- pylint=3.3.7=pyhe01879c_0
8383
- pytest=8.3.5=pyhd8ed1ab_0
8484
- pytest-cov=6.1.1=pyhd8ed1ab_0
8585
- python=3.11.12=h9e4cc4f_0_cpython
8686
- python_abi=3.11=7_cp311
8787
- pyyaml=6.0.2=py311h2dc5d0c_2
8888
- readline=8.2=h8c095d6_2
8989
- scipy=1.14.1=py311he9a78e4_2
90-
- setuptools=79.0.1=pyhff2d567_0
90+
- setuptools=80.1.0=pyhff2d567_0
9191
- tk=8.6.13=noxft_h4845f30_101
9292
- toml=0.10.2=pyhd8ed1ab_1
9393
- tomli=2.2.1=pyhd8ed1ab_1
@@ -102,8 +102,9 @@ dependencies:
102102
- yaml=0.2.5=h7f98852_2
103103
- zstd=1.5.7=hb8e6e7a_2
104104
- pip:
105-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
106-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
105+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
106+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
107+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
107108

108109
variables:
109110
KMP_WARNINGS: 0

environments/py-3.11-linux-64.conda.lock.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 0c80b5c6f8edf5dbcc4a9eeee78d6459ddca3dff80bdbc2145fcbcfc163079e3
3+
# input_hash: d7c08e4dd04604cd41f664f4685f9f15e23e254627bb57b106817c2ae6efff98
44

55
channels:
66
- conda-forge
@@ -16,8 +16,8 @@ dependencies:
1616
- cached_property=1.5.2=pyha770c72_1
1717
- discretize=0.11.2=py311h5b7b71f_1
1818
- freetype=2.13.3=ha770c72_1
19-
- h5py=3.13.0=nompi_py311hb639ac4_100
20-
- hdf5=1.14.3=nompi_h2d575fe_109
19+
- h5py=3.13.0=nompi_py311h38436b4_101
20+
- hdf5=1.14.6=nompi_h2d575fe_101
2121
- keyutils=1.6.1=h166bdaf_0
2222
- krb5=1.21.3=h659f571_0
2323
- lcms2=2.17=h717163a_0
@@ -59,17 +59,17 @@ dependencies:
5959
- ncurses=6.5=h2d0b736_3
6060
- numpy=1.26.4=py311h64a7726_0
6161
- openjpeg=2.5.3=h5fbd93e_0
62-
- openssl=3.5.0=h7b32b05_0
62+
- openssl=3.5.0=h7b32b05_1
6363
- pillow=10.3.0=py311h82a398c_1
64-
- pip=25.1=pyh8b19718_0
64+
- pip=25.1.1=pyh8b19718_0
6565
- pthread-stubs=0.4=hb9d3cd8_1002
6666
- pydantic=2.11.3=pyh3cfb1c2_0
6767
- pydantic-core=2.33.1=py311h687327b_0
6868
- python=3.11.12=h9e4cc4f_0_cpython
6969
- python_abi=3.11=7_cp311
7070
- readline=8.2=h8c095d6_2
7171
- scipy=1.14.1=py311he9a78e4_2
72-
- setuptools=79.0.1=pyhff2d567_0
72+
- setuptools=80.1.0=pyhff2d567_0
7373
- tk=8.6.13=noxft_h4845f30_101
7474
- typing-extensions=4.13.2=h0e9735f_0
7575
- typing-inspection=0.4.0=pyhd8ed1ab_0
@@ -80,8 +80,9 @@ dependencies:
8080
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
8181
- zstd=1.5.7=hb8e6e7a_2
8282
- pip:
83-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6e21320c89581dccb1635d8460dfe296ec41b6da
84-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a004f090c7ad51fd1503e5af0126c47f71b9ef98
83+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@7b76c8132fa01d3007b883326a817a8d1e17cfc3
84+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4acc52a74c4c20a6ffc7f335e431f9ef3f6392b1
85+
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
8586

8687
variables:
8788
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)