Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
686221e
Apply changes to data
domfournier Feb 13, 2024
515b6b3
Update directive_factory and entity_factory
domfournier Feb 13, 2024
1e5b10a
Apply changes to receiver_factory and survey_factory
domfournier Feb 13, 2024
6278a8f
Update topography module
domfournier Feb 13, 2024
e46af73
Apply changes to location and preprocessing
domfournier Feb 13, 2024
df9cddc
Update driver and spedu dc constant
domfournier Feb 13, 2024
f274edd
Update base electrical driver and params
domfournier Feb 13, 2024
c54a051
Update pseudo dc files
domfournier Feb 13, 2024
15f8de1
Update pseudo ip files
domfournier Feb 13, 2024
5e1428b
Fix imports
domfournier Feb 13, 2024
9d311f4
Get rid of filter_xy. Move new methods from geoapps.inversion
domfournier Feb 13, 2024
3082deb
Bulk update to tests
domfournier Feb 14, 2024
95dafa0
Continue updates
domfournier Feb 14, 2024
bd70ec9
Get rid of filter on topography
domfournier Feb 14, 2024
135afc5
Fix import error. remove reference to geoapps
domfournier Feb 16, 2024
5737213
Bulk update tests license and import
domfournier Feb 16, 2024
a10c62b
Update dependencies
domfournier Feb 20, 2024
ffbbe03
Update requirements
domfournier Feb 21, 2024
b4e3ab4
Remove reference to GEOH5
domfournier Feb 21, 2024
decf98d
Fix tests
domfournier Feb 21, 2024
e264864
One more round on fixing test and warnings
domfournier Feb 21, 2024
313a7d4
Fix for reference model log
domfournier Feb 21, 2024
5d88385
Revert "Fix for reference model log"
domfournier Feb 21, 2024
a0e8eda
Update simpeg_drivers/electricals/driver.py
domfournier Feb 23, 2024
3a496d3
Update simpeg_drivers/electricals/driver.py
domfournier Feb 23, 2024
04ab5fb
Update simpeg_drivers/electricals/driver.py
domfournier Feb 23, 2024
8ba779f
Update simpeg_drivers/utils/testing.py
domfournier Feb 23, 2024
2dac455
Typing as requested
domfournier Feb 24, 2024
d2add8e
Drop support for 3.9
domfournier Feb 26, 2024
7e8d048
Fix logic for input mesh/model for speudo 3d
domfournier Mar 1, 2024
fbb1def
Update lock files
domfournier Mar 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/pytest-unix-os.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python_ver: ['3.9', '3.10']
python_ver: ['3.10']
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python_ver: ['3.9', '3.10']
python_ver: ['3.10']
defaults:
run:
shell: powershell
Expand Down
2 changes: 1 addition & 1 deletion README-dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The python versions are specified at the beginning of the ``devtools\run-conda-l

.. code-block:: python

_python_versions = ["3.10", "3.9"]
_python_versions = ["3.10"]

The ``Install_or_Update.bat`` and the ``setup-dev.bat`` will use them to install the environment.

Expand Down
2 changes: 1 addition & 1 deletion devtools/run_conda_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

_environments_folder = Path("environments")

_python_versions = ["3.10", "3.9"]
_python_versions = ["3.10"]


@contextmanager
Expand Down
3 changes: 0 additions & 3 deletions environments/env-python-3.9.yml

This file was deleted.

232 changes: 115 additions & 117 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,171 +1,169 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 53e71090838f77dd4ee911864b4df32d7ba0f8036b08773c1e53c0f6fb6757bc
# input_hash: 9f1e6e1319eb5768ce6c4ebde2184f75580dd54ab9986812e3bbf9c9f54b8885

channels:
- conda-forge
dependencies:
- _libgcc_mutex=0.1=conda_forge
- ca-certificates=2024.2.2=hbcca054_0
- ld_impl_linux-64=2.40=h41732ed_0
- libstdcxx-ng=13.2.0=h7e041cc_5
- python_abi=3.10=4_cp310
- tzdata=2024a=h0c530f3_0
- _openmp_mutex=4.5=2_kmp_llvm
- libgcc-ng=13.2.0=h807b86a_5
- bzip2=1.0.8=hd590300_5
- c-ares=1.27.0=hd590300_0
- icu=73.2=h59595ed_0
- keyutils=1.6.1=h166bdaf_0
- lerc=4.0.0=h27087fc_0
- libaec=1.1.2=h59595ed_1
- libbrotlicommon=1.1.0=hd590300_1
- libdeflate=1.19=hd590300_0
- libev=4.33=hd590300_2
- libffi=3.4.2=h7f98852_5
- libgfortran5=13.2.0=ha4646dd_5
- libiconv=1.17=hd590300_2
- libjpeg-turbo=3.0.0=hd590300_1
- libnsl=2.0.1=hd590300_0
- libuuid=2.38.1=h0b41bf4_0
- libwebp-base=1.3.2=hd590300_0
- libxcrypt=4.4.36=hd590300_1
- libzlib=1.2.13=hd590300_5
- ncurses=6.4=h59595ed_2
- openssl=3.2.1=hd590300_0
- pthread-stubs=0.4=h36c2ea0_1001
- xorg-libxau=1.0.11=hd590300_0
- xorg-libxdmcp=1.1.3=h7f98852_0
- xz=5.2.6=h166bdaf_0
- yaml=0.2.5=h7f98852_2
- libbrotlidec=1.1.0=hd590300_1
- libbrotlienc=1.1.0=hd590300_1
- libedit=3.1.20191231=he28a2e2_2
- libgfortran-ng=13.2.0=h69a702a_5
- libllvm14=14.0.6=hcd5def8_4
- libnghttp2=1.58.0=h47da74e_1
- libpng=1.6.43=h2797004_0
- libsqlite=3.45.1=h2797004_0
- libssh2=1.11.0=h0841786_0
- libxcb=1.15=h0b41bf4_0
- libxml2=2.12.5=h232c23b_0
- readline=8.2=h8228510_1
- tk=8.6.13=noxft_h4845f30_101
- zstd=1.5.5=hfc55251_0
- brotli-bin=1.1.0=hd590300_1
- freetype=2.12.1=h267a509_2
- krb5=1.21.2=h659d440_0
- libhwloc=2.9.3=default_h554bfaf_1009
- libopenblas=0.3.25=pthreads_h413a1c8_0
- libtiff=4.6.0=ha9c0a0a_2
- llvm-openmp=17.0.6=h4dfa4b3_0
- python=3.10.13=hd12c33a_1_cpython
- asciitree=0.3.3=py_2
- astroid=3.0.2=py310hff52083_0
- brotli=1.1.0=hd590300_1
- brotli-bin=1.1.0=hd590300_1
- brotli-python=1.1.0=py310hc6cd4ac_1
- bzip2=1.0.8=hd590300_5
- c-ares=1.26.0=hd590300_0
- ca-certificates=2023.11.17=hbcca054_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- certifi=2023.11.17=pyhd8ed1ab_0
- certifi=2024.2.2=pyhd8ed1ab_0
- charset-normalizer=3.3.2=pyhd8ed1ab_0
- click=8.1.7=unix_pyh707e725_0
- cloudpickle=3.0.0=pyhd8ed1ab_0
- colorama=0.4.6=pyhd8ed1ab_0
- contourpy=1.2.0=py310hd41b1e2_0
- coverage=7.4.1=py310h2372a71_0
- cycler=0.12.1=pyhd8ed1ab_0
- cytoolz=0.12.2=py310h2372a71_1
- dask-core=2022.10.2=pyhd8ed1ab_0
- dill=0.3.8=pyhd8ed1ab_0
- discretize=0.10.0=py310hcb52e73_1
- distributed=2022.10.2=pyhd8ed1ab_0
- empymod=2.2.2=pyhd8ed1ab_0
- exceptiongroup=1.2.0=pyhd8ed1ab_2
- fasteners=0.17.3=pyhd8ed1ab_0
- fonttools=4.47.2=py310h2372a71_0
- freetype=2.12.1=h267a509_2
- fsspec=2023.12.2=pyhca7485f_0
- geoana=0.4.0=py310hbf28c38_1
- h5py=3.10.0=nompi_py310h65828d5_101
- hdf5=1.14.3=nompi_h4f84152_100
- icu=73.2=h59595ed_0
- fsspec=2024.2.0=pyhca7485f_0
- idna=3.6=pyhd8ed1ab_0
- iniconfig=2.0.0=pyhd8ed1ab_0
- isort=5.13.2=pyhd8ed1ab_0
- jinja2=3.1.3=pyhd8ed1ab_0
- keyutils=1.6.1=h166bdaf_0
- kiwisolver=1.4.5=py310hd41b1e2_1
- krb5=1.21.2=h659d440_0
- lcms2=2.16=hb7c19ff_0
- ld_impl_linux-64=2.40=h41732ed_0
- lerc=4.0.0=h27087fc_0
- libaec=1.1.2=h59595ed_1
- libblas=3.9.0=20_linux64_openblas
- libbrotlicommon=1.1.0=hd590300_1
- libbrotlidec=1.1.0=hd590300_1
- libbrotlienc=1.1.0=hd590300_1
- libcblas=3.9.0=20_linux64_openblas
- libcurl=8.5.0=hca28451_0
- libdeflate=1.19=hd590300_0
- libedit=3.1.20191231=he28a2e2_2
- libev=4.33=hd590300_2
- libffi=3.4.2=h7f98852_5
- libgcc-ng=13.2.0=h807b86a_4
- libgfortran-ng=13.2.0=h69a702a_4
- libgfortran5=13.2.0=ha4646dd_4
- libhwloc=2.9.3=default_h554bfaf_1009
- libiconv=1.17=hd590300_2
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=20_linux64_openblas
- libllvm14=14.0.6=hcd5def8_4
- libnghttp2=1.58.0=h47da74e_1
- libnsl=2.0.1=hd590300_0
- libopenblas=0.3.25=pthreads_h413a1c8_0
- libpng=1.6.42=h2797004_0
- libsqlite=3.44.2=h2797004_0
- libssh2=1.11.0=h0841786_0
- libstdcxx-ng=13.2.0=h7e041cc_4
- libtiff=4.6.0=ha9c0a0a_2
- libuuid=2.38.1=h0b41bf4_0
- libwebp-base=1.3.2=hd590300_0
- libxcb=1.15=h0b41bf4_0
- libxcrypt=4.4.36=hd590300_1
- libxml2=2.12.4=h232c23b_1
- libzlib=1.2.13=hd590300_5
- llvm-openmp=17.0.6=h4dfa4b3_0
- llvmlite=0.41.1=py310h1b8f574_0
- llvmlite=0.42.0=py310h1b8f574_1
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=2.1.4=py310h2372a71_0
- matplotlib-base=3.8.2=py310h62c0568_0
- markupsafe=2.1.5=py310h2372a71_0
- mccabe=0.7.0=pyhd8ed1ab_0
- mkl=2022.2.1=h84fe81f_16997
- msgpack-python=1.0.7=py310hd41b1e2_0
- munkres=1.1.4=pyh9f0ad1d_0
- ncurses=6.4=h59595ed_2
- numba=0.58.1=py310h7dc5dd1_0
- numcodecs=0.12.1=py310hc6cd4ac_0
- numpy=1.23.5=py310h53a5b5f_0
- openjpeg=2.5.0=h488ebb8_3
- openssl=3.2.1=hd590300_0
- openjpeg=2.5.2=h488ebb8_0
- packaging=23.2=pyhd8ed1ab_0
- partd=1.4.1=pyhd8ed1ab_0
- pillow=10.2.0=py310h01dd4db_0
- pip=23.3.2=pyhd8ed1ab_0
- platformdirs=4.2.0=pyhd8ed1ab_0
- pluggy=1.4.0=pyhd8ed1ab_0
- pooch=1.8.0=pyhd8ed1ab_0
- psutil=5.9.8=py310h2372a71_0
- pthread-stubs=0.4=h36c2ea0_1001
- pydiso=0.0.3=py310h1dd1467_4
- pygments=2.17.2=pyhd8ed1ab_0
- pylint=3.0.3=pyhd8ed1ab_0
- pymatsolver=0.2.0=py310hff52083_2
- pyparsing=3.1.1=pyhd8ed1ab_0
- pysocks=1.7.1=pyha2e5f31_6
- pytest=8.0.0=pyhd8ed1ab_0
- pytest-cov=4.1.0=pyhd8ed1ab_0
- python=3.10.13=hd12c33a_1_cpython
- python-dateutil=2.8.2=pyhd8ed1ab_0
- python_abi=3.10=4_cp310
- pyyaml=6.0.1=py310h2372a71_1
- readline=8.2=h8228510_1
- requests=2.31.0=pyhd8ed1ab_0
- scipy=1.10.1=py310ha4c1d20_3
- setuptools=69.0.3=pyhd8ed1ab_0
- setuptools=69.1.1=pyhd8ed1ab_0
- six=1.16.0=pyh6c4a22f_0
- sortedcontainers=2.4.0=pyhd8ed1ab_0
- tbb=2021.11.0=h00ab1b0_1
- tblib=3.0.0=pyhd8ed1ab_0
- tk=8.6.13=noxft_h4845f30_101
- toml=0.10.2=pyhd8ed1ab_0
- tomli=2.0.1=pyhd8ed1ab_0
- tomlkit=0.12.3=pyha770c72_0
- tomlkit=0.12.4=pyha770c72_0
- toolz=0.12.1=pyhd8ed1ab_0
- tornado=6.1=py310h5764c6d_3
- tqdm=4.66.1=pyhd8ed1ab_0
- typing-extensions=4.9.0=hd8ed1ab_0
- typing_extensions=4.9.0=pyha770c72_0
- tzdata=2023d=h0c530f3_0
- typing_extensions=4.10.0=pyha770c72_0
- unicodedata2=15.1.0=py310h2372a71_0
- urllib3=2.2.0=pyhd8ed1ab_0
- utm=0.7.0=pyhd8ed1ab_0
- wheel=0.42.0=pyhd8ed1ab_0
- xorg-libxau=1.0.11=hd590300_0
- xorg-libxdmcp=1.1.3=h7f98852_0
- xz=5.2.6=h166bdaf_0
- yaml=0.2.5=h7f98852_2
- zarr=2.14.2=pyhd8ed1ab_0
- zict=3.0.0=pyhd8ed1ab_0
- zstd=1.5.5=hfc55251_0
- cached-property=1.5.2=hd8ed1ab_1
- coverage=7.4.3=py310h2372a71_1
- cytoolz=0.12.3=py310h2372a71_0
- fonttools=4.49.0=py310h2372a71_0
- hdf5=1.14.3=nompi_h4f84152_100
- isort=5.13.2=pyhd8ed1ab_0
- jinja2=3.1.3=pyhd8ed1ab_0
- libcblas=3.9.0=20_linux64_openblas
- liblapack=3.9.0=20_linux64_openblas
- mkl=2022.2.1=h84fe81f_16997
- partd=1.4.1=pyhd8ed1ab_0
- pillow=10.2.0=py310h01dd4db_0
- pip=24.0=pyhd8ed1ab_0
- pytest=8.0.2=pyhd8ed1ab_0
- python-dateutil=2.9.0=pyhd8ed1ab_0
- tqdm=4.66.2=pyhd8ed1ab_0
- typing-extensions=4.10.0=hd8ed1ab_0
- urllib3=2.2.1=pyhd8ed1ab_0
- annotated-types=0.6.0=pyhd8ed1ab_0
- astroid=3.1.0=py310hff52083_0
- dask-core=2022.10.2=pyhd8ed1ab_0
- numpy=1.23.5=py310h53a5b5f_0
- pydantic-core=2.14.6=py310hcb5633a_1
- pytest-cov=4.1.0=pyhd8ed1ab_0
- requests=2.31.0=pyhd8ed1ab_0
- contourpy=1.2.0=py310hd41b1e2_0
- distributed=2022.10.2=pyhd8ed1ab_0
- h5py=3.10.0=nompi_py310h65828d5_101
- numba=0.59.0=py310h7dc5dd1_1
- numcodecs=0.12.1=py310hc6cd4ac_0
- pooch=1.8.1=pyhd8ed1ab_0
- pydantic=2.5.3=pyhd8ed1ab_0
- pylint=3.1.0=pyhd8ed1ab_0
- matplotlib-base=3.8.3=py310h62c0568_0
- scipy=1.10.1=py310ha4c1d20_3
- zarr=2.14.2=pyhd8ed1ab_0
- discretize=0.10.0=py310hcb52e73_1
- empymod=2.2.2=pyhd8ed1ab_0
- pydiso=0.0.3=py310h1dd1467_4
- pymatsolver-base=0.2.0=pyh44b312d_3
- geoana=0.4.0=py310hbf28c38_1
- pymatsolver=0.2.0=ha770c72_3
- pip:
- annotated-types === 0.6.0 --hash=sha256:0641064de18ba7a25dee8f96403ebc39113d0cb953a01429249d5c7564666a43
- geoapps-utils === 0.3.0a1 --hash=sha256:91e4746d916dad8439c97a5f7a32236216f3037e7690f3095318f7d12b70f762
- geoh5py === 0.9.0a1 --hash=sha256:ddf340cc1b966ee8ac4f0bf6e0206e56e2de77f9cdbae20d07ce93fd4793bfa5
- joblib === 1.3.2 --hash=sha256:ef4331c65f239985f3f2220ecc87db222f08fd22097a3dd5698f693875f8cbb9
- mira-simpeg === 0.19.0.dev6 --hash=sha256:7720abe7cc2dddedcc9bee847de1cf8e0d88419ce07495892bea170a443ad0f7
- octree-creation-app === 0.1.0a2 --hash=sha256:2d05aa7436833888cb1d68fda95eab89858ddb74987a7f350163a346d1ebebcf
- pandas === 2.2.0 --hash=sha256:20404d2adefe92aed3b38da41d0847a143a09be982a31b85bc7dd565bdba0f4e
- param-sweeps === 0.1.7a1 --hash=sha256:2a82acf94d50507f9a2922ff96b90e22326d9e0deb632a03fc4ae7008defca05
- properties === 0.6.1 --hash=sha256:b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263
- pydantic === 2.5.3 --hash=sha256:d0caf5954bee831b6bfe7e338c32b9e30c85dfe080c843680783ac2b631673b4
- pydantic-core === 2.14.6 --hash=sha256:036137b5ad0cb0004c75b579445a1efccd072387a36c7f217bb8efd1afbe5245
- pytz === 2023.4 --hash=sha256:f90ef520d95e7c46951105338d918664ebfd6f1d995bd7d153127ce90efafa6a
- scikit-learn === 1.4.0 --hash=sha256:e98632da8f6410e6fb6bf66937712c949b4010600ccd3f22a5388a83e610cc3c
- simpeg-archive === 0.11.0.dev6 --hash=sha256:ddb2487b640846a6859afb6f9f33ec5a04e4e0d5572c690d4c1a88579a47adcb
- threadpoolctl === 3.2.0 --hash=sha256:2b7818516e423bdaebb97c723f86a7c6b0a83d3f3b0970328d66f4d9104dc032
- tzdata === 2023.4 --hash=sha256:aa3ace4329eeacda5b7beb7ea08ece826c28d761cda36e747cfbf97996d39bf3
- vectormath === 0.2.2 --hash=sha256:f9f9209d350ec89dc11e2548e0e6397c1b9489c8468eb50ce33788ee4322a7b8
- joblib === 1.3.2 --hash=sha256:ef4331c65f239985f3f2220ecc87db222f08fd22097a3dd5698f693875f8cbb9
- pytz === 2024.1 --hash=sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319
- threadpoolctl === 3.3.0 --hash=sha256:6155be1f4a39f31a18ea70f94a77e0ccd57dced08122ea61109e7da89883781e
- tzdata === 2024.1 --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
- geoh5py === 0.9.0a2 --hash=sha256:70041ed40bda3caa4fc95b9cf842822ceb0b4337954233a76fcada04daf9fd0f
- pandas === 2.2.1 --hash=sha256:c38ce92cb22a4bea4e3929429aa1067a454dcc9c335799af93ba9be21b6beb51
- scikit-learn === 1.4.1.post1 --hash=sha256:c02e27d65b0c7dc32f2c5eb601aaf5530b7a02bfbe92438188624524878336f2
- geoapps-utils === 0.3.0a2 --hash=sha256:cf9d091d7f86c860f24369ddd2fbc6f6670369ca56dd35038c1093bd62ef957d
- mira-simpeg === 0.19.0.dev7 --hash=sha256:d3ec1138f09611404ae302510b8298ca72e35d70dc623bcd5f499333d8adce01
- param-sweeps === 0.1.7a1 --hash=sha256:2a82acf94d50507f9a2922ff96b90e22326d9e0deb632a03fc4ae7008defca05
- octree-creation-app === 0.1.0a3 --hash=sha256:834030116897072e1dfd9ac78c73326a766a6b8f455215dac061343af4453734

variables:
KMP_WARNINGS: 0
Loading