Skip to content

Commit 0397f13

Browse files
authored
Merge pull request #216 from MiraGeoscience/GEOPY-789
GEOPY-789: Joint inversion: PGI
2 parents 529aef8 + 6749baa commit 0397f13

27 files changed

Lines changed: 2388 additions & 1303 deletions

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ dependencies:
3535
- certifi=2025.4.26=pyhd8ed1ab_0
3636
- cffi=1.17.1=py310h8deb56e_0
3737
- charset-normalizer=3.4.2=pyhd8ed1ab_0
38-
- click=8.2.0=pyh707e725_0
38+
- click=8.2.1=pyh707e725_0
3939
- cloudpickle=3.1.1=pyhd8ed1ab_0
4040
- colorama=0.4.6=pyhd8ed1ab_1
4141
- comm=0.2.2=pyhd8ed1ab_1
4242
- contourpy=1.3.2=py310h3788b33_0
43-
- coverage=7.8.0=py310h89163eb_0
43+
- coverage=7.8.2=py310h89163eb_0
4444
- cycler=0.12.1=pyhd8ed1ab_1
4545
- cytoolz=1.0.1=py310ha75aee5_0
4646
- dask-core=2025.3.0=pyhd8ed1ab_0
@@ -55,10 +55,10 @@ dependencies:
5555
- exceptiongroup=1.3.0=pyhd8ed1ab_0
5656
- executing=2.2.0=pyhd8ed1ab_0
5757
- fasteners=0.19=pyhd8ed1ab_1
58-
- fonttools=4.58.0=py310h89163eb_0
58+
- fonttools=4.58.1=py310h89163eb_0
5959
- fqdn=1.5.1=pyhd8ed1ab_1
6060
- freetype=2.13.3=ha770c72_1
61-
- fsspec=2025.3.2=pyhd8ed1ab_0
61+
- fsspec=2025.5.1=pyhd8ed1ab_0
6262
- geoana=0.7.2=py310ha2bacc8_0
6363
- greenlet=3.2.2=py310hf71b8c6_0
6464
- h11=0.16.0=pyhd8ed1ab_0
@@ -72,8 +72,8 @@ dependencies:
7272
- icu=75.1=he02047a_0
7373
- idna=3.10=pyhd8ed1ab_1
7474
- imagesize=1.4.1=pyhd8ed1ab_0
75-
- importlib-metadata=8.6.1=pyha770c72_0
76-
- importlib_metadata=8.6.1=hd8ed1ab_0
75+
- importlib-metadata=8.7.0=pyhe01879c_1
76+
- importlib_metadata=8.7.0=h40b2b14_1
7777
- importlib_resources=6.5.2=pyhd8ed1ab_0
7878
- iniconfig=2.0.0=pyhd8ed1ab_1
7979
- ipykernel=6.29.5=pyh3099207_0
@@ -84,21 +84,21 @@ dependencies:
8484
- isort=6.0.1=pyhd8ed1ab_1
8585
- jedi=0.19.2=pyhd8ed1ab_1
8686
- jinja2=3.1.6=pyhd8ed1ab_0
87-
- joblib=1.5.0=pyhd8ed1ab_0
87+
- joblib=1.5.1=pyhd8ed1ab_0
8888
- json5=0.12.0=pyhd8ed1ab_0
8989
- jsonpointer=3.0.0=py310hff52083_1
90-
- jsonschema=4.23.0=pyhd8ed1ab_1
90+
- jsonschema=4.24.0=pyhd8ed1ab_0
9191
- jsonschema-specifications=2025.4.1=pyh29332c3_0
92-
- jsonschema-with-format-nongpl=4.23.0=hd8ed1ab_1
92+
- jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0
9393
- jupyter-book=1.0.3=pyhd8ed1ab_1
9494
- jupyter-cache=1.0.1=pyhff2d567_0
95-
- jupyter-lsp=2.2.5=pyhd8ed1ab_1
95+
- jupyter-lsp=2.2.5=pyhe01879c_2
9696
- jupyter_client=8.6.3=pyhd8ed1ab_1
97-
- jupyter_core=5.7.2=pyh31011fe_1
97+
- jupyter_core=5.8.1=pyh31011fe_0
9898
- jupyter_events=0.12.0=pyh29332c3_0
9999
- jupyter_server=2.16.0=pyhe01879c_0
100100
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
101-
- jupyterlab=4.4.2=pyhd8ed1ab_0
101+
- jupyterlab=4.4.3=pyhd8ed1ab_0
102102
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
103103
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
104104
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
@@ -116,7 +116,7 @@ dependencies:
116116
- libbrotlidec=1.1.0=hb9d3cd8_2
117117
- libbrotlienc=1.1.0=hb9d3cd8_2
118118
- libcblas=3.9.0=31_h372d94f_mkl
119-
- libcurl=8.13.0=h332b0f4_0
119+
- libcurl=8.14.0=h332b0f4_0
120120
- libdeflate=1.24=h86f0d12_0
121121
- libdlf=0.3.0=pyhd8ed1ab_1
122122
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -139,7 +139,7 @@ dependencies:
139139
- libpng=1.6.47=h943b412_0
140140
- libscotch=7.0.6=hea33c07_1
141141
- libsodium=1.0.20=h4ab18f5_0
142-
- libsqlite=3.49.2=hee588c1_0
142+
- libsqlite=3.50.0=hee588c1_0
143143
- libssh2=1.11.1=hcf80075_0
144144
- libstdcxx=15.1.0=h8f9b012_2
145145
- libstdcxx-ng=15.1.0=h4852527_2
@@ -151,7 +151,7 @@ dependencies:
151151
- libxml2=2.13.8=h4bc477f_0
152152
- libzlib=1.3.1=hb9d3cd8_2
153153
- linkify-it-py=2.0.3=pyhd8ed1ab_1
154-
- llvm-openmp=20.1.4=h024ca30_0
154+
- llvm-openmp=20.1.5=h024ca30_0
155155
- locket=1.0.0=pyhd8ed1ab_0
156156
- markdown-it-py=2.2.0=pyhd8ed1ab_0
157157
- markupsafe=3.0.2=py310h89163eb_1
@@ -176,7 +176,7 @@ dependencies:
176176
- nbformat=5.10.4=pyhd8ed1ab_1
177177
- ncurses=6.5=h2d0b736_3
178178
- nest-asyncio=1.6.0=pyhd8ed1ab_1
179-
- notebook=7.4.2=pyhd8ed1ab_0
179+
- notebook=7.4.3=pyhd8ed1ab_0
180180
- notebook-shim=0.2.4=pyhd8ed1ab_1
181181
- numcodecs=0.13.1=py310h5eaa309_0
182182
- numpy=1.26.4=py310hb13e2d6_0
@@ -185,7 +185,7 @@ dependencies:
185185
- overrides=7.7.0=pyhd8ed1ab_1
186186
- packaging=25.0=pyh29332c3_1
187187
- pandas=2.2.3=py310h5eaa309_3
188-
- pandoc=3.6.4=ha770c72_0
188+
- pandoc=3.7.0.1=ha770c72_0
189189
- pandocfilters=1.5.0=pyhd8ed1ab_0
190190
- parso=0.8.4=pyhd8ed1ab_1
191191
- partd=1.4.2=pyhd8ed1ab_0
@@ -195,8 +195,8 @@ dependencies:
195195
- pip=25.1.1=pyh8b19718_0
196196
- pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2
197197
- platformdirs=4.3.8=pyhe01879c_0
198-
- pluggy=1.5.0=pyhd8ed1ab_1
199-
- prometheus_client=0.21.1=pyhd8ed1ab_0
198+
- pluggy=1.6.0=pyhd8ed1ab_0
199+
- prometheus_client=0.22.0=pyhd8ed1ab_0
200200
- prompt-toolkit=3.0.51=pyha770c72_0
201201
- psutil=7.0.0=py310ha75aee5_0
202202
- pthread-stubs=0.4=hb9d3cd8_1002
@@ -232,14 +232,14 @@ dependencies:
232232
- requests=2.32.3=pyhd8ed1ab_1
233233
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
234234
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
235-
- rpds-py=0.24.0=py310hc1293b2_0
235+
- rpds-py=0.25.1=py310hbcd0ec0_0
236236
- scikit-learn=1.4.2=py310h981052a_1
237237
- scipy=1.14.1=py310hfcf56fc_2
238238
- send2trash=1.8.3=pyh0d859eb_1
239-
- setuptools=80.1.0=pyhff2d567_0
239+
- setuptools=80.8.0=pyhff2d567_0
240240
- six=1.17.0=pyhd8ed1ab_0
241241
- sniffio=1.3.1=pyhd8ed1ab_1
242-
- snowballstemmer=2.2.0=pyhd8ed1ab_0
242+
- snowballstemmer=3.0.1=pyhd8ed1ab_0
243243
- sortedcontainers=2.4.0=pyhd8ed1ab_1
244244
- soupsieve=2.7=pyhd8ed1ab_0
245245
- sphinx=5.3.0=pyhd8ed1ab_0
@@ -267,17 +267,17 @@ dependencies:
267267
- terminado=0.18.1=pyh0d859eb_0
268268
- threadpoolctl=3.6.0=pyhecae5ae_0
269269
- tinycss2=1.4.0=pyhd8ed1ab_0
270-
- tk=8.6.13=noxft_h4845f30_101
270+
- tk=8.6.13=noxft_hd72426e_102
271271
- toml=0.10.2=pyhd8ed1ab_1
272272
- tomli=2.2.1=pyhd8ed1ab_1
273273
- tomlkit=0.13.2=pyha770c72_1
274274
- toolz=1.0.0=pyhd8ed1ab_1
275-
- tornado=6.4.2=py310ha75aee5_0
275+
- tornado=6.5.1=py310ha75aee5_0
276276
- tqdm=4.67.1=pyhd8ed1ab_1
277277
- traitlets=5.14.3=pyhd8ed1ab_1
278-
- types-python-dateutil=2.9.0.20241206=pyhd8ed1ab_0
278+
- types-python-dateutil=2.9.0.20250516=pyhd8ed1ab_0
279279
- typing-extensions=4.13.2=h0e9735f_0
280-
- typing-inspection=0.4.0=pyhd8ed1ab_0
280+
- typing-inspection=0.4.1=pyhd8ed1ab_0
281281
- typing_extensions=4.13.2=pyh29332c3_0
282282
- typing_utils=0.1.0=pyhd8ed1ab_1
283283
- tzdata=2025b=h78e105d_0
@@ -298,13 +298,13 @@ dependencies:
298298
- zarr=2.14.2=pyhd8ed1ab_0
299299
- zeromq=4.3.5=h3b0a872_7
300300
- zict=3.0.0=pyhd8ed1ab_1
301-
- zipp=3.21.0=pyhd8ed1ab_1
301+
- zipp=3.22.0=pyhd8ed1ab_0
302302
- zstandard=0.23.0=py310ha75aee5_2
303303
- zstd=1.5.7=hb8e6e7a_2
304304
- pip:
305305
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@388f8f781c834f8f1d5c6243e636112bd2fd4dcb
306306
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2b2b72f906d85bf460292f66e763ff2331017b02
307-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@24027d81b65df99d5f582acc4497ed33df8a3396
307+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@447de6c5c257883c4eea045cb3372bf6a1051ad1
308308
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
309309
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7
310310

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- cached_property=1.5.2=pyha770c72_1
2121
- certifi=2025.4.26=pyhd8ed1ab_0
2222
- cffi=1.17.1=py310h8deb56e_0
23-
- click=8.2.0=pyh707e725_0
23+
- click=8.2.1=pyh707e725_0
2424
- cloudpickle=3.1.1=pyhd8ed1ab_0
2525
- colorama=0.4.6=pyhd8ed1ab_1
2626
- contourpy=1.3.2=py310h3788b33_0
@@ -30,19 +30,19 @@ dependencies:
3030
- discretize=0.11.2=py310ha2bacc8_1
3131
- distributed=2025.3.0=pyhd8ed1ab_0
3232
- fasteners=0.19=pyhd8ed1ab_1
33-
- fonttools=4.58.0=py310h89163eb_0
33+
- fonttools=4.58.1=py310h89163eb_0
3434
- freetype=2.13.3=ha770c72_1
35-
- fsspec=2025.3.2=pyhd8ed1ab_0
35+
- fsspec=2025.5.1=pyhd8ed1ab_0
3636
- geoana=0.7.2=py310ha2bacc8_0
3737
- h2=4.2.0=pyhd8ed1ab_0
3838
- h5py=3.13.0=nompi_py310h2a0e991_101
3939
- hdf5=1.14.6=nompi_h2d575fe_101
4040
- hpack=4.1.0=pyhd8ed1ab_0
4141
- hyperframe=6.1.0=pyhd8ed1ab_0
4242
- icu=75.1=he02047a_0
43-
- importlib-metadata=8.6.1=pyha770c72_0
43+
- importlib-metadata=8.7.0=pyhe01879c_1
4444
- jinja2=3.1.6=pyhd8ed1ab_0
45-
- joblib=1.5.0=pyhd8ed1ab_0
45+
- joblib=1.5.1=pyhd8ed1ab_0
4646
- keyutils=1.6.1=h166bdaf_0
4747
- kiwisolver=1.4.7=py310h3788b33_0
4848
- krb5=1.21.3=h659f571_0
@@ -55,7 +55,7 @@ dependencies:
5555
- libbrotlidec=1.1.0=hb9d3cd8_2
5656
- libbrotlienc=1.1.0=hb9d3cd8_2
5757
- libcblas=3.9.0=31_h372d94f_mkl
58-
- libcurl=8.13.0=h332b0f4_0
58+
- libcurl=8.14.0=h332b0f4_0
5959
- libdeflate=1.24=h86f0d12_0
6060
- libdlf=0.3.0=pyhd8ed1ab_1
6161
- libedit=3.1.20250104=pl5321h7949ede_0
@@ -77,7 +77,7 @@ dependencies:
7777
- libnsl=2.0.1=hd590300_0
7878
- libpng=1.6.47=h943b412_0
7979
- libscotch=7.0.6=hea33c07_1
80-
- libsqlite=3.49.2=hee588c1_0
80+
- libsqlite=3.50.0=hee588c1_0
8181
- libssh2=1.11.1=hcf80075_0
8282
- libstdcxx=15.1.0=h8f9b012_2
8383
- libstdcxx-ng=15.1.0=h4852527_2
@@ -88,7 +88,7 @@ dependencies:
8888
- libxcrypt=4.4.36=hd590300_1
8989
- libxml2=2.13.8=h4bc477f_0
9090
- libzlib=1.3.1=hb9d3cd8_2
91-
- llvm-openmp=20.1.4=h024ca30_0
91+
- llvm-openmp=20.1.5=h024ca30_0
9292
- locket=1.0.0=pyhd8ed1ab_0
9393
- markupsafe=3.0.2=py310h89163eb_1
9494
- matplotlib-base=3.8.4=py310hef631a5_2
@@ -127,18 +127,18 @@ dependencies:
127127
- readline=8.2=h8c095d6_2
128128
- scikit-learn=1.4.2=py310h981052a_1
129129
- scipy=1.14.1=py310hfcf56fc_2
130-
- setuptools=80.1.0=pyhff2d567_0
130+
- setuptools=80.8.0=pyhff2d567_0
131131
- six=1.17.0=pyhd8ed1ab_0
132132
- sortedcontainers=2.4.0=pyhd8ed1ab_1
133133
- tbb=2021.13.0=hceb3a55_1
134134
- tblib=3.1.0=pyhd8ed1ab_0
135135
- threadpoolctl=3.6.0=pyhecae5ae_0
136-
- tk=8.6.13=noxft_h4845f30_101
136+
- tk=8.6.13=noxft_hd72426e_102
137137
- toolz=1.0.0=pyhd8ed1ab_1
138-
- tornado=6.4.2=py310ha75aee5_0
138+
- tornado=6.5.1=py310ha75aee5_0
139139
- tqdm=4.67.1=pyhd8ed1ab_1
140140
- typing-extensions=4.13.2=h0e9735f_0
141-
- typing-inspection=0.4.0=pyhd8ed1ab_0
141+
- typing-inspection=0.4.1=pyhd8ed1ab_0
142142
- typing_extensions=4.13.2=pyh29332c3_0
143143
- tzdata=2025b=h78e105d_0
144144
- unicodedata2=16.0.0=py310ha75aee5_0
@@ -150,13 +150,13 @@ dependencies:
150150
- yaml=0.2.5=h7f98852_2
151151
- zarr=2.14.2=pyhd8ed1ab_0
152152
- zict=3.0.0=pyhd8ed1ab_1
153-
- zipp=3.21.0=pyhd8ed1ab_1
153+
- zipp=3.22.0=pyhd8ed1ab_0
154154
- zstandard=0.23.0=py310ha75aee5_2
155155
- zstd=1.5.7=hb8e6e7a_2
156156
- pip:
157157
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@388f8f781c834f8f1d5c6243e636112bd2fd4dcb
158158
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2b2b72f906d85bf460292f66e763ff2331017b02
159-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@24027d81b65df99d5f582acc4497ed33df8a3396
159+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@447de6c5c257883c4eea045cb3372bf6a1051ad1
160160
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
161161
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7
162162

0 commit comments

Comments
 (0)