Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
ff6bf35
Flatten the misfit creation. Generate the list with delayed calls
domfournier Aug 21, 2025
fb3cf77
Simplify building of misfits. Move responsability of distributed to m…
domfournier Aug 21, 2025
51d2994
Create base class for 1D options. Quick return of all actives for 1Ds
domfournier Aug 22, 2025
76d10fb
Make split_list a function to update tiles.
domfournier Aug 22, 2025
e941df6
Rework of nesting
domfournier Aug 22, 2025
4602ff1
Split MT test
domfournier Aug 22, 2025
47a0def
Force LocalCluster for 1D problems. Do 1D as distributed process
domfournier Aug 23, 2025
ba63b96
Only use futures if distributed
domfournier Aug 24, 2025
448f256
Leave workspace open during setup
domfournier Aug 25, 2025
d8fa972
Add utility context for test. Apply everywhere
domfournier Aug 25, 2025
2d610a4
Fix data_test
domfournier Aug 25, 2025
edd0d45
Merge branch 'develop' into GEOPY-2182
domfournier Aug 26, 2025
8b781af
Revert main of driver
domfournier Aug 26, 2025
9deb2f5
Re-locked
domfournier Aug 27, 2025
b5485f1
Add dynamic version to poetry plug-ins
domfournier Aug 27, 2025
f03331d
Apply auto version changes from geoapps_utils
domfournier Aug 27, 2025
14ee6d5
Re-locked
domfournier Aug 27, 2025
f9a4aeb
More updates from geoapp_utils
domfournier Aug 27, 2025
6851c7c
[GEOPY-2182] Update versioning strategy and implement dynamic version…
sebhmg Aug 28, 2025
13cac94
[GEOPY-2182] only set public version in ui.json
sebhmg Aug 28, 2025
6eea620
[GEOPY-2182] augment docstring and tests
sebhmg Aug 28, 2025
a0453dd
[GEOPY-2182] reposition version in pyproject
sebhmg Aug 28, 2025
aa0fc09
[GEOPY-2182] Merge remote-tracking branch 'upstream/develop' into GEO…
sebhmg Aug 28, 2025
3354463
[GEOPY-2182] relock conda envs on latest depedency revisions
sebhmg Aug 28, 2025
96f5513
Merge branch 'develop' into GEOPY-2182
domfournier Aug 29, 2025
f121df2
REvert to fetching ordering from tiles
domfournier Sep 2, 2025
3cd96c3
Merge branch 'develop' into GEOPY-2182
domfournier Sep 2, 2025
48eac35
RE-lock
domfournier Sep 2, 2025
0e7bdd2
Fix tem rotated_gradient form
domfournier Sep 2, 2025
99173d7
Fix zero division
domfournier Sep 2, 2025
51d7cc4
Fix tile estimator
domfournier Sep 2, 2025
ec30d08
Fixes for joints
domfournier Sep 3, 2025
8cc0105
Flip logic for nthreads
domfournier Sep 3, 2025
b608780
Change return type on client
domfournier Sep 3, 2025
7be2300
Change passing arguments of driver to misfit constructor
domfournier Sep 3, 2025
a09d13d
Re-lock
domfournier Sep 4, 2025
5f8f15d
Fix logic for joint conductivity. Add unitest
domfournier Sep 4, 2025
6e26e3e
Remove dask from test
domfournier Sep 4, 2025
926aaa0
Fix link of Forrestania dataset
domfournier Sep 4, 2025
ef487c4
Change symbols for degree
domfournier Sep 4, 2025
619dca2
RE-lock
domfournier Sep 5, 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
12 changes: 7 additions & 5 deletions docs/case_studies/Forrestania/forrestania.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"(forrestania-data)=\n",
"## Data\n",
"\n",
"[Download the data package here](https://github.com/MiraGeoscience/simpeg-drivers/raw/refs/heads/GEOPY-2297/simpeg_drivers-assets/Case%20studies/Forrestania_SRTM1%20Australia_MGA50.zip?download=)\n",
"[Download the data package here](https://github.com/MiraGeoscience/simpeg-drivers/raw/refs/heads/develop/simpeg_drivers-assets/Case%20studies/Forrestania_SRTM1%20Australia_MGA50.zip?download=)\n",
"\n",
"We first need to consolidate the data into a usable format. We use [Geoscience ANALYST](https://www.mirageoscience.com/mining-industry-software/geoscience-analyst/) to import and convert the original files into the `geoh5` format. The data bundle includes\n",
"\n",
Expand Down Expand Up @@ -257,11 +257,13 @@
"[Click to enlarge]\n",
"```\n",
"\n",
"The **inducing field parameters** at the time and location of the survey are\n",
"The **inducing field parameters** at the time and location of the survey are:\n",
"\n",
"- Magnitude: 59127 nT\n",
"- Inclination: -66.9$\\degree$\n",
"- Declination: -1.05$\\degree$ \n",
"Magnitude: $59127$ nT\n",
"\n",
"Inclination: $-66.9^\\circ$\n",
"\n",
"Declination: $-1.05^\\circ$ \n",
"\n",
"#### Step 2: Detrend\n",
"The local background field appears to be slightly lower (~112 nT) than the computed IGRF model, as most of the data away from the main anomaly are below 0. To avoid modelling this background trend, we can remove the median value. \n",
Expand Down
60 changes: 30 additions & 30 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_0
- arrow=1.3.0=pyhd8ed1ab_1
- asciitree=0.3.3=py_2
- astroid=3.3.11=py310hff52083_0
- astroid=3.3.11=py310hff52083_1
- asttokens=3.0.0=pyhd8ed1ab_1
- async-lru=2.0.5=pyh29332c3_0
- attrs=25.3.0=pyh71513ae_0
Expand All @@ -24,46 +24,46 @@ dependencies:
- bleach=6.2.0=pyh29332c3_4
- bleach-with-css=6.2.0=h82add2a_4
- bokeh=3.6.3=pyhd8ed1ab_0
- brotli=1.1.0=hb9d3cd8_3
- brotli-bin=1.1.0=hb9d3cd8_3
- brotli-python=1.1.0=py310hf71b8c6_3
- brotli=1.1.0=hb03c661_4
- brotli-bin=1.1.0=hb03c661_4
- brotli-python=1.1.0=py310hea6c23e_4
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.5=hb9d3cd8_0
- ca-certificates=2025.8.3=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- certifi=2025.8.3=pyhd8ed1ab_0
- cffi=1.17.1=py310h8deb56e_0
- cffi=1.17.1=py310h34a4b09_1
- charset-normalizer=3.4.3=pyhd8ed1ab_0
- click=8.2.1=pyh707e725_0
- cloudpickle=3.1.1=pyhd8ed1ab_0
- colorama=0.4.6=pyhd8ed1ab_1
- comm=0.2.3=pyhe01879c_0
- contourpy=1.3.2=py310h3788b33_0
- coverage=7.10.5=py310h3406613_0
- coverage=7.10.6=py310h3406613_1
- cycler=0.12.1=pyhd8ed1ab_1
- cytoolz=1.0.1=py310ha75aee5_0
- dask-core=2025.3.0=pyhd8ed1ab_0
- dataclasses=0.8=pyhc8e2a94_3
- debugpy=1.8.16=py310h25320af_0
- debugpy=1.8.16=py310h25320af_1
- decorator=5.2.1=pyhd8ed1ab_0
- defusedxml=0.7.1=pyhd8ed1ab_0
- dill=0.4.0=pyhd8ed1ab_0
- discretize=0.11.3=py310ha2bacc8_0
- distributed=2025.3.0=pyhd8ed1ab_0
- docutils=0.19=py310hff52083_1
- exceptiongroup=1.3.0=pyhd8ed1ab_0
- executing=2.2.0=pyhd8ed1ab_0
- executing=2.2.1=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.59.2=py310h3406613_0
- fqdn=1.5.1=pyhd8ed1ab_1
- freetype=2.13.3=ha770c72_1
- fsspec=2025.7.0=pyhd8ed1ab_0
- fsspec=2025.9.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- greenlet=3.2.4=py310hea6c23e_0
- greenlet=3.2.4=py310hea6c23e_1
- h11=0.16.0=pyhd8ed1ab_0
- h2=4.3.0=pyhcf101f3_0
- h5py=3.14.0=nompi_py310hea1e86d_100
- h5py=3.14.0=nompi_py310h4aa865e_101
- hdf5=1.14.6=nompi_h6e4c0c1_103
- hpack=4.1.0=pyhd8ed1ab_0
- httpcore=1.0.9=pyh29332c3_0
Expand All @@ -84,7 +84,7 @@ dependencies:
- jinja2=3.1.6=pyhd8ed1ab_0
- joblib=1.5.2=pyhd8ed1ab_0
- json5=0.12.1=pyhd8ed1ab_0
- jsonpointer=3.0.0=py310hff52083_1
- jsonpointer=3.0.0=py310hff52083_2
- jsonschema=4.25.1=pyhe01879c_0
- jsonschema-specifications=2025.4.1=pyh29332c3_0
- jsonschema-with-format-nongpl=4.25.1=he01879c_0
Expand All @@ -96,7 +96,7 @@ dependencies:
- jupyter_events=0.12.0=pyh29332c3_0
- jupyter_server=2.17.0=pyhcf101f3_0
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
- jupyterlab=4.4.6=pyhd8ed1ab_0
- jupyterlab=4.4.7=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 @@ -110,11 +110,11 @@ dependencies:
- ld_impl_linux-64=2.44=h1423503_1
- lerc=4.0.0=h0aef613_1
- libaec=1.1.4=h3f801dc_0
- libblas=3.9.0=34_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb9d3cd8_3
- libbrotlidec=1.1.0=hb9d3cd8_3
- libbrotlienc=1.1.0=hb9d3cd8_3
- libcblas=3.9.0=34_h372d94f_mkl
- libblas=3.9.0=35_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb03c661_4
- libbrotlidec=1.1.0=hb03c661_4
- libbrotlienc=1.1.0=hb03c661_4
- libcblas=3.9.0=35_h372d94f_mkl
- libcurl=8.14.1=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
Expand All @@ -131,9 +131,9 @@ dependencies:
- libhwloc=2.12.1=default_h3d81e11_1000
- libiconv=1.18=h3b78370_2
- libjpeg-turbo=3.1.0=hb9d3cd8_0
- liblapack=3.9.0=34_hc41d3b0_mkl
- liblapack=3.9.0=35_hc41d3b0_mkl
- liblzma=5.8.1=hb9d3cd8_2
- libnghttp2=1.64.0=h161d5f1_0
- libnghttp2=1.67.0=had1ee68_0
- libnsl=2.0.1=hb9d3cd8_1
- libpng=1.6.50=h421ea60_1
- libscotch=7.0.6=hea33c07_1
Expand All @@ -151,7 +151,7 @@ dependencies:
- libxml2=2.13.8=h2cb61b6_1
- libzlib=1.3.1=hb9d3cd8_2
- linkify-it-py=2.0.3=pyhd8ed1ab_1
- llvm-openmp=20.1.8=h4922eb0_2
- llvm-openmp=21.1.0=h4922eb0_0
- locket=1.0.0=pyhd8ed1ab_0
- markdown-it-py=2.2.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
Expand All @@ -161,9 +161,9 @@ dependencies:
- mdit-py-plugins=0.5.0=pyhd8ed1ab_0
- mdurl=0.1.2=pyhd8ed1ab_1
- metis=5.1.0=hd0bcaf9_1007
- mistune=3.1.3=pyh29332c3_0
- mistune=3.1.4=pyhcf101f3_0
- mkl=2024.2.2=ha770c72_17
- msgpack-python=1.1.1=py310h3788b33_0
- msgpack-python=1.1.1=py310h03d9f68_1
- mumps-include=5.7.3=h82cca05_10
- mumps-seq=5.7.3=h06cbf8f_10
- munkres=1.1.4=pyhd8ed1ab_1
Expand Down Expand Up @@ -213,7 +213,7 @@ dependencies:
- pymatsolver=0.3.1=pyh48887ae_201
- pyparsing=3.2.3=pyhe01879c_2
- pysocks=1.7.1=pyha55dd90_7
- pytest=8.4.1=pyhd8ed1ab_0
- pytest=8.4.2=pyhd8ed1ab_0
- pytest-cov=6.2.1=pyhd8ed1ab_0
- python=3.10.18=hd6af730_0_cpython
- python-dateutil=2.9.0.post0=pyhe01879c_2
Expand All @@ -232,7 +232,7 @@ dependencies:
- rfc3339-validator=0.1.4=pyhd8ed1ab_1
- rfc3986-validator=0.1.1=pyh9f0ad1d_0
- rfc3987-syntax=1.1.0=pyhe01879c_1
- rpds-py=0.27.1=py310hd8f68c5_0
- rpds-py=0.27.1=py310hd8f68c5_1
- rtree=1.2.0=py310haf1e407_1
- scikit-learn=1.6.1=py310h27f47ee_0
- scipy=1.14.1=py310hfcf56fc_2
Expand Down Expand Up @@ -273,7 +273,7 @@ dependencies:
- tomli=2.2.1=pyhe01879c_2
- tomlkit=0.13.3=pyha770c72_0
- toolz=1.0.0=pyhd8ed1ab_1
- tornado=6.5.2=py310h7c4b9e2_0
- tornado=6.5.2=py310h7c4b9e2_1
- tqdm=4.67.1=pyhd8ed1ab_1
- traitlets=5.14.3=pyhd8ed1ab_1
- trimesh=4.1.8=pyhd8ed1ab_0
Expand Down Expand Up @@ -301,13 +301,13 @@ dependencies:
- zeromq=4.3.5=h3b0a872_7
- zict=3.0.0=pyhd8ed1ab_1
- zipp=3.23.0=pyhd8ed1ab_0
- zstandard=0.23.0=py310h7c4b9e2_3
- zstandard=0.24.0=py310h1d967bf_1
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1241642d40693ee9c58f83ce46b317cba43dc68b
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3a91dd92144a34b3c1ad1e5885029a7102e6337c
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@5561fb5441be2cceaf8e1ca5fa05f6e3b19ee6bb

variables:
KMP_WARNINGS: 0
40 changes: 20 additions & 20 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ dependencies:
- annotated-types=0.7.0=pyhd8ed1ab_1
- asciitree=0.3.3=py_2
- bokeh=3.6.3=pyhd8ed1ab_0
- brotli=1.1.0=hb9d3cd8_3
- brotli-bin=1.1.0=hb9d3cd8_3
- brotli-python=1.1.0=py310hf71b8c6_3
- brotli=1.1.0=hb03c661_4
- brotli-bin=1.1.0=hb03c661_4
- brotli-python=1.1.0=py310hea6c23e_4
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.5=hb9d3cd8_0
- ca-certificates=2025.8.3=hbd8a1cb_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- certifi=2025.8.3=pyhd8ed1ab_0
- cffi=1.17.1=py310h8deb56e_0
- cffi=1.17.1=py310h34a4b09_1
- click=8.2.1=pyh707e725_0
- cloudpickle=3.1.1=pyhd8ed1ab_0
- colorama=0.4.6=pyhd8ed1ab_1
Expand All @@ -32,10 +32,10 @@ dependencies:
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.59.2=py310h3406613_0
- freetype=2.13.3=ha770c72_1
- fsspec=2025.7.0=pyhd8ed1ab_0
- fsspec=2025.9.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- h2=4.3.0=pyhcf101f3_0
- h5py=3.14.0=nompi_py310hea1e86d_100
- h5py=3.14.0=nompi_py310h4aa865e_101
- hdf5=1.14.6=nompi_h6e4c0c1_103
- hpack=4.1.0=pyhd8ed1ab_0
- hyperframe=6.1.0=pyhd8ed1ab_0
Expand All @@ -49,11 +49,11 @@ dependencies:
- ld_impl_linux-64=2.44=h1423503_1
- lerc=4.0.0=h0aef613_1
- libaec=1.1.4=h3f801dc_0
- libblas=3.9.0=34_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb9d3cd8_3
- libbrotlidec=1.1.0=hb9d3cd8_3
- libbrotlienc=1.1.0=hb9d3cd8_3
- libcblas=3.9.0=34_h372d94f_mkl
- libblas=3.9.0=35_hfdb39a5_mkl
- libbrotlicommon=1.1.0=hb03c661_4
- libbrotlidec=1.1.0=hb03c661_4
- libbrotlienc=1.1.0=hb03c661_4
- libcblas=3.9.0=35_h372d94f_mkl
- libcurl=8.14.1=h332b0f4_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
Expand All @@ -70,9 +70,9 @@ dependencies:
- libhwloc=2.12.1=default_h3d81e11_1000
- libiconv=1.18=h3b78370_2
- libjpeg-turbo=3.1.0=hb9d3cd8_0
- liblapack=3.9.0=34_hc41d3b0_mkl
- liblapack=3.9.0=35_hc41d3b0_mkl
- liblzma=5.8.1=hb9d3cd8_2
- libnghttp2=1.64.0=h161d5f1_0
- libnghttp2=1.67.0=had1ee68_0
- libnsl=2.0.1=hb9d3cd8_1
- libpng=1.6.50=h421ea60_1
- libscotch=7.0.6=hea33c07_1
Expand All @@ -88,13 +88,13 @@ dependencies:
- libxcrypt=4.4.36=hd590300_1
- libxml2=2.13.8=h2cb61b6_1
- libzlib=1.3.1=hb9d3cd8_2
- llvm-openmp=20.1.8=h4922eb0_2
- llvm-openmp=21.1.0=h4922eb0_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
- matplotlib-base=3.8.4=py310hef631a5_2
- metis=5.1.0=hd0bcaf9_1007
- mkl=2024.2.2=ha770c72_17
- msgpack-python=1.1.1=py310h3788b33_0
- msgpack-python=1.1.1=py310h03d9f68_1
- mumps-include=5.7.3=h82cca05_10
- mumps-seq=5.7.3=h06cbf8f_10
- munkres=1.1.4=pyhd8ed1ab_1
Expand Down Expand Up @@ -136,7 +136,7 @@ dependencies:
- threadpoolctl=3.6.0=pyhecae5ae_0
- tk=8.6.13=noxft_hd72426e_102
- toolz=1.0.0=pyhd8ed1ab_1
- tornado=6.5.2=py310h7c4b9e2_0
- tornado=6.5.2=py310h7c4b9e2_1
- tqdm=4.67.1=pyhd8ed1ab_1
- trimesh=4.1.8=pyhd8ed1ab_0
- typing-extensions=4.15.0=h396c80c_0
Expand All @@ -153,13 +153,13 @@ dependencies:
- zarr=2.14.2=pyhd8ed1ab_0
- zict=3.0.0=pyhd8ed1ab_1
- zipp=3.23.0=pyhd8ed1ab_0
- zstandard=0.23.0=py310h7c4b9e2_3
- zstandard=0.24.0=py310h1d967bf_1
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@655afd735989270d5d03b80a98cbe22844b47066
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@2c9248c60e4166fadb973fcd4f1777bb2ee964f6
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1241642d40693ee9c58f83ce46b317cba43dc68b
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@3a91dd92144a34b3c1ad1e5885029a7102e6337c
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@416815352706add295a9d2b90814d2291068a85e
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@d794a0b24aafb4beccc7984e68b6904be44f860f
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@5561fb5441be2cceaf8e1ca5fa05f6e3b19ee6bb

variables:
KMP_WARNINGS: 0
Loading
Loading