Skip to content

GEOPY-789: Joint inversion: PGI #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domfournier merged 22 commits into from
May 30, 2025
Merged

GEOPY-789: Joint inversion: PGI #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1d1ff52
Refactor joint inversion drivers and move more core methods to the base
domfournier May 7, 2025
d06fac4
Add main files for PGI
domfournier May 7, 2025
c200716
Add default uijson
domfournier May 7, 2025
0f3d247
Renaming. First run through without PGI reg
domfournier May 7, 2025
283ac8e
Rename geomodel to petrophysics. First run through with PGI reg
domfournier May 9, 2025
0b32d4c
Work on directives for PGI
domfournier May 13, 2025
b43d9cd
Use reference model for petro group definition
domfournier May 14, 2025
c374833
Force alpha_s to be zero for now.
domfournier May 16, 2025
0901d83
Fix issue with overloading alpha's
domfournier May 21, 2025
739997a
Fix issue with mapping models.
domfournier May 26, 2025
4de1403
Clean up test
domfournier May 26, 2025
22da2f9
Fix test
domfournier May 26, 2025
4a19533
Merge branch 'develop' into GEOPY-789
domfournier May 26, 2025
566d0e9
Review comments
domfournier May 26, 2025
cf8f50c
Re-lock on latest simpeg
domfournier May 27, 2025
3be7859
Better display of msg warning
domfournier May 29, 2025
4527331
Re-lock
domfournier May 29, 2025
85271f3
Change handling of rotation angles.
domfournier May 30, 2025
fa4f226
Update target
domfournier May 30, 2025
b49a74b
Fix issue with transfer of active model
domfournier May 30, 2025
8fa3a43
Fix bad import
domfournier May 30, 2025
6749baa
Merge branch 'develop' into GEOPY-789
domfournier May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ dependencies:
- certifi=2025.4.26=pyhd8ed1ab_0
- cffi=1.17.1=py310h8deb56e_0
- charset-normalizer=3.4.2=pyhd8ed1ab_0
- click=8.2.0=pyh707e725_0
- click=8.2.1=pyh707e725_0
- cloudpickle=3.1.1=pyhd8ed1ab_0
- colorama=0.4.6=pyhd8ed1ab_1
- comm=0.2.2=pyhd8ed1ab_1
- contourpy=1.3.2=py310h3788b33_0
- coverage=7.8.0=py310h89163eb_0
- coverage=7.8.2=py310h89163eb_0
- cycler=0.12.1=pyhd8ed1ab_1
- cytoolz=1.0.1=py310ha75aee5_0
- dask-core=2025.3.0=pyhd8ed1ab_0
Expand All @@ -55,10 +55,10 @@ dependencies:
- exceptiongroup=1.3.0=pyhd8ed1ab_0
- executing=2.2.0=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.58.0=py310h89163eb_0
- fonttools=4.58.1=py310h89163eb_0
- fqdn=1.5.1=pyhd8ed1ab_1
- freetype=2.13.3=ha770c72_1
- fsspec=2025.3.2=pyhd8ed1ab_0
- fsspec=2025.5.1=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- greenlet=3.2.2=py310hf71b8c6_0
- h11=0.16.0=pyhd8ed1ab_0
Expand All @@ -72,8 +72,8 @@ dependencies:
- icu=75.1=he02047a_0
- idna=3.10=pyhd8ed1ab_1
- imagesize=1.4.1=pyhd8ed1ab_0
- importlib-metadata=8.6.1=pyha770c72_0
- importlib_metadata=8.6.1=hd8ed1ab_0
- importlib-metadata=8.7.0=pyhe01879c_1
- importlib_metadata=8.7.0=h40b2b14_1
- importlib_resources=6.5.2=pyhd8ed1ab_0
- iniconfig=2.0.0=pyhd8ed1ab_1
- ipykernel=6.29.5=pyh3099207_0
Expand All @@ -84,21 +84,21 @@ dependencies:
- isort=6.0.1=pyhd8ed1ab_1
- jedi=0.19.2=pyhd8ed1ab_1
- jinja2=3.1.6=pyhd8ed1ab_0
- joblib=1.5.0=pyhd8ed1ab_0
- joblib=1.5.1=pyhd8ed1ab_0
- json5=0.12.0=pyhd8ed1ab_0
- jsonpointer=3.0.0=py310hff52083_1
- jsonschema=4.23.0=pyhd8ed1ab_1
- jsonschema=4.24.0=pyhd8ed1ab_0
- jsonschema-specifications=2025.4.1=pyh29332c3_0
- jsonschema-with-format-nongpl=4.23.0=hd8ed1ab_1
- jsonschema-with-format-nongpl=4.24.0=hd8ed1ab_0
- jupyter-book=1.0.3=pyhd8ed1ab_1
- jupyter-cache=1.0.1=pyhff2d567_0
- jupyter-lsp=2.2.5=pyhd8ed1ab_1
- jupyter-lsp=2.2.5=pyhe01879c_2
- jupyter_client=8.6.3=pyhd8ed1ab_1
- jupyter_core=5.7.2=pyh31011fe_1
- jupyter_core=5.8.1=pyh31011fe_0
- jupyter_events=0.12.0=pyh29332c3_0
- jupyter_server=2.16.0=pyhe01879c_0
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
- jupyterlab=4.4.2=pyhd8ed1ab_0
- jupyterlab=4.4.3=pyhd8ed1ab_0
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
Expand All @@ -116,7 +116,7 @@ dependencies:
- libbrotlidec=1.1.0=hb9d3cd8_2
- libbrotlienc=1.1.0=hb9d3cd8_2
- libcblas=3.9.0=31_h372d94f_mkl
- libcurl=8.13.0=h332b0f4_0
- libcurl=8.14.0=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20250104=pl5321h7949ede_0
Expand All @@ -139,7 +139,7 @@ dependencies:
- libpng=1.6.47=h943b412_0
- libscotch=7.0.6=hea33c07_1
- libsodium=1.0.20=h4ab18f5_0
- libsqlite=3.49.2=hee588c1_0
- libsqlite=3.50.0=hee588c1_0
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_2
- libstdcxx-ng=15.1.0=h4852527_2
Expand All @@ -151,7 +151,7 @@ dependencies:
- libxml2=2.13.8=h4bc477f_0
- libzlib=1.3.1=hb9d3cd8_2
- linkify-it-py=2.0.3=pyhd8ed1ab_1
- llvm-openmp=20.1.4=h024ca30_0
- llvm-openmp=20.1.5=h024ca30_0
- locket=1.0.0=pyhd8ed1ab_0
- markdown-it-py=2.2.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
Expand All @@ -176,7 +176,7 @@ dependencies:
- nbformat=5.10.4=pyhd8ed1ab_1
- ncurses=6.5=h2d0b736_3
- nest-asyncio=1.6.0=pyhd8ed1ab_1
- notebook=7.4.2=pyhd8ed1ab_0
- notebook=7.4.3=pyhd8ed1ab_0
- notebook-shim=0.2.4=pyhd8ed1ab_1
- numcodecs=0.13.1=py310h5eaa309_0
- numpy=1.26.4=py310hb13e2d6_0
Expand All @@ -185,7 +185,7 @@ dependencies:
- overrides=7.7.0=pyhd8ed1ab_1
- packaging=25.0=pyh29332c3_1
- pandas=2.2.3=py310h5eaa309_3
- pandoc=3.6.4=ha770c72_0
- pandoc=3.7.0.1=ha770c72_0
- pandocfilters=1.5.0=pyhd8ed1ab_0
- parso=0.8.4=pyhd8ed1ab_1
- partd=1.4.2=pyhd8ed1ab_0
Expand All @@ -195,8 +195,8 @@ dependencies:
- pip=25.1.1=pyh8b19718_0
- pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2
- platformdirs=4.3.8=pyhe01879c_0
- pluggy=1.5.0=pyhd8ed1ab_1
- prometheus_client=0.21.1=pyhd8ed1ab_0
- pluggy=1.6.0=pyhd8ed1ab_0
- prometheus_client=0.22.0=pyhd8ed1ab_0
- prompt-toolkit=3.0.51=pyha770c72_0
- psutil=7.0.0=py310ha75aee5_0
- pthread-stubs=0.4=hb9d3cd8_1002
Expand Down Expand Up @@ -232,14 +232,14 @@ dependencies:
- requests=2.32.3=pyhd8ed1ab_1
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
- rpds-py=0.24.0=py310hc1293b2_0
- rpds-py=0.25.1=py310hbcd0ec0_0
- scikit-learn=1.4.2=py310h981052a_1
- scipy=1.14.1=py310hfcf56fc_2
- send2trash=1.8.3=pyh0d859eb_1
- setuptools=80.1.0=pyhff2d567_0
- setuptools=80.8.0=pyhff2d567_0
- six=1.17.0=pyhd8ed1ab_0
- sniffio=1.3.1=pyhd8ed1ab_1
- snowballstemmer=2.2.0=pyhd8ed1ab_0
- snowballstemmer=3.0.1=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_1
- soupsieve=2.7=pyhd8ed1ab_0
- sphinx=5.3.0=pyhd8ed1ab_0
Expand Down Expand Up @@ -267,17 +267,17 @@ dependencies:
- terminado=0.18.1=pyh0d859eb_0
- threadpoolctl=3.6.0=pyhecae5ae_0
- tinycss2=1.4.0=pyhd8ed1ab_0
- tk=8.6.13=noxft_h4845f30_101
- tk=8.6.13=noxft_hd72426e_102
- toml=0.10.2=pyhd8ed1ab_1
- tomli=2.2.1=pyhd8ed1ab_1
- tomlkit=0.13.2=pyha770c72_1
- toolz=1.0.0=pyhd8ed1ab_1
- tornado=6.4.2=py310ha75aee5_0
- tornado=6.5.1=py310ha75aee5_0
- tqdm=4.67.1=pyhd8ed1ab_1
- traitlets=5.14.3=pyhd8ed1ab_1
- types-python-dateutil=2.9.0.20241206=pyhd8ed1ab_0
- types-python-dateutil=2.9.0.20250516=pyhd8ed1ab_0
- typing-extensions=4.13.2=h0e9735f_0
- typing-inspection=0.4.0=pyhd8ed1ab_0
- typing-inspection=0.4.1=pyhd8ed1ab_0
- typing_extensions=4.13.2=pyh29332c3_0
- typing_utils=0.1.0=pyhd8ed1ab_1
- tzdata=2025b=h78e105d_0
Expand All @@ -298,13 +298,13 @@ dependencies:
- zarr=2.14.2=pyhd8ed1ab_0
- zeromq=4.3.5=h3b0a872_7
- zict=3.0.0=pyhd8ed1ab_1
- zipp=3.21.0=pyhd8ed1ab_1
- zipp=3.22.0=pyhd8ed1ab_0
- zstandard=0.23.0=py310ha75aee5_2
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@388f8f781c834f8f1d5c6243e636112bd2fd4dcb
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2b2b72f906d85bf460292f66e763ff2331017b02
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@24027d81b65df99d5f582acc4497ed33df8a3396
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@447de6c5c257883c4eea045cb3372bf6a1051ad1
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7

Expand Down
28 changes: 14 additions & 14 deletions environments/py-3.10-linux-64.conda.lock.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- cached_property=1.5.2=pyha770c72_1
- certifi=2025.4.26=pyhd8ed1ab_0
- cffi=1.17.1=py310h8deb56e_0
- click=8.2.0=pyh707e725_0
- click=8.2.1=pyh707e725_0
- cloudpickle=3.1.1=pyhd8ed1ab_0
- colorama=0.4.6=pyhd8ed1ab_1
- contourpy=1.3.2=py310h3788b33_0
Expand All @@ -30,19 +30,19 @@ dependencies:
- discretize=0.11.2=py310ha2bacc8_1
- distributed=2025.3.0=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.58.0=py310h89163eb_0
- fonttools=4.58.1=py310h89163eb_0
- freetype=2.13.3=ha770c72_1
- fsspec=2025.3.2=pyhd8ed1ab_0
- fsspec=2025.5.1=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- h2=4.2.0=pyhd8ed1ab_0
- h5py=3.13.0=nompi_py310h2a0e991_101
- hdf5=1.14.6=nompi_h2d575fe_101
- hpack=4.1.0=pyhd8ed1ab_0
- hyperframe=6.1.0=pyhd8ed1ab_0
- icu=75.1=he02047a_0
- importlib-metadata=8.6.1=pyha770c72_0
- importlib-metadata=8.7.0=pyhe01879c_1
- jinja2=3.1.6=pyhd8ed1ab_0
- joblib=1.5.0=pyhd8ed1ab_0
- joblib=1.5.1=pyhd8ed1ab_0
- keyutils=1.6.1=h166bdaf_0
- kiwisolver=1.4.7=py310h3788b33_0
- krb5=1.21.3=h659f571_0
Expand All @@ -55,7 +55,7 @@ dependencies:
- libbrotlidec=1.1.0=hb9d3cd8_2
- libbrotlienc=1.1.0=hb9d3cd8_2
- libcblas=3.9.0=31_h372d94f_mkl
- libcurl=8.13.0=h332b0f4_0
- libcurl=8.14.0=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20250104=pl5321h7949ede_0
Expand All @@ -77,7 +77,7 @@ dependencies:
- libnsl=2.0.1=hd590300_0
- libpng=1.6.47=h943b412_0
- libscotch=7.0.6=hea33c07_1
- libsqlite=3.49.2=hee588c1_0
- libsqlite=3.50.0=hee588c1_0
- libssh2=1.11.1=hcf80075_0
- libstdcxx=15.1.0=h8f9b012_2
- libstdcxx-ng=15.1.0=h4852527_2
Expand All @@ -88,7 +88,7 @@ dependencies:
- libxcrypt=4.4.36=hd590300_1
- libxml2=2.13.8=h4bc477f_0
- libzlib=1.3.1=hb9d3cd8_2
- llvm-openmp=20.1.4=h024ca30_0
- llvm-openmp=20.1.5=h024ca30_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
- matplotlib-base=3.8.4=py310hef631a5_2
Expand Down Expand Up @@ -127,18 +127,18 @@ dependencies:
- readline=8.2=h8c095d6_2
- scikit-learn=1.4.2=py310h981052a_1
- scipy=1.14.1=py310hfcf56fc_2
- setuptools=80.1.0=pyhff2d567_0
- setuptools=80.8.0=pyhff2d567_0
- six=1.17.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_1
- tbb=2021.13.0=hceb3a55_1
- tblib=3.1.0=pyhd8ed1ab_0
- threadpoolctl=3.6.0=pyhecae5ae_0
- tk=8.6.13=noxft_h4845f30_101
- tk=8.6.13=noxft_hd72426e_102
- toolz=1.0.0=pyhd8ed1ab_1
- tornado=6.4.2=py310ha75aee5_0
- tornado=6.5.1=py310ha75aee5_0
- tqdm=4.67.1=pyhd8ed1ab_1
- typing-extensions=4.13.2=h0e9735f_0
- typing-inspection=0.4.0=pyhd8ed1ab_0
- typing-inspection=0.4.1=pyhd8ed1ab_0
- typing_extensions=4.13.2=pyh29332c3_0
- tzdata=2025b=h78e105d_0
- unicodedata2=16.0.0=py310ha75aee5_0
Expand All @@ -150,13 +150,13 @@ dependencies:
- yaml=0.2.5=h7f98852_2
- zarr=2.14.2=pyhd8ed1ab_0
- zict=3.0.0=pyhd8ed1ab_1
- zipp=3.21.0=pyhd8ed1ab_1
- zipp=3.22.0=pyhd8ed1ab_0
- zstandard=0.23.0=py310ha75aee5_2
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@388f8f781c834f8f1d5c6243e636112bd2fd4dcb
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2b2b72f906d85bf460292f66e763ff2331017b02
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@24027d81b65df99d5f582acc4497ed33df8a3396
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@447de6c5c257883c4eea045cb3372bf6a1051ad1
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e9c99d6fd5d324571a2717990aecb3ed673cbaca
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@d5959a0e19b45a89eb8a02cd608bc8accb74adb7

Expand Down
Loading