diff --git a/conda-py-3.10-lock.yml b/conda-py-3.10-lock.yml index 68e6e51b3..918c817f7 100644 --- a/conda-py-3.10-lock.yml +++ b/conda-py-3.10-lock.yml @@ -19,9 +19,9 @@ metadata: - url: conda-forge used_env_vars: [] content_hash: - linux-64: 954354e18d30299c48fe07db5a5acd0f439be1c8b6c8f3de89f2d8d93908c8c2 - osx-64: 5177cd22bcb65742670525ad36335f58c72d94b987b5db6286506b03d8b6e090 - win-64: ef7deb91a223dce68810bded237458971c4f040f3dba90c49f43ddcf543f9c00 + linux-64: 85b9a66f4fc3d283e9655bf8f2fa0d528fe5f80131489fa30bf22dfbe72ba759 + osx-64: 3364486d7540ca0316edd6efc9ddb459e5cfd2a032b798621f2869c6f4db1f93 + win-64: 69bd12ceccb15cadcc8eb502aed53328f8120bb7af72994ff1cde771e7e81436 platforms: - win-64 - osx-64 @@ -671,16 +671,16 @@ package: version: 1.31.3 - category: main dependencies: - libgcc-ng: '>=10.3.0' + libgcc-ng: '>=12' hash: - md5: 4acfc691e64342b9dae57cf2adc63238 - sha256: b801e8cf4b2c9a30bce5616746c6c2a4e36427f045b46d9fc08a4ed40a9f7065 + md5: 681105bccc2a3f7f1a837d47d39c9179 + sha256: ccf61e61d58a8a7b2d66822d5568e2dc9387883dd9b2da61e1d787ece4c4979a manager: conda name: ncurses optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2 - version: '6.3' + url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.4-hcb278e6_0.conda + version: '6.4' - category: main dependencies: libgcc-ng: '>=12' @@ -2096,18 +2096,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: main dependencies: libgcc-ng: '>=12' @@ -3798,14 +3786,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: markupsafe: '>=2.1.1' @@ -4999,21 +4987,21 @@ package: version: 0.2.2 - category: core dependencies: - libgcc-ng: '>=10.3.0' - libstdcxx-ng: '>=10.3.0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' numpy: '>=1.21.6,<2.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 scipy: '>=0.13' hash: - md5: f97c620a5ab8cf3b34cbb10907b2f571 - sha256: b35b4b58fde74fc7afdcb61b96f933719e7f92136068f3ff4f3010dd817cf611 + md5: e99dbe732683f3bbee6b866e15364f32 + sha256: 68602e2e77296cd339dc7bd4b73806f4c4667f23cb71ba51cfc680c97cb7e5b0 manager: conda name: discretize optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.7.4-py310hc4a4660_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.8.3-py310h5a539fb_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -5135,21 +5123,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.4.0-pyhd8ed1ab_0.conda version: 7.4.0 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: core dependencies: libgcc-ng: '>=12' @@ -5238,23 +5211,24 @@ package: version: 2.14.2 - category: core dependencies: - future: '' + empymod: '' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 scipy: '>=0.13' utm: '' - vectormath: '' hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 + md5: 1bd40020a2aa8efd348d0a7c051d3f22 + sha256: 08a3bdd30b685bcacc097611495175d0b6994f56484a174dc85a0b61945b939c manager: conda name: geoana optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 + url: https://conda.anaconda.org/conda-forge/linux-64/geoana-0.4.0-py310hbf28c38_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: ansi2html: '' @@ -5501,21 +5475,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -5534,17 +5506,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -5553,9 +5522,9 @@ package: platform: linux-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -5571,6 +5540,21 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: linux-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 - category: main dependencies: {} hash: @@ -5871,14 +5855,14 @@ package: - category: main dependencies: {} hash: - md5: 76217ebfbb163ff2770a261f955a5861 - sha256: 9794a23d03586c99cac49d4ae3d5337faaa6bfc256b31d2662ff4ad5972be143 + md5: c3dbae2411164d9b02c69090a9a91857 + sha256: 7841b1fce1ffb0bfb038f9687b92f04d64acab1f7cb96431972386ea98c7b2fd manager: conda name: ncurses optional: false platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2 - version: '6.3' + url: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.4-hf0c8a7f_0.conda + version: '6.4' - category: apps dependencies: {} hash: @@ -7053,18 +7037,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: main dependencies: libcxx: '>=15.0.7' @@ -8525,14 +8497,14 @@ package: python_abi: 3.10.* *_cp310 setuptools: '' hash: - md5: 8f850119688de310515512ac755f720e - sha256: 6d0e105d3d52edb61fd936912a66a00173fe1be6a0edb7b0dc0168360df537e6 + md5: e1ab355e10f9fc8995371072a2e0fa29 + sha256: 74755edaa8f76b6a597a306e5eafc027f06a87d73c3a20f92c68845b8cc7dcf4 manager: conda name: pyobjc-core optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-9.1.1-py310h4f19300_0.conda - version: 9.1.1 + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-9.2-py310hef2d279_0.conda + version: '9.2' - category: core dependencies: python: '>=3.6' @@ -8635,14 +8607,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: markupsafe: '>=2.1.1' @@ -8905,18 +8877,18 @@ package: - category: apps dependencies: libffi: '>=3.4,<4.0a0' - pyobjc-core: 9.1.1.* + pyobjc-core: 9.2.* python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 hash: - md5: b4555db62c31780328d13f9353721891 - sha256: c2914f8ba269108ba67ec26c0e1964ff56b69c117cf181c0e4a8bbfcb598a0ff + md5: 0874355241e82a01cd15c6e6b28c7187 + sha256: c9f10735105782a85b077d30cf5933eff7821bf70a806526b8bca3077c5ae057 manager: conda name: pyobjc-framework-cocoa optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-9.1.1-py310h4f19300_0.conda - version: 9.1.1 + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-9.2-py310hef2d279_0.conda + version: '9.2' - category: main dependencies: libcxx: '>=14.0.6' @@ -9520,21 +9492,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda version: 3.0.38 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: main dependencies: gst-plugins-base: '>=1.22.3,<1.23.0a0' @@ -9616,20 +9573,20 @@ package: version: 2.14.2 - category: core dependencies: - libcxx: '>=12.0.1' + libcxx: '>=14.0.6' numpy: '>=1.21.6,<2.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 scipy: '>=0.13' hash: - md5: 8826e7ecec17230deda042508d85bdc9 - sha256: 2001aefaa61324bdb0b0dd797e19b1765428e9601deb9974c52d809d84d6bed1 + md5: 21a0671c4d78e77259bf3d8ef127f2c3 + sha256: 61aee7d065a734ba17b2bd4b6f12468e0cabd4fc79da272797c8e528635c3d35 manager: conda name: discretize optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/discretize-0.7.4-py310h84c6d00_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/osx-64/discretize-0.8.3-py310h3e792ce_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -9670,25 +9627,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.3-py310h3963e5c_0.conda version: 1.9.3 -- category: core - dependencies: - future: '' - matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' - scipy: '>=0.13' - utm: '' - vectormath: '' - hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 - manager: conda - name: geoana - optional: true - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 - category: apps dependencies: __osx: '' @@ -9850,6 +9788,25 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py310hd2c063c_2.conda version: 1.2.2 +- category: core + dependencies: + empymod: '' + libcxx: '>=14.0.4' + matplotlib-base: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 + scipy: '>=0.13' + utm: '' + hash: + md5: a2045d7a327807c593b4eb66878726cb + sha256: 7a469a45948969c16a01f2fa6dc7b67898ba53ebff64fd7530193249db525bed + manager: conda + name: geoana + optional: true + platform: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/geoana-0.4.0-py310ha23aa8a_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: __osx: '' @@ -10141,21 +10098,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: osx-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -10174,17 +10129,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -10193,9 +10145,9 @@ package: platform: osx-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -10211,6 +10163,21 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: osx-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 - category: main dependencies: {} hash: @@ -11601,18 +11568,6 @@ package: platform: win-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: core dependencies: python: '>=3.6' @@ -13645,14 +13600,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: backports.functools_lru_cache: '' @@ -14479,17 +14434,18 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* *_cp310 scipy: '>=0.13' - vc: '>=14.1,<15' - vs2015_runtime: '>=14.16.27033' + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vs2015_runtime: '>=14.29.30139' hash: - md5: 7f313a70e136066343932415dcaa64b4 - sha256: 531719da40ada6e54d86ec2437172a687ddb52034e85063bd2f03540fc0bb9c0 + md5: eb163df36e7c567ec372f4af8f305e6e + sha256: 0e12ec04d5fa226fcfc724344c74b526dd3c4222de9bd6f5fc9da88d65a61969 manager: conda name: discretize optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.7.4-py310hc781a3c_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.8.3-py310h220cb41_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -14620,21 +14576,6 @@ package: platform: win-64 url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.4.0-pyhd8ed1ab_0.conda version: 7.4.0 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: core dependencies: mkl: '>=2022.1.0,<2023.0a0' @@ -14726,23 +14667,25 @@ package: version: 2.14.2 - category: core dependencies: - future: '' + empymod: '' matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* *_cp310 scipy: '>=0.13' + ucrt: '>=10.0.20348.0' utm: '' - vectormath: '' + vc: '>=14.2,<15' + vs2015_runtime: '>=14.29.30139' hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 + md5: dc83eae4fe4c634d111e066e13bada84 + sha256: e67adde2539020fa905a169ad4e06a5d39b6fa94ba87de279e7547c1f7742971 manager: conda name: geoana optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 + url: https://conda.anaconda.org/conda-forge/win-64/geoana-0.4.0-py310h232114e_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: nbconvert-core: 7.4.0 pyhd8ed1ab_0 @@ -14929,21 +14872,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: win-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -14962,17 +14903,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -14981,9 +14919,9 @@ package: platform: win-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -14999,4 +14937,19 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: win-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 version: 1 diff --git a/conda-py-3.9-lock.yml b/conda-py-3.9-lock.yml index 166011c09..7a7139b0c 100644 --- a/conda-py-3.9-lock.yml +++ b/conda-py-3.9-lock.yml @@ -19,9 +19,9 @@ metadata: - url: conda-forge used_env_vars: [] content_hash: - linux-64: 28c615b7aa79a79ed7ed5d71ee85738d695459908d50362e414afc4234b2c111 - osx-64: f9d07d9639b377faaf9d57d6e4fed0ee8730d63e74c9e56344a94e96f435fcc7 - win-64: 874389a50d8eb2d6172f77970955ce41d20e0ed971d2a65e61c98cd1eaf64818 + linux-64: 49f7c649815d742126da5b822542d8527800d48c05850f36943fc174d7e49095 + osx-64: 214340f152d6c9e9a33c5f789c7ce4db261d17f14413f8df9d53ba4fba230301 + win-64: ee9b47acc1aacf267674a890aa3e79f8d9586fe2831ddb0d8fb9bfb0c8841633 platforms: - win-64 - osx-64 @@ -671,16 +671,16 @@ package: version: 1.31.3 - category: main dependencies: - libgcc-ng: '>=10.3.0' + libgcc-ng: '>=12' hash: - md5: 4acfc691e64342b9dae57cf2adc63238 - sha256: b801e8cf4b2c9a30bce5616746c6c2a4e36427f045b46d9fc08a4ed40a9f7065 + md5: 681105bccc2a3f7f1a837d47d39c9179 + sha256: ccf61e61d58a8a7b2d66822d5568e2dc9387883dd9b2da61e1d787ece4c4979a manager: conda name: ncurses optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2 - version: '6.3' + url: https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.4-hcb278e6_0.conda + version: '6.4' - category: main dependencies: libgcc-ng: '>=12' @@ -2096,18 +2096,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: main dependencies: libgcc-ng: '>=12' @@ -3798,14 +3786,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: markupsafe: '>=2.1.1' @@ -5012,21 +5000,21 @@ package: version: 0.2.2 - category: core dependencies: - libgcc-ng: '>=10.3.0' - libstdcxx-ng: '>=10.3.0' - numpy: '>=1.19.5,<2.0a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + numpy: '>=1.20.3,<2.0a0' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 scipy: '>=0.13' hash: - md5: 6e885cf316cc3dcb45f1501fd7179a90 - sha256: 9103819962f24086e0349dae1c0f62738b0a5cc003d714bbb8c500e5c5fce72c + md5: f66b56524daa4a5a31cbddcb0e006ac8 + sha256: 3f64205e61ad11beac4819c279c724bd3623899a3d894d085910b561da308e1b manager: conda name: discretize optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.7.4-py39hac2352c_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.8.3-py39h0354152_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -5149,21 +5137,6 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.4.0-pyhd8ed1ab_0.conda version: 7.4.0 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: core dependencies: libgcc-ng: '>=12' @@ -5252,23 +5225,24 @@ package: version: 2.14.2 - category: core dependencies: - future: '' + empymod: '' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 scipy: '>=0.13' utm: '' - vectormath: '' hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 + md5: 30c050880e874cb0ca7500be2ac62d12 + sha256: 0a15618436b5116cd550d2926d1c56724ef4d6af373f7cd9e38bfa1647e8175f manager: conda name: geoana optional: true platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 + url: https://conda.anaconda.org/conda-forge/linux-64/geoana-0.4.0-py39hf939315_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: ansi2html: '' @@ -5515,21 +5489,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: linux-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -5548,17 +5520,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -5567,9 +5536,9 @@ package: platform: linux-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -5585,6 +5554,21 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: linux-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 - category: main dependencies: {} hash: @@ -5885,14 +5869,14 @@ package: - category: main dependencies: {} hash: - md5: 76217ebfbb163ff2770a261f955a5861 - sha256: 9794a23d03586c99cac49d4ae3d5337faaa6bfc256b31d2662ff4ad5972be143 + md5: c3dbae2411164d9b02c69090a9a91857 + sha256: 7841b1fce1ffb0bfb038f9687b92f04d64acab1f7cb96431972386ea98c7b2fd manager: conda name: ncurses optional: false platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2 - version: '6.3' + url: https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.4-hf0c8a7f_0.conda + version: '6.4' - category: apps dependencies: {} hash: @@ -7067,18 +7051,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: main dependencies: libcxx: '>=15.0.7' @@ -8539,14 +8511,14 @@ package: python_abi: 3.9.* *_cp39 setuptools: '' hash: - md5: 29b5fc5cfc90a6d07d6f77c0c91314fe - sha256: 1847f69da500786ebb56cb22e73aa82f5096993f07324ed4f0485fe03b16772a + md5: fcfbf039b0859f3222faaccfbd0cf2e4 + sha256: ba7f5b6e292ebc9ba0492e70b9f0480ccca9ebe7b3fd70f832b11b678f53588d manager: conda name: pyobjc-core optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-9.1.1-py39h0504f80_0.conda - version: 9.1.1 + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-9.2-py39head00df_0.conda + version: '9.2' - category: core dependencies: python: '>=3.6' @@ -8649,14 +8621,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: markupsafe: '>=2.1.1' @@ -8932,18 +8904,18 @@ package: - category: apps dependencies: libffi: '>=3.4,<4.0a0' - pyobjc-core: 9.1.1.* + pyobjc-core: 9.2.* python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 hash: - md5: 952cfaf1f4cb79fde7bed0a530ed39d0 - sha256: f8d5b8d4d4785ea6a2bd557fe2561c0e4a2b1b966e158bab38b6af518a3e1b13 + md5: 9fb086e92720073f24af673312874790 + sha256: 329a2b647ca833204b57367b3dcdcd072f246774fecbc8d7bbcc87dadc32103a manager: conda name: pyobjc-framework-cocoa optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-9.1.1-py39h0504f80_0.conda - version: 9.1.1 + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-9.2-py39head00df_0.conda + version: '9.2' - category: main dependencies: libcxx: '>=14.0.6' @@ -9548,21 +9520,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda version: 3.0.38 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: main dependencies: gst-plugins-base: '>=1.22.3,<1.23.0a0' @@ -9644,20 +9601,20 @@ package: version: 2.14.2 - category: core dependencies: - libcxx: '>=12.0.1' - numpy: '>=1.19.5,<2.0a0' + libcxx: '>=14.0.6' + numpy: '>=1.20.3,<2.0a0' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 scipy: '>=0.13' hash: - md5: 49503ab78512f5ef2223f7f1f1ae0858 - sha256: 13edb04a7bae0592e66069078f5b7972dd1a6033608e1a11aff9c27e0024c2ac + md5: fb6d32deb8d8b71d6099b9d3dec88607 + sha256: 265813ce3c97b7418b5f3bfb27ac44c5e6b8973f2d3be72c6d807b55b27b20ea manager: conda name: discretize optional: true platform: osx-64 - url: https://conda.anaconda.org/conda-forge/osx-64/discretize-0.7.4-py39hb5e4067_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/osx-64/discretize-0.8.3-py39h6dc771e_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -9698,25 +9655,6 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.3-py39hcea2a47_0.conda version: 1.9.3 -- category: core - dependencies: - future: '' - matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' - scipy: '>=0.13' - utm: '' - vectormath: '' - hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 - manager: conda - name: geoana - optional: true - platform: osx-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 - category: apps dependencies: __osx: '' @@ -9878,6 +9816,25 @@ package: platform: osx-64 url: https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py39hcb35850_2.conda version: 1.2.2 +- category: core + dependencies: + empymod: '' + libcxx: '>=14.0.4' + matplotlib-base: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 + scipy: '>=0.13' + utm: '' + hash: + md5: bb3dc7d1b06f82e9a7f2430ab4a4f85d + sha256: 008af6b5f5fb945be0a8b6899c0db449165dea4983ce59337b6c3a3b22ba7f45 + manager: conda + name: geoana + optional: true + platform: osx-64 + url: https://conda.anaconda.org/conda-forge/osx-64/geoana-0.4.0-py39h92daf61_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: __osx: '' @@ -10169,21 +10126,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: osx-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -10202,17 +10157,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -10221,9 +10173,9 @@ package: platform: osx-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -10239,6 +10191,21 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: osx-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 - category: main dependencies: {} hash: @@ -11629,18 +11596,6 @@ package: platform: win-64 url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.11.0-pyhd8ed1ab_0.tar.bz2 version: 2022.11.0 -- category: core - dependencies: - python: '>=3.8' - hash: - md5: fec8329fc739090f26a7d7803db254f1 - sha256: b3d34bf4924cb80363c1ab57ac821393f118ffaa94f05368bf4044941163b65e - manager: conda - name: future - optional: true - platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/future-0.18.3-pyhd8ed1ab_0.conda - version: 0.18.3 - category: core dependencies: python: '>=3.6' @@ -13686,14 +13641,14 @@ package: pysocks: '>=1.5.6,<2.0,!=1.5.7' python: '>=3.7' hash: - md5: 81a763f3c64fe6d5f32e033b0325265d - sha256: e6a70b1bb3fe6b15b11cb93322f29b40fd276dfb853f550d1898af848f36eb5e + md5: ae465d0fbf9f1979cb2d8d4043d885e2 + sha256: 91d999539132f4b04091642df62b51c63c8a1fd61ecdff1ed704fc11405f9a34 manager: conda name: urllib3 optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.2-pyhd8ed1ab_0.conda - version: 2.0.2 + url: https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.3-pyhd8ed1ab_0.conda + version: 2.0.3 - category: apps dependencies: backports.functools_lru_cache: '' @@ -14516,21 +14471,22 @@ package: version: 0.2.2 - category: core dependencies: - numpy: '>=1.19.5,<2.0a0' + numpy: '>=1.20.3,<2.0a0' python: '>=3.9,<3.10.0a0' python_abi: 3.9.* *_cp39 scipy: '>=0.13' - vc: '>=14.1,<15' - vs2015_runtime: '>=14.16.27033' + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vs2015_runtime: '>=14.29.30139' hash: - md5: 4e899b73be229523f8a916d80843e2f2 - sha256: 7b73503c2adbfadea3857ea26fcf2d5f22af825e9a4a6b9824b18c96974a6132 + md5: 0af892d15141306137926cf752d7dec3 + sha256: 4155aeea7842d6a36580135b0c0341c6ee23bc71aa7f6b52ae2b8e89dc26241e manager: conda name: discretize optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.7.4-py39hefe7e4c_0.tar.bz2 - version: 0.7.4 + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.8.3-py39hbd792c9_0.conda + version: 0.8.3 - category: core dependencies: numba: '>=0.47' @@ -14662,21 +14618,6 @@ package: platform: win-64 url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.4.0-pyhd8ed1ab_0.conda version: 7.4.0 -- category: main - dependencies: - numpy: '>=1.7' - python: '' - six: '' - vectormath: '>=0.1.4' - hash: - md5: 62052fa8409d12536ff149e25b0e9905 - sha256: 693596b821b28f8d9710e80a143816e55fc401b8cd2f0b0d777f5155bd3358f2 - manager: conda - name: properties - optional: false - platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/properties-0.6.1-py_0.tar.bz2 - version: 0.6.1 - category: core dependencies: mkl: '>=2022.1.0,<2023.0a0' @@ -14768,23 +14709,25 @@ package: version: 2.14.2 - category: core dependencies: - future: '' + empymod: '' matplotlib-base: '' - numpy: '>=1.7' - properties: '' - python: '' + numpy: '>=1.23.4,<2.0a0' + python: '>=3.9,<3.10.0a0' + python_abi: 3.9.* *_cp39 scipy: '>=0.13' + ucrt: '>=10.0.20348.0' utm: '' - vectormath: '' + vc: '>=14.2,<15' + vs2015_runtime: '>=14.29.30139' hash: - md5: 940c153c790eec5801d26ad7115d69bf - sha256: 6ef4cb86ab786166d39b6a55f2b5b9027f298d4aa7ba676d587b31cf80053ae5 + md5: 82f94c4c151213759b4ea27d1b9b67b7 + sha256: 96285fa5b470e64332761d7aebc11e0e79d9fa3e6a36e3a278e7b457103ce57e manager: conda name: geoana optional: true platform: win-64 - url: https://conda.anaconda.org/conda-forge/noarch/geoana-0.0.6-py_1.tar.bz2 - version: 0.0.6 + url: https://conda.anaconda.org/conda-forge/win-64/geoana-0.4.0-py39h1f6ef14_1.tar.bz2 + version: 0.4.0 - category: apps dependencies: nbconvert-core: 7.4.0 pyhd8ed1ab_0 @@ -14971,21 +14914,19 @@ package: url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip version: 0.8.0-alpha.2 -- category: core +- category: main dependencies: - discretize: '*' numpy: '>=1.7' - properties: '>=0.3.1b2' - pymatsolver: '>=0.1.1' - scipy: '>=0.13' + six: '>=1.7.3' + vectormath: '>=0.1.4' hash: - sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + sha256: b119ce4c53f4717fa29371c1bb929f422dda7ed90a4559b3583ea77389177263 manager: pip - name: simpeg-archive - optional: true + name: properties + optional: false platform: win-64 - url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl - version: 0.9.1.dev5 + url: https://files.pythonhosted.org/packages/c0/9a/cd2def3421cd077d80d4973c802d29dcb3fba625190b3678480f228a85bf/properties-0.6.1.tar.gz + version: 0.6.1 - category: main dependencies: geoh5py: '>=0.5.0' @@ -15004,17 +14945,14 @@ package: version: 3.0.0 - category: core dependencies: - discretize: '>=0.7.0' - empymod: '*' + discretize: '>=0.8.0' + empymod: '>=2.0.0' geoh5py: '*' - numpy: '>=1.7' + numpy: '>=1.20' pandas: '*' - properties: '>=0.5.2' - pymatsolver: '>=0.1.1' - scikit-learn: '>=0.22' - scipy: '>=1.0.0' - utm: '*' - vectormath: '>=0.2.0' + pymatsolver: '>=0.2' + scikit-learn: '>=1.2' + scipy: '>=1.8.0' hash: sha256: '' manager: pip @@ -15023,9 +14961,9 @@ package: platform: win-64 source: type: url - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256= - url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip - version: 0.15.1.dev10 + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256= + url: https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip + version: 0.19.0.dev1 - category: main dependencies: geoh5py: '>=0.8.0a2,<0.9.0' @@ -15041,4 +14979,19 @@ package: url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip#sha256= url: https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip version: 0.1.6a1 +- category: core + dependencies: + discretize: '*' + numpy: '>=1.7' + properties: '>=0.3.1b2' + pymatsolver: '>=0.1.1' + scipy: '>=0.13' + hash: + sha256: 44fb910c849577dd892f40b39289d26f14c3c5bd50467ed1b41b7841b66d4403 + manager: pip + name: simpeg-archive + optional: true + platform: win-64 + url: https://files.pythonhosted.org/packages/f1/f5/98abe04dcad2c89a6385919492a8c696e8e73194cdf416076001530530ed/simpeg_archive-0.9.1.dev5-py2.py3-none-any.whl + version: 0.9.1.dev5 version: 1 diff --git a/environments/conda-py-3.10-linux-64-dev.lock.yml b/environments/conda-py-3.10-linux-64-dev.lock.yml index 6cc26d532..deeef08de 100644 --- a/environments/conda-py-3.10-linux-64-dev.lock.yml +++ b/environments/conda-py-3.10-linux-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 954354e18d30299c48fe07db5a5acd0f439be1c8b6c8f3de89f2d8d93908c8c2 +# input_hash: 85b9a66f4fc3d283e9655bf8f2fa0d528fe5f80131489fa30bf22dfbe72ba759 channels: - conda-forge @@ -58,7 +58,7 @@ dependencies: - libzopfli=1.0.3=h9c3ff4c_0 - lz4-c=1.9.4=hcb278e6_0 - mpg123=1.31.3=hcb278e6_0 - - ncurses=6.3=h27087fc_1 + - ncurses=6.4=hcb278e6_0 - nspr=4.35=h27087fc_0 - openssl=3.1.1=hd590300_1 - pixman=0.40.0=h36c2ea0_0 @@ -163,7 +163,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h14ed4e7_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=hfc55251_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 @@ -286,7 +285,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h8d71039_2 - xorg-libxcomposite=0.4.6=h0b41bf4_1 @@ -349,19 +348,18 @@ dependencies: - scipy=1.10.1=py310ha4c1d20_3 - shapely=2.0.1=py310h056c13c_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py310hc4a4660_0 + - discretize=0.8.3=py310h5a539fb_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310ha325b7b_0 - ipykernel=6.23.1=pyh210e3f2_0 - matplotlib-base=3.7.1=py310he60537e_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py310h1dd1467_4 - pyqtwebengine=5.15.7=py310h1165ae2_3 - scikit-learn=1.2.2=py310hf7d194e_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py310hbf28c38_1 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 @@ -376,10 +374,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.10-linux-64.lock.yml b/environments/conda-py-3.10-linux-64.lock.yml index 66fc11999..10cb89b5d 100644 --- a/environments/conda-py-3.10-linux-64.lock.yml +++ b/environments/conda-py-3.10-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 954354e18d30299c48fe07db5a5acd0f439be1c8b6c8f3de89f2d8d93908c8c2 +# input_hash: 85b9a66f4fc3d283e9655bf8f2fa0d528fe5f80131489fa30bf22dfbe72ba759 channels: - conda-forge @@ -58,7 +58,7 @@ dependencies: - libzopfli=1.0.3=h9c3ff4c_0 - lz4-c=1.9.4=hcb278e6_0 - mpg123=1.31.3=hcb278e6_0 - - ncurses=6.3=h27087fc_1 + - ncurses=6.4=hcb278e6_0 - nspr=4.35=h27087fc_0 - openssl=3.1.1=hd590300_1 - pixman=0.40.0=h36c2ea0_0 @@ -160,7 +160,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h14ed4e7_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=hfc55251_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -271,7 +270,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h8d71039_2 - xorg-libxcomposite=0.4.6=h0b41bf4_1 @@ -330,19 +329,18 @@ dependencies: - scipy=1.10.1=py310ha4c1d20_3 - shapely=2.0.1=py310h056c13c_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py310hc4a4660_0 + - discretize=0.8.3=py310h5a539fb_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310ha325b7b_0 - ipykernel=6.23.1=pyh210e3f2_0 - matplotlib-base=3.7.1=py310he60537e_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py310h1dd1467_4 - pyqtwebengine=5.15.7=py310h1165ae2_3 - scikit-learn=1.2.2=py310hf7d194e_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py310hbf28c38_1 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 @@ -357,10 +355,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.10-osx-64-dev.lock.yml b/environments/conda-py-3.10-osx-64-dev.lock.yml index 4379392d4..53710dd8b 100644 --- a/environments/conda-py-3.10-osx-64-dev.lock.yml +++ b/environments/conda-py-3.10-osx-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 5177cd22bcb65742670525ad36335f58c72d94b987b5db6286506b03d8b6e090 +# input_hash: 3364486d7540ca0316edd6efc9ddb459e5cfd2a032b798621f2869c6f4db1f93 channels: - conda-forge @@ -32,7 +32,7 @@ dependencies: - libwebp-base=1.3.0=hb7f2c08_0 - libzlib=1.2.13=hfd90126_4 - llvm-openmp=16.0.5=hff08bdf_0 - - ncurses=6.3=h96cf925_1 + - ncurses=6.4=hf0c8a7f_0 - pandoc=2.19.2=h694c41f_2 - pixman=0.40.0=hbcb3906_0 - poppler-data=0.4.12=hd8ed1ab_0 @@ -125,7 +125,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h5bb23bf_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=h7d26f99_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 @@ -235,7 +234,7 @@ dependencies: - plotly=5.13.1=pyhd8ed1ab_0 - postgresql=15.3=hb6430be_0 - proj=9.2.0=hf909084_0 - - pyobjc-core=9.1.1=py310h4f19300_0 + - pyobjc-core=9.2=py310hef2d279_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 - retrying=1.3.3=py_2 - sip=6.7.9=py310h9e9d8ca_0 @@ -243,7 +242,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h90c7484_2 - argon2-cffi-bindings=21.2.0=py310h90acd4f_3 @@ -259,7 +258,7 @@ dependencies: - numpy=1.23.5=py310h1b7c290_0 - platformdirs=3.5.1=pyhd8ed1ab_0 - poppler=23.05.0=he041c3a_1 - - pyobjc-framework-cocoa=9.1.1=py310h4f19300_0 + - pyobjc-framework-cocoa=9.2=py310hef2d279_0 - pyqt5-sip=12.11.0=py310h415000c_3 - pytest=7.3.1=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 @@ -293,15 +292,13 @@ dependencies: - matplotlib-base=3.7.1=py310he725631_0 - nbformat=5.9.0=pyhd8ed1ab_0 - prompt_toolkit=3.0.38=hd8ed1ab_0 - - properties=0.6.1=py_0 - qt-main=5.15.8=h23c57ac_13 - scipy=1.10.1=py310h3900cf1_3 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - discretize=0.7.4=py310h84c6d00_0 + - discretize=0.8.3=py310h3e792ce_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h3963e5c_0 - - geoana=0.0.6=py_1 - ipython=8.14.0=pyhd1c38e8_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310he105d0e_4 @@ -310,6 +307,7 @@ dependencies: - qt-webengine=5.15.8=h66b1b81_1 - scikit-image=0.19.3=py310hecf8f37_2 - scikit-learn=1.2.2=py310hd2c063c_2 + - geoana=0.4.0=py310ha23aa8a_1 - ipykernel=6.23.1=pyh736e0ef_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -326,10 +324,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.10-osx-64.lock.yml b/environments/conda-py-3.10-osx-64.lock.yml index 2a7368212..4624951bd 100644 --- a/environments/conda-py-3.10-osx-64.lock.yml +++ b/environments/conda-py-3.10-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 5177cd22bcb65742670525ad36335f58c72d94b987b5db6286506b03d8b6e090 +# input_hash: 3364486d7540ca0316edd6efc9ddb459e5cfd2a032b798621f2869c6f4db1f93 channels: - conda-forge @@ -32,7 +32,7 @@ dependencies: - libwebp-base=1.3.0=hb7f2c08_0 - libzlib=1.2.13=hfd90126_4 - llvm-openmp=16.0.5=hff08bdf_0 - - ncurses=6.3=h96cf925_1 + - ncurses=6.4=hf0c8a7f_0 - pandoc=2.19.2=h694c41f_2 - pixman=0.40.0=hbcb3906_0 - poppler-data=0.4.12=hd8ed1ab_0 @@ -122,7 +122,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h5bb23bf_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=h7d26f99_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -220,7 +219,7 @@ dependencies: - plotly=5.13.1=pyhd8ed1ab_0 - postgresql=15.3=hb6430be_0 - proj=9.2.0=hf909084_0 - - pyobjc-core=9.1.1=py310h4f19300_0 + - pyobjc-core=9.2=py310hef2d279_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 - retrying=1.3.3=py_2 - sip=6.7.9=py310h9e9d8ca_0 @@ -228,7 +227,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h90c7484_2 - argon2-cffi-bindings=21.2.0=py310h90acd4f_3 @@ -243,7 +242,7 @@ dependencies: - numpy=1.23.5=py310h1b7c290_0 - platformdirs=3.5.1=pyhd8ed1ab_0 - poppler=23.05.0=he041c3a_1 - - pyobjc-framework-cocoa=9.1.1=py310h4f19300_0 + - pyobjc-framework-cocoa=9.2=py310hef2d279_0 - pyqt5-sip=12.11.0=py310h415000c_3 - requests=2.31.0=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 @@ -274,15 +273,13 @@ dependencies: - matplotlib-base=3.7.1=py310he725631_0 - nbformat=5.9.0=pyhd8ed1ab_0 - prompt_toolkit=3.0.38=hd8ed1ab_0 - - properties=0.6.1=py_0 - qt-main=5.15.8=h23c57ac_13 - scipy=1.10.1=py310h3900cf1_3 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - discretize=0.7.4=py310h84c6d00_0 + - discretize=0.8.3=py310h3e792ce_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h3963e5c_0 - - geoana=0.0.6=py_1 - ipython=8.14.0=pyhd1c38e8_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py310he105d0e_4 @@ -291,6 +288,7 @@ dependencies: - qt-webengine=5.15.8=h66b1b81_1 - scikit-image=0.19.3=py310hecf8f37_2 - scikit-learn=1.2.2=py310hd2c063c_2 + - geoana=0.4.0=py310ha23aa8a_1 - ipykernel=6.23.1=pyh736e0ef_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -307,10 +305,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.10-win-64-dev.lock.yml b/environments/conda-py-3.10-win-64-dev.lock.yml index ea144582c..0a6f59036 100644 --- a/environments/conda-py-3.10-win-64-dev.lock.yml +++ b/environments/conda-py-3.10-win-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: ef7deb91a223dce68810bded237458971c4f040f3dba90c49f43ddcf543f9c00 +# input_hash: 69bd12ceccb15cadcc8eb502aed53328f8120bb7af72994ff1cde771e7e81436 channels: - conda-forge @@ -109,7 +109,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - freetype=2.12.1=h546665d_1 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -249,7 +248,7 @@ dependencies: - pytest=7.3.1=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 - tiledb=2.13.2=h3132609_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=21.3.0=pyhd8ed1ab_0 - dash=2.10.2=pyhd8ed1ab_0 @@ -292,20 +291,19 @@ dependencies: - scipy=1.10.1=py310h578b7cb_3 - shapely=2.0.1=py310h91617ff_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py310hc781a3c_0 + - discretize=0.8.3=py310h220cb41_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h4a685fe_0 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.1=py310h51140c5_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py310h847dae0_4 - pyqtwebengine=5.15.7=py310he49db7d_3 - scikit-learn=1.2.2=py310hd266714_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py310h232114e_1 - nbconvert=7.4.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -317,10 +315,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.10-win-64.lock.yml b/environments/conda-py-3.10-win-64.lock.yml index 149e88583..c8ab7b1cf 100644 --- a/environments/conda-py-3.10-win-64.lock.yml +++ b/environments/conda-py-3.10-win-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: ef7deb91a223dce68810bded237458971c4f040f3dba90c49f43ddcf543f9c00 +# input_hash: 69bd12ceccb15cadcc8eb502aed53328f8120bb7af72994ff1cde771e7e81436 channels: - conda-forge @@ -106,7 +106,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - freetype=2.12.1=h546665d_1 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 - itsdangerous=2.1.2=pyhd8ed1ab_0 @@ -232,7 +231,7 @@ dependencies: - pyqt5-sip=12.11.0=py310h00ffb61_3 - stack_data=0.6.2=pyhd8ed1ab_0 - tiledb=2.13.2=h3132609_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=21.3.0=pyhd8ed1ab_0 - dash=2.10.2=pyhd8ed1ab_0 @@ -273,20 +272,19 @@ dependencies: - scipy=1.10.1=py310h578b7cb_3 - shapely=2.0.1=py310h91617ff_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py310hc781a3c_0 + - discretize=0.8.3=py310h220cb41_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py310h4a685fe_0 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.1=py310h51140c5_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py310h847dae0_4 - pyqtwebengine=5.15.7=py310he49db7d_3 - scikit-learn=1.2.2=py310hd266714_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py310h232114e_1 - nbconvert=7.4.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -298,10 +296,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-linux-64-dev.lock.yml b/environments/conda-py-3.9-linux-64-dev.lock.yml index e7697f7c0..787cf0f2f 100644 --- a/environments/conda-py-3.9-linux-64-dev.lock.yml +++ b/environments/conda-py-3.9-linux-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 28c615b7aa79a79ed7ed5d71ee85738d695459908d50362e414afc4234b2c111 +# input_hash: 49f7c649815d742126da5b822542d8527800d48c05850f36943fc174d7e49095 channels: - conda-forge @@ -58,7 +58,7 @@ dependencies: - libzopfli=1.0.3=h9c3ff4c_0 - lz4-c=1.9.4=hcb278e6_0 - mpg123=1.31.3=hcb278e6_0 - - ncurses=6.3=h27087fc_1 + - ncurses=6.4=hcb278e6_0 - nspr=4.35=h27087fc_0 - openssl=3.1.1=hd590300_1 - pixman=0.40.0=h36c2ea0_0 @@ -163,7 +163,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h14ed4e7_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=hfc55251_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 @@ -286,7 +285,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h8d71039_2 - xorg-libxcomposite=0.4.6=h0b41bf4_1 @@ -350,19 +349,18 @@ dependencies: - scipy=1.10.1=py39h6183b62_3 - shapely=2.0.1=py39hf1c3bca_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py39hac2352c_0 + - discretize=0.8.3=py39h0354152_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39h0801953_0 - ipykernel=6.23.1=pyh210e3f2_0 - matplotlib-base=3.7.1=py39he190548_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py39h051f8f4_4 - pyqtwebengine=5.15.7=py39ha048f5d_3 - scikit-learn=1.2.2=py39hc236052_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py39hf939315_1 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 @@ -377,10 +375,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-linux-64.lock.yml b/environments/conda-py-3.9-linux-64.lock.yml index 294e71af4..5edba6305 100644 --- a/environments/conda-py-3.9-linux-64.lock.yml +++ b/environments/conda-py-3.9-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 28c615b7aa79a79ed7ed5d71ee85738d695459908d50362e414afc4234b2c111 +# input_hash: 49f7c649815d742126da5b822542d8527800d48c05850f36943fc174d7e49095 channels: - conda-forge @@ -58,7 +58,7 @@ dependencies: - libzopfli=1.0.3=h9c3ff4c_0 - lz4-c=1.9.4=hcb278e6_0 - mpg123=1.31.3=hcb278e6_0 - - ncurses=6.3=h27087fc_1 + - ncurses=6.4=hcb278e6_0 - nspr=4.35=h27087fc_0 - openssl=3.1.1=hd590300_1 - pixman=0.40.0=h36c2ea0_0 @@ -160,7 +160,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h14ed4e7_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=hfc55251_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -271,7 +270,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h8d71039_2 - xorg-libxcomposite=0.4.6=h0b41bf4_1 @@ -331,19 +330,18 @@ dependencies: - scipy=1.10.1=py39h6183b62_3 - shapely=2.0.1=py39hf1c3bca_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py39hac2352c_0 + - discretize=0.8.3=py39h0354152_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39h0801953_0 - ipykernel=6.23.1=pyh210e3f2_0 - matplotlib-base=3.7.1=py39he190548_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py39h051f8f4_4 - pyqtwebengine=5.15.7=py39ha048f5d_3 - scikit-learn=1.2.2=py39hc236052_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py39hf939315_1 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 @@ -358,10 +356,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-osx-64-dev.lock.yml b/environments/conda-py-3.9-osx-64-dev.lock.yml index 51744adf3..742ec1bf5 100644 --- a/environments/conda-py-3.9-osx-64-dev.lock.yml +++ b/environments/conda-py-3.9-osx-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: f9d07d9639b377faaf9d57d6e4fed0ee8730d63e74c9e56344a94e96f435fcc7 +# input_hash: 214340f152d6c9e9a33c5f789c7ce4db261d17f14413f8df9d53ba4fba230301 channels: - conda-forge @@ -32,7 +32,7 @@ dependencies: - libwebp-base=1.3.0=hb7f2c08_0 - libzlib=1.2.13=hfd90126_4 - llvm-openmp=16.0.5=hff08bdf_0 - - ncurses=6.3=h96cf925_1 + - ncurses=6.4=hf0c8a7f_0 - pandoc=2.19.2=h694c41f_2 - pixman=0.40.0=hbcb3906_0 - poppler-data=0.4.12=hd8ed1ab_0 @@ -125,7 +125,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h5bb23bf_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=h7d26f99_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 @@ -235,7 +234,7 @@ dependencies: - plotly=5.13.1=pyhd8ed1ab_0 - postgresql=15.3=hb6430be_0 - proj=9.2.0=hf909084_0 - - pyobjc-core=9.1.1=py39h0504f80_0 + - pyobjc-core=9.2=py39head00df_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 - retrying=1.3.3=py_2 - sip=6.7.9=py39h840bb9f_0 @@ -243,7 +242,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h90c7484_2 - argon2-cffi-bindings=21.2.0=py39ha30fb19_3 @@ -260,7 +259,7 @@ dependencies: - numpy=1.23.5=py39hdfa1d0c_0 - platformdirs=3.5.1=pyhd8ed1ab_0 - poppler=23.05.0=he041c3a_1 - - pyobjc-framework-cocoa=9.1.1=py39h0504f80_0 + - pyobjc-framework-cocoa=9.2=py39head00df_0 - pyqt5-sip=12.11.0=py39hc100f75_3 - pytest=7.3.1=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 @@ -294,15 +293,13 @@ dependencies: - matplotlib-base=3.7.1=py39hb2f573b_0 - nbformat=5.9.0=pyhd8ed1ab_0 - prompt_toolkit=3.0.38=hd8ed1ab_0 - - properties=0.6.1=py_0 - qt-main=5.15.8=h23c57ac_13 - scipy=1.10.1=py39hded996c_3 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - discretize=0.7.4=py39hb5e4067_0 + - discretize=0.8.3=py39h6dc771e_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39hcea2a47_0 - - geoana=0.0.6=py_1 - ipython=8.14.0=pyhd1c38e8_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h29261d1_4 @@ -311,6 +308,7 @@ dependencies: - qt-webengine=5.15.8=h66b1b81_1 - scikit-image=0.19.3=py39hecff1ad_2 - scikit-learn=1.2.2=py39hcb35850_2 + - geoana=0.4.0=py39h92daf61_1 - ipykernel=6.23.1=pyh736e0ef_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -327,10 +325,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-osx-64.lock.yml b/environments/conda-py-3.9-osx-64.lock.yml index db3ccf42a..d3fec7727 100644 --- a/environments/conda-py-3.9-osx-64.lock.yml +++ b/environments/conda-py-3.9-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: f9d07d9639b377faaf9d57d6e4fed0ee8730d63e74c9e56344a94e96f435fcc7 +# input_hash: 214340f152d6c9e9a33c5f789c7ce4db261d17f14413f8df9d53ba4fba230301 channels: - conda-forge @@ -32,7 +32,7 @@ dependencies: - libwebp-base=1.3.0=hb7f2c08_0 - libzlib=1.2.13=hfd90126_4 - llvm-openmp=16.0.5=hff08bdf_0 - - ncurses=6.3=h96cf925_1 + - ncurses=6.4=hf0c8a7f_0 - pandoc=2.19.2=h694c41f_2 - pixman=0.40.0=hbcb3906_0 - poppler-data=0.4.12=hd8ed1ab_0 @@ -122,7 +122,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - fontconfig=2.14.2=h5bb23bf_0 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - glib-tools=2.76.3=h7d26f99_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -220,7 +219,7 @@ dependencies: - plotly=5.13.1=pyhd8ed1ab_0 - postgresql=15.3=hb6430be_0 - proj=9.2.0=hf909084_0 - - pyobjc-core=9.1.1=py39h0504f80_0 + - pyobjc-core=9.2=py39head00df_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 - retrying=1.3.3=py_2 - sip=6.7.9=py39h840bb9f_0 @@ -228,7 +227,7 @@ dependencies: - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.65.0=pyhd8ed1ab_1 - typing-extensions=4.6.3=hd8ed1ab_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - werkzeug=2.3.4=pyhd8ed1ab_0 - xerces-c=3.2.4=h90c7484_2 - argon2-cffi-bindings=21.2.0=py39ha30fb19_3 @@ -244,7 +243,7 @@ dependencies: - numpy=1.23.5=py39hdfa1d0c_0 - platformdirs=3.5.1=pyhd8ed1ab_0 - poppler=23.05.0=he041c3a_1 - - pyobjc-framework-cocoa=9.1.1=py39h0504f80_0 + - pyobjc-framework-cocoa=9.2=py39head00df_0 - pyqt5-sip=12.11.0=py39hc100f75_3 - requests=2.31.0=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 @@ -275,15 +274,13 @@ dependencies: - matplotlib-base=3.7.1=py39hb2f573b_0 - nbformat=5.9.0=pyhd8ed1ab_0 - prompt_toolkit=3.0.38=hd8ed1ab_0 - - properties=0.6.1=py_0 - qt-main=5.15.8=h23c57ac_13 - scipy=1.10.1=py39hded996c_3 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - discretize=0.7.4=py39hb5e4067_0 + - discretize=0.8.3=py39h6dc771e_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39hcea2a47_0 - - geoana=0.0.6=py_1 - ipython=8.14.0=pyhd1c38e8_0 - nbclient=0.8.0=pyhd8ed1ab_0 - pydiso=0.0.3=py39h29261d1_4 @@ -292,6 +289,7 @@ dependencies: - qt-webengine=5.15.8=h66b1b81_1 - scikit-image=0.19.3=py39hecff1ad_2 - scikit-learn=1.2.2=py39hcb35850_2 + - geoana=0.4.0=py39h92daf61_1 - ipykernel=6.23.1=pyh736e0ef_0 - nbconvert-core=7.4.0=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -308,10 +306,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-win-64-dev.lock.yml b/environments/conda-py-3.9-win-64-dev.lock.yml index 5bf7d230d..23457a633 100644 --- a/environments/conda-py-3.9-win-64-dev.lock.yml +++ b/environments/conda-py-3.9-win-64-dev.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 874389a50d8eb2d6172f77970955ce41d20e0ed971d2a65e61c98cd1eaf64818 +# input_hash: ee9b47acc1aacf267674a890aa3e79f8d9586fe2831ddb0d8fb9bfb0c8841633 channels: - conda-forge @@ -109,7 +109,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - freetype=2.12.1=h546665d_1 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - idna=3.4=pyhd8ed1ab_0 - iniconfig=2.0.0=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 @@ -250,7 +249,7 @@ dependencies: - pytest=7.3.1=pyhd8ed1ab_0 - stack_data=0.6.2=pyhd8ed1ab_0 - tiledb=2.13.2=h3132609_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=21.3.0=pyhd8ed1ab_0 - dash=2.10.2=pyhd8ed1ab_0 @@ -293,20 +292,19 @@ dependencies: - scipy=1.10.1=py39hde5eda1_3 - shapely=2.0.1=py39h4440df4_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py39hefe7e4c_0 + - discretize=0.8.3=py39hbd792c9_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39h7b53f02_0 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.1=py39haf65ace_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py39h9be9993_4 - pyqtwebengine=5.15.7=py39h2f4a3f1_3 - scikit-learn=1.2.2=py39hfa9d973_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py39h1f6ef14_1 - nbconvert=7.4.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -318,10 +316,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/environments/conda-py-3.9-win-64.lock.yml b/environments/conda-py-3.9-win-64.lock.yml index 94e3a66e4..5eb3b177a 100644 --- a/environments/conda-py-3.9-win-64.lock.yml +++ b/environments/conda-py-3.9-win-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 874389a50d8eb2d6172f77970955ce41d20e0ed971d2a65e61c98cd1eaf64818 +# input_hash: ee9b47acc1aacf267674a890aa3e79f8d9586fe2831ddb0d8fb9bfb0c8841633 channels: - conda-forge @@ -106,7 +106,6 @@ dependencies: - flit-core=3.9.0=pyhd8ed1ab_0 - freetype=2.12.1=h546665d_1 - fsspec=2022.11.0=pyhd8ed1ab_0 - - future=0.18.3=pyhd8ed1ab_0 - idna=3.4=pyhd8ed1ab_0 - ipython_genutils=0.2.0=py_1 - itsdangerous=2.1.2=pyhd8ed1ab_0 @@ -233,7 +232,7 @@ dependencies: - pyqt5-sip=12.11.0=py39h99910a6_3 - stack_data=0.6.2=pyhd8ed1ab_0 - tiledb=2.13.2=h3132609_0 - - urllib3=2.0.2=pyhd8ed1ab_0 + - urllib3=2.0.3=pyhd8ed1ab_0 - wcwidth=0.2.6=pyhd8ed1ab_0 - argon2-cffi=21.3.0=pyhd8ed1ab_0 - dash=2.10.2=pyhd8ed1ab_0 @@ -274,20 +273,19 @@ dependencies: - scipy=1.10.1=py39hde5eda1_3 - shapely=2.0.1=py39h4440df4_1 - vectormath=0.2.2=py_0 - - discretize=0.7.4=py39hefe7e4c_0 + - discretize=0.8.3=py39hbd792c9_0 - empymod=2.2.2=pyhd8ed1ab_0 - fiona=1.9.3=py39h7b53f02_0 - jupyter-dash=0.4.2=pyhd8ed1ab_1 - jupyter_server=1.23.6=pyhd8ed1ab_0 - matplotlib-base=3.7.1=py39haf65ace_0 - nbconvert-pandoc=7.4.0=pyhd8ed1ab_0 - - properties=0.6.1=py_0 - pydiso=0.0.3=py39h9be9993_4 - pyqtwebengine=5.15.7=py39h2f4a3f1_3 - scikit-learn=1.2.2=py39hfa9d973_2 - tifffile=2023.4.12=pyhd8ed1ab_0 - zarr=2.14.2=pyhd8ed1ab_0 - - geoana=0.0.6=py_1 + - geoana=0.4.0=py39h1f6ef14_1 - nbconvert=7.4.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pymatsolver=0.2.0=pyhd8ed1ab_0 @@ -299,10 +297,11 @@ dependencies: - ipyfilechooser=0.6.0=pyhd8ed1ab_0 - pip: - geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip - - simpeg-archive === 0.9.1.dev5 + - properties === 0.6.1 - mira-omf === 3.0.0 - - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip + - mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip - param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip + - simpeg-archive === 0.9.1.dev5 variables: KMP_WARNINGS: 0 diff --git a/geoapps-assets/uijson/joint_single.ui.json b/geoapps-assets/uijson/joint_single.ui.json index 7550c9965..0180bd346 100644 --- a/geoapps-assets/uijson/joint_single.ui.json +++ b/geoapps-assets/uijson/joint_single.ui.json @@ -422,10 +422,10 @@ "group": "Update sensitivity weights directive", "tooltip": "Update sensitivity weight threshold", "label": "Threshold (%)", - "value": 60.0, - "max": 99.9, + "value": 0.001, + "max": 1.0, "min": 0.0, - "precision": 1, + "precision": 5, "lineEdit": false }, "every_iteration_bool": { diff --git a/geoapps/inversion/airborne_electromagnetics/time_domain/constants.py b/geoapps/inversion/airborne_electromagnetics/time_domain/constants.py index f0688ec51..6fbb2022c 100644 --- a/geoapps/inversion/airborne_electromagnetics/time_domain/constants.py +++ b/geoapps/inversion/airborne_electromagnetics/time_domain/constants.py @@ -63,9 +63,9 @@ "max_cg_iterations": 50, "tol_cg": 1e-4, "alpha_s": 0.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -79,7 +79,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 5.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, @@ -140,9 +140,9 @@ "distributed_workers": None, "gradient_type": "total", "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -272,9 +272,9 @@ }, "gradient_type": "total", "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, diff --git a/geoapps/inversion/components/data.py b/geoapps/inversion/components/data.py index 96b8826e4..66b410bd7 100644 --- a/geoapps/inversion/components/data.py +++ b/geoapps/inversion/components/data.py @@ -472,6 +472,7 @@ def simulation( mesh: TreeMesh, active_cells: np.ndarray, survey, + models, tile_id: int | None = None, padding_cells: int = 6, ): @@ -504,7 +505,7 @@ def simulation( else: nested_mesh = create_nested_mesh( - survey.unique_locations, + survey, mesh, method="padding_cells", minimum_level=3, @@ -524,6 +525,18 @@ def simulation( mapping=mapping, tile_id=tile_id, ) + + if "induced polarization" in self.params.inversion_type: + if "2d" in self.params.inversion_type: + proj = maps.InjectActiveCells(mesh, active_cells, valInactive=1e-8) + else: + proj = maps.InjectActiveCells( + nested_mesh, mapping.local_active, valInactive=1e-8 + ) + + # TODO this should be done in the simulation factory + sim.sigma = proj * mapping * models.conductivity + return sim, mapping def simulate(self, model, inverse_problem, sorting, ordering): diff --git a/geoapps/inversion/components/factories/directives_factory.py b/geoapps/inversion/components/factories/directives_factory.py index 0f11eadbf..ce91ca2a0 100644 --- a/geoapps/inversion/components/factories/directives_factory.py +++ b/geoapps/inversion/components/factories/directives_factory.py @@ -189,14 +189,11 @@ def update_sensitivity_weights_directive(self): if self._update_sensitivity_weights_directive is None: self._update_sensitivity_weights_directive = ( directives.UpdateSensitivityWeights( - everyIter=self.params.every_iteration_bool, - threshold=self.params.sens_wts_threshold, + every_iteration=self.params.every_iteration_bool, + threshold_value=self.params.sens_wts_threshold / 100.0, ) ) - if self.params.inversion_type in ["tdem"]: - self.update_sensitivity_weights_directive.method = "percent_amplitude" - return self._update_sensitivity_weights_directive @property diff --git a/geoapps/inversion/components/factories/misfit_factory.py b/geoapps/inversion/components/factories/misfit_factory.py index 29e26e48f..e81e3c163 100644 --- a/geoapps/inversion/components/factories/misfit_factory.py +++ b/geoapps/inversion/components/factories/misfit_factory.py @@ -83,28 +83,25 @@ def assemble_arguments( # pylint: disable=arguments-differ else: self.sorting.append(local_index) - lsim, lmap = inversion_data.simulation( - mesh, active_cells, survey, tile_num + local_sim, local_map = inversion_data.simulation( + mesh, active_cells, survey, self.models, tile_id=tile_num ) - # TODO Parse workers to simulations - lsim.workers = self.params.distributed_workers - if "induced polarization" in self.params.inversion_type: - # TODO this should be done in the simulation factory - lsim.sigma = lsim.sigmaMap * lmap * self.models.conductivity + local_sim.workers = self.params.distributed_workers + local_data = data.Data(survey) if self.params.forward_only: - lmisfit = data_misfit.L2DataMisfit(simulation=lsim, model_map=lmap) - else: - ldat = ( - data.Data( - survey, dobs=survey.dobs, standard_deviation=survey.std - ), + lmisfit = data_misfit.L2DataMisfit( + local_data, local_sim, model_map=local_map ) + + else: + local_data.dobs = survey.dobs + local_data.standard_deviation = survey.std lmisfit = data_misfit.L2DataMisfit( - data=ldat[0], - simulation=lsim, - model_map=lmap, + data=local_data, + simulation=local_sim, + model_map=local_map, ) lmisfit.W = 1 / survey.std diff --git a/geoapps/inversion/components/factories/receiver_factory.py b/geoapps/inversion/components/factories/receiver_factory.py index 67e4c5314..c059ac7f5 100644 --- a/geoapps/inversion/components/factories/receiver_factory.py +++ b/geoapps/inversion/components/factories/receiver_factory.py @@ -62,7 +62,7 @@ def concrete_object(self): elif self.factory_type == "magnetotellurics": from SimPEG.electromagnetics.natural_source import receivers - return receivers.Point3DImpedance + return receivers.PointNaturalSource elif self.factory_type == "tipper": from SimPEG.electromagnetics.natural_source import receivers diff --git a/geoapps/inversion/components/factories/simulation_factory.py b/geoapps/inversion/components/factories/simulation_factory.py index c7e348e50..73b4db7b0 100644 --- a/geoapps/inversion/components/factories/simulation_factory.py +++ b/geoapps/inversion/components/factories/simulation_factory.py @@ -77,11 +77,11 @@ def concrete_object(self): return simulation.Simulation3DNodal if self.factory_type == "induced polarization 2d": - from SimPEG.electromagnetics.static.induced_polarization import ( - simulation_2d, + from SimPEG.electromagnetics.static.induced_polarization.simulation import ( + Simulation2DNodal, ) - return simulation_2d.Simulation2DNodal + return Simulation2DNodal if self.factory_type in ["magnetotellurics", "tipper"]: from SimPEG.electromagnetics.natural_source import simulation @@ -125,9 +125,7 @@ def assemble_keyword_arguments( kwargs["max_chunk_size"] = self.params.max_chunk_size # kwargs["n_cpu"] = self.params.n_cpu kwargs["store_sensitivities"] = ( - "forward_only" - if self.params.forward_only - else self.params.store_sensitivities + None if self.params.forward_only else self.params.store_sensitivities ) if self.factory_type == "magnetic vector": return self._magnetic_vector_keywords(kwargs, active_cells=active_cells) @@ -153,7 +151,7 @@ def assemble_keyword_arguments( ) def _magnetic_vector_keywords(self, kwargs, active_cells=None): - kwargs["actInd"] = active_cells + kwargs["ind_active"] = active_cells kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum()) * 3) kwargs["model_type"] = "vector" kwargs["chunk_format"] = "row" @@ -161,14 +159,14 @@ def _magnetic_vector_keywords(self, kwargs, active_cells=None): return kwargs def _magnetic_scalar_keywords(self, kwargs, active_cells=None): - kwargs["actInd"] = active_cells + kwargs["ind_active"] = active_cells kwargs["chiMap"] = maps.IdentityMap(nP=int(active_cells.sum())) kwargs["chunk_format"] = "row" return kwargs def _gravity_keywords(self, kwargs, active_cells=None): - kwargs["actInd"] = active_cells + kwargs["ind_active"] = active_cells kwargs["rhoMap"] = maps.IdentityMap(nP=int(active_cells.sum())) kwargs["chunk_format"] = "row" @@ -186,12 +184,9 @@ def _induced_polarization_keywords( mesh, active_cells=None, ): - actmap = maps.InjectActiveCells(mesh, active_cells, valInactive=1e-8) etamap = maps.InjectActiveCells(mesh, indActive=active_cells, valInactive=0) kwargs["etaMap"] = etamap - kwargs["sigmaMap"] = actmap kwargs["solver"] = self.solver - kwargs["max_ram"] = 1 return kwargs diff --git a/geoapps/inversion/components/factories/source_factory.py b/geoapps/inversion/components/factories/source_factory.py index 37d589d24..000356d83 100644 --- a/geoapps/inversion/components/factories/source_factory.py +++ b/geoapps/inversion/components/factories/source_factory.py @@ -34,7 +34,7 @@ def concrete_object(self): if self.factory_type in ["magnetic vector", "magnetic scalar"]: from SimPEG.potential_fields.magnetics import sources - return sources.SourceField + return sources.UniformBackgroundField elif self.factory_type == "gravity": from SimPEG.potential_fields.gravity import sources @@ -59,7 +59,7 @@ def concrete_object(self): elif self.factory_type in ["magnetotellurics", "tipper"]: from SimPEG.electromagnetics.natural_source import sources - return sources.Planewave_xy_1Dprimary + return sources.PlanewaveXYPrimary def assemble_arguments( self, diff --git a/geoapps/inversion/components/factories/survey_factory.py b/geoapps/inversion/components/factories/survey_factory.py index fefdbf6ef..91e9d9572 100644 --- a/geoapps/inversion/components/factories/survey_factory.py +++ b/geoapps/inversion/components/factories/survey_factory.py @@ -382,7 +382,9 @@ def _tdem_arguments(self, data=None, local_index=None, mesh=None): ) import SimPEG.electromagnetics.time_domain as tdem - waveform = tdem.sources.RawWaveform(waveFct=wave_function, offTime=0.0) + waveform = tdem.sources.RawWaveform( + waveform_function=wave_function, offTime=0.0 + ) self.ordering = [] rx_factory = ReceiversFactory(self.params) diff --git a/geoapps/inversion/components/models.py b/geoapps/inversion/components/models.py index 8a03b3331..209a80716 100644 --- a/geoapps/inversion/components/models.py +++ b/geoapps/inversion/components/models.py @@ -298,8 +298,8 @@ def _initialize(self): inclination[np.isnan(inclination)] = 0 declination[np.isnan(declination)] = 0 field_vecs = dip_azimuth2cartesian( - dip=inclination, - azm_N=declination, + inclination, + declination, ) if model is not None: diff --git a/geoapps/inversion/constants.py b/geoapps/inversion/constants.py index 9574fa1c6..8fb4a9da1 100644 --- a/geoapps/inversion/constants.py +++ b/geoapps/inversion/constants.py @@ -205,11 +205,10 @@ "group": "Update sensitivity weights directive", "tooltip": "Update sensitivity weight threshold", "label": "Threshold (%)", - "value": 30.0, - "max": 99.9, + "value": 0.001, + "max": 1.0, "min": 0.0, - "precision": 1, - "lineEdit": False, + "precision": 5, "verbose": 2, }, "every_iteration_bool": { @@ -337,6 +336,7 @@ "initial_beta": { "min": 0.0, "group": "Optimization", + "optional": True, "enabled": False, "dependency": "initial_beta_ratio", "dependencyType": "disabled", @@ -360,7 +360,7 @@ "tooltip": "Constant ratio compared to other weights. Larger values result in models that remain close to the reference model", "enabled": True, }, - "alpha_x": { + "length_scale_x": { "min": 0.0, "group": "Regularization", "label": "X-smoothness weight", @@ -368,7 +368,7 @@ "value": 1.0, "enabled": True, }, - "alpha_y": { + "length_scale_y": { "min": 0.0, "group": "Regularization", "label": "Y-smoothness weight", @@ -376,7 +376,7 @@ "value": 1.0, "enabled": True, }, - "alpha_z": { + "length_scale_z": { "min": 0.0, "group": "Regularization", "label": "Z-smoothness weight", @@ -529,9 +529,9 @@ "types": [str, UUID, Surface, Points, Grid2D, Curve], }, "alpha_s": {"types": [int, float]}, - "alpha_x": {"types": [int, float]}, - "alpha_y": {"types": [int, float]}, - "alpha_z": {"types": [int, float]}, + "length_scale_x": {"types": [int, float]}, + "length_scale_y": {"types": [int, float]}, + "length_scale_z": {"types": [int, float]}, "norm_s": {"types": [int, float]}, "norm_x": {"types": [int, float]}, "norm_y": {"types": [int, float]}, diff --git a/geoapps/inversion/driver.py b/geoapps/inversion/driver.py index 260fee83f..f971ef274 100644 --- a/geoapps/inversion/driver.py +++ b/geoapps/inversion/driver.py @@ -112,9 +112,11 @@ def inverse_problem(self): self.data_misfit, self.regularization, self.optimization, - beta=self.params.initial_beta, ) + if self.params.initial_beta: + self._inverse_problem.beta = self.params.initial_beta + return self._inverse_problem @property @@ -294,60 +296,70 @@ def get_regularization(self): reg_p = regularization.Sparse( self.inversion_mesh.mesh, - indActive=self.models.active_cells, + active_cells=self.models.active_cells, mapping=wires.p, # pylint: disable=no-member - gradientType=self.params.gradient_type, + gradient_type=self.params.gradient_type, alpha_s=self.params.alpha_s, - alpha_x=self.params.alpha_x, - alpha_y=self.params.alpha_y, - alpha_z=self.params.alpha_z, + length_scale_x=self.params.length_scale_x, + length_scale_y=self.params.length_scale_y, + length_scale_z=self.params.length_scale_z, norms=self.params.model_norms(), - mref=self.models.reference, + reference_model=self.models.reference, ) reg_s = regularization.Sparse( self.inversion_mesh.mesh, - indActive=self.models.active_cells, + active_cells=self.models.active_cells, mapping=wires.s, # pylint: disable=no-member - gradientType=self.params.gradient_type, + gradient_type=self.params.gradient_type, alpha_s=self.params.alpha_s, - alpha_x=self.params.alpha_x, - alpha_y=self.params.alpha_y, - alpha_z=self.params.alpha_z, + length_scale_x=self.params.length_scale_x, + length_scale_y=self.params.length_scale_y, + length_scale_z=self.params.length_scale_z, norms=self.params.model_norms(), - mref=self.models.reference, + reference_model=self.models.reference, ) reg_t = regularization.Sparse( self.inversion_mesh.mesh, - indActive=self.models.active_cells, + active_cells=self.models.active_cells, mapping=wires.t, # pylint: disable=no-member - gradientType=self.params.gradient_type, + gradient_type=self.params.gradient_type, alpha_s=self.params.alpha_s, - alpha_x=self.params.alpha_x, - alpha_y=self.params.alpha_y, - alpha_z=self.params.alpha_z, + length_scale_x=self.params.length_scale_x, + length_scale_y=self.params.length_scale_y, + length_scale_z=self.params.length_scale_z, norms=self.params.model_norms(), - mref=self.models.reference, + reference_model=self.models.reference, ) # Assemble the 3-component regularizations reg = reg_p + reg_s + reg_t - reg.mref = self.models.reference + reg.reference_model = self.models.reference else: reg = regularization.Sparse( self.inversion_mesh.mesh, - indActive=self.models.active_cells, + active_cells=self.models.active_cells, mapping=maps.IdentityMap(nP=n_cells), - gradientType=self.params.gradient_type, + gradient_type=self.params.gradient_type, alpha_s=self.params.alpha_s, - alpha_x=self.params.alpha_x, - alpha_y=self.params.alpha_y, - alpha_z=self.params.alpha_z, - norms=self.params.model_norms(), - mref=self.models.reference, + reference_model=self.models.reference, ) + norms = [self.params.s_norm] + for comp in ["x", "y", "z"]: + if getattr(self.params, f"length_scale_{comp}") is not None: + setattr( + reg, + f"length_scale_{comp}", + getattr(self.params, f"length_scale_{comp}"), + ) + + if getattr(self.params, f"{comp}_norm") is not None: + norms.append(getattr(self.params, f"{comp}_norm")) + + reg.norms = norms + return reg def get_tiles(self): diff --git a/geoapps/inversion/electricals/application.py b/geoapps/inversion/electricals/application.py index 1f1203a26..55de4b82f 100644 --- a/geoapps/inversion/electricals/application.py +++ b/geoapps/inversion/electricals/application.py @@ -166,7 +166,7 @@ def __init__(self, ui_json=None, **kwargs): self._coolingFactor = FloatText(value=2, description="Beta cooling factor") self._max_cg_iterations = IntText(value=30, description="Max CG Iterations") self._sens_wts_threshold = FloatText( - value=80, description="Threshold sensitivity weights", max=100, min=0 + value=0.001, description="Threshold sensitivity weights", max=100, min=0 ) self._tol_cg = FloatText(value=1e-3, description="CG Tolerance") self._n_cpu = IntText( @@ -231,17 +231,17 @@ def __init__(self, ui_json=None, **kwargs): value=1, description="Reference Model (s)", ) - self._alpha_x = widgets.FloatText( + self._length_scale_x = widgets.FloatText( min=0, value=1, description="EW-gradient (x)", ) - self._alpha_y = widgets.FloatText( + self._length_scale_y = widgets.FloatText( min=0, value=1, description="NS-gradient (y)", ) - self._alpha_z = widgets.FloatText( + self._length_scale_z = widgets.FloatText( min=0, value=1, description="Vertical-gradient (z)", @@ -279,9 +279,9 @@ def __init__(self, ui_json=None, **kwargs): [ Label("Scaling (alphas)"), self._alpha_s, - self._alpha_x, - self._alpha_y, - self._alpha_z, + self._length_scale_x, + self._length_scale_y, + self._length_scale_z, ] ) self.bound_panel = HBox( @@ -350,16 +350,16 @@ def alpha_s(self): return self._alpha_s @property - def alpha_x(self): - return self._alpha_x + def length_scale_x(self): + return self._length_scale_x @property - def alpha_y(self): - return self._alpha_y + def length_scale_y(self): + return self._length_scale_y @property - def alpha_z(self): - return self._alpha_z + def length_scale_z(self): + return self._length_scale_z # @property # def initial_beta(self): diff --git a/geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/constants.py b/geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/constants.py index 6f22eb416..43bdf8485 100644 --- a/geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/constants.py +++ b/geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/constants.py @@ -66,9 +66,8 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -82,7 +81,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 30.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/electricals/direct_current/three_dimensions/constants.py b/geoapps/inversion/electricals/direct_current/three_dimensions/constants.py index 22f53d5a5..fdc3b1059 100644 --- a/geoapps/inversion/electricals/direct_current/three_dimensions/constants.py +++ b/geoapps/inversion/electricals/direct_current/three_dimensions/constants.py @@ -59,9 +59,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -75,7 +75,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 80.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, @@ -319,7 +319,7 @@ "upper_bound": 100.0, "lower_bound": 1e-5, "max_global_iterations": 25, - "sens_wts_threshold": 80.0, + "sens_wts_threshold": 0.001, "topography_object": UUID("{ab3c2083-6ea8-4d31-9230-7aad3ec09525}"), "topography": UUID("{a603a762-f6cb-4b21-afda-3160e725bf7d}"), "z_from_topo": True, diff --git a/geoapps/inversion/electricals/direct_current/two_dimensions/constants.py b/geoapps/inversion/electricals/direct_current/two_dimensions/constants.py index 699abbe8f..c5c2239a4 100644 --- a/geoapps/inversion/electricals/direct_current/two_dimensions/constants.py +++ b/geoapps/inversion/electricals/direct_current/two_dimensions/constants.py @@ -29,7 +29,6 @@ "z_from_topo": True, "line_object": None, "line_id": 1, - "resolution": None, "receivers_radar_drape": None, "receivers_offset_z": None, "gps_receivers_offset": None, @@ -48,8 +47,6 @@ "upper_bound": None, "output_tile_files": False, "ignore_values": None, - "detrend_order": None, - "detrend_type": None, "window_center_x": None, "window_center_y": None, "window_width": None, @@ -66,12 +63,10 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, - "y_norm": 2.0, "z_norm": 2.0, "gradient_type": "total", "max_irls_iterations": 25, @@ -82,7 +77,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 30.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, @@ -113,7 +108,6 @@ "z_from_topo": True, "line_object": None, "line_id": 1, - "resolution": None, "receivers_radar_drape": None, "receivers_offset_z": None, "gps_receivers_offset": None, @@ -144,6 +138,7 @@ "run_command": "geoapps.inversion.driver", "conda_environment": "geoapps", "distributed_workers": None, + "gradient_type": "total", } inversion_ui_json = { @@ -192,15 +187,6 @@ "label": "Line number", "value": 1, }, - "gradient_type": "total", - "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, - "s_norm": 0.0, - "x_norm": 2.0, - "y_norm": 2.0, - "z_norm": 2.0, } default_ui_json = { @@ -422,16 +408,12 @@ "value": 0.0, "visible": False, }, - "resolution": None, - "detrend_order": None, - "detrend_type": None, "tile_spatial": 1, "out_group": {"label": "Results group name", "value": "DirectCurrentInversion"}, } default_ui_json = dict(base_default_ui_json, **default_ui_json) - ################ Validations ################# validations = { @@ -454,7 +436,6 @@ "mesh": UUID("{537cdf17-28c9-4baa-a1ac-07c37662583d}"), "starting_model": 1e-1, "reference_model": 1e-1, - "resolution": None, "window_center_x": None, "window_center_y": None, "window_width": None, @@ -462,7 +443,6 @@ "window_azimuth": None, "s_norm": 0.0, "x_norm": 2.0, - "y_norm": 2.0, "z_norm": 2.0, "upper_bound": 100.0, "lower_bound": 1e-5, diff --git a/geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/constants.py b/geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/constants.py index b4b051dd9..b2ea1e019 100644 --- a/geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/constants.py +++ b/geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/constants.py @@ -67,9 +67,8 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -83,7 +82,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 30.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/electricals/induced_polarization/three_dimensions/constants.py b/geoapps/inversion/electricals/induced_polarization/three_dimensions/constants.py index d0911e8b2..227da5134 100644 --- a/geoapps/inversion/electricals/induced_polarization/three_dimensions/constants.py +++ b/geoapps/inversion/electricals/induced_polarization/three_dimensions/constants.py @@ -59,9 +59,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -75,7 +75,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 1e-3, + "sens_wts_threshold": 0.001, "every_iteration_bool": False, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/electricals/induced_polarization/two_dimensions/constants.py b/geoapps/inversion/electricals/induced_polarization/two_dimensions/constants.py index 9b27c2d78..045692af0 100644 --- a/geoapps/inversion/electricals/induced_polarization/two_dimensions/constants.py +++ b/geoapps/inversion/electricals/induced_polarization/two_dimensions/constants.py @@ -29,7 +29,6 @@ "z_from_topo": True, "line_object": None, "line_id": 1, - "resolution": None, "receivers_radar_drape": None, "receivers_offset_z": None, "gps_receivers_offset": None, @@ -49,8 +48,6 @@ "upper_bound": None, "output_tile_files": False, "ignore_values": None, - "detrend_order": None, - "detrend_type": None, "window_center_x": None, "window_center_y": None, "window_width": None, @@ -67,12 +64,10 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, - "y_norm": 2.0, "z_norm": 2.0, "gradient_type": "total", "max_irls_iterations": 25, @@ -83,8 +78,8 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 30.0, - "every_iteration_bool": True, + "sens_wts_threshold": 0.001, + "every_iteration_bool": False, "parallelized": True, "n_cpu": None, "tile_spatial": 1, @@ -111,7 +106,6 @@ "topography_object": None, "topography": None, "data_object": None, - "resolution": None, "z_from_topo": True, "line_object": None, "line_id": 1, @@ -425,9 +419,6 @@ "value": 0.0, "visible": False, }, - "resolution": None, - "detrend_order": None, - "detrend_type": None, "tile_spatial": 1, "out_group": { "label": "Results group name", @@ -457,7 +448,6 @@ default_ui_json = dict(base_default_ui_json, **default_ui_json) - ################ Validations ################# validations = { @@ -480,7 +470,6 @@ "mesh": UUID("{537cdf17-28c9-4baa-a1ac-07c37662583d}"), "starting_model": 1e-4, "conductivity_model": 0.1, - "resolution": None, "window_center_x": None, "window_center_y": None, "window_width": None, @@ -488,7 +477,6 @@ "window_azimuth": None, "s_norm": 0.0, "x_norm": 2.0, - "y_norm": 2.0, "z_norm": 2.0, "upper_bound": 100.0, "lower_bound": 1e-5, diff --git a/geoapps/inversion/electricals/params.py b/geoapps/inversion/electricals/params.py index 47d424cca..6261e8770 100644 --- a/geoapps/inversion/electricals/params.py +++ b/geoapps/inversion/electricals/params.py @@ -143,3 +143,11 @@ def mesh(self): @mesh.setter def mesh(self, val): self.setter_validator("mesh", val, fun=self._uuid_promoter) + + @property + def length_scale_y(self): + return None + + @property + def y_norm(self): + return None diff --git a/geoapps/inversion/joint/joint_surveys/constants.py b/geoapps/inversion/joint/joint_surveys/constants.py index 5e97fee17..f9d08ac9a 100644 --- a/geoapps/inversion/joint/joint_surveys/constants.py +++ b/geoapps/inversion/joint/joint_surveys/constants.py @@ -39,9 +39,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -55,8 +55,8 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 1.0, - "every_iteration_bool": False, + "sens_wts_threshold": 0.001, + "every_iteration_bool": True, "parallelized": True, "n_cpu": None, "store_sensitivities": "ram", diff --git a/geoapps/inversion/joint/joint_surveys/driver.py b/geoapps/inversion/joint/joint_surveys/driver.py index abe6cdbba..9eb67ac80 100644 --- a/geoapps/inversion/joint/joint_surveys/driver.py +++ b/geoapps/inversion/joint/joint_surveys/driver.py @@ -4,6 +4,9 @@ # # geoapps is distributed under the terms and conditions of the MIT License # (see LICENSE file at the root of this source code package). + +# pylint: disable=unexpected-keyword-arg, no-value-for-parameter + from __future__ import annotations import sys @@ -12,7 +15,7 @@ import numpy as np from geoh5py.shared.utils import fetch_active_workspace from geoh5py.ui_json import InputFile -from SimPEG import inverse_problem, maps +from SimPEG import maps from SimPEG.objective_function import ComboObjectiveFunction from geoapps.driver_base.utils import treemesh_2_octree @@ -157,18 +160,6 @@ def inversion_mesh(self): ) return self._inversion_mesh - @property - def inverse_problem(self): - if getattr(self, "_inverse_problem", None) is None: - self._inverse_problem = inverse_problem.BaseInvProblem( - self.data_misfit, - self.regularization, - self.optimization, - beta=self.params.initial_beta, - ) - - return self._inverse_problem - def validate_create_mesh(self): """Function to validate and create the inversion mesh.""" diff --git a/geoapps/inversion/natural_sources/magnetotellurics/constants.py b/geoapps/inversion/natural_sources/magnetotellurics/constants.py index 99f5ff23e..7b4a19da1 100644 --- a/geoapps/inversion/natural_sources/magnetotellurics/constants.py +++ b/geoapps/inversion/natural_sources/magnetotellurics/constants.py @@ -75,9 +75,9 @@ "max_cg_iterations": 50, "tol_cg": 1e-4, "alpha_s": 0.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -91,7 +91,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 60.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/natural_sources/tipper/constants.py b/geoapps/inversion/natural_sources/tipper/constants.py index 041aa2b31..b7be6c1de 100644 --- a/geoapps/inversion/natural_sources/tipper/constants.py +++ b/geoapps/inversion/natural_sources/tipper/constants.py @@ -65,9 +65,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 0.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -81,7 +81,7 @@ "coolEpsFact": 1.2, "beta_search": False, "gradient_type": "total", - "sens_wts_threshold": 60.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": True, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/params.py b/geoapps/inversion/params.py index d4f5f363b..1a0358e69 100644 --- a/geoapps/inversion/params.py +++ b/geoapps/inversion/params.py @@ -85,9 +85,9 @@ def __init__( self._initial_beta_ratio: float = None self._tol_cg: float = None self._alpha_s: float = None - self._alpha_x: float = None - self._alpha_y: float = None - self._alpha_z: float = None + self._length_scale_x: float = None + self._length_scale_y: float = None + self._length_scale_z: float = None self._s_norm: float = None self._x_norm: float = None self._y_norm: float = None @@ -603,28 +603,28 @@ def alpha_s(self, val): self.setter_validator("alpha_s", val) @property - def alpha_x(self): - return self._alpha_x + def length_scale_x(self): + return self._length_scale_x - @alpha_x.setter - def alpha_x(self, val): - self.setter_validator("alpha_x", val) + @length_scale_x.setter + def length_scale_x(self, val): + self.setter_validator("length_scale_x", val) @property - def alpha_y(self): - return self._alpha_y + def length_scale_y(self): + return self._length_scale_y - @alpha_y.setter - def alpha_y(self, val): - self.setter_validator("alpha_y", val) + @length_scale_y.setter + def length_scale_y(self, val): + self.setter_validator("length_scale_y", val) @property - def alpha_z(self): - return self._alpha_z + def length_scale_z(self): + return self._length_scale_z - @alpha_z.setter - def alpha_z(self, val): - self.setter_validator("alpha_z", val) + @length_scale_z.setter + def length_scale_z(self, val): + self.setter_validator("length_scale_z", val) @property def s_norm(self): diff --git a/geoapps/inversion/potential_fields/application.py b/geoapps/inversion/potential_fields/application.py index 78639b3e7..15e2bf2b4 100644 --- a/geoapps/inversion/potential_fields/application.py +++ b/geoapps/inversion/potential_fields/application.py @@ -274,17 +274,17 @@ def __init__(self, ui_json: str | Path | None = None, **kwargs): value=1, description="Reference Model (s)", ) - self._alpha_x = widgets.FloatText( + self._length_scale_x = widgets.FloatText( min=0, value=1, description="EW-gradient (x)", ) - self._alpha_y = widgets.FloatText( + self._length_scale_y = widgets.FloatText( min=0, value=1, description="NS-gradient (y)", ) - self._alpha_z = widgets.FloatText( + self._length_scale_z = widgets.FloatText( min=0, value=1, description="Vertical-gradient (z)", @@ -322,9 +322,9 @@ def __init__(self, ui_json: str | Path | None = None, **kwargs): [ Label("Scaling (alphas)"), self._alpha_s, - self._alpha_x, - self._alpha_y, - self._alpha_z, + self._length_scale_x, + self._length_scale_y, + self._length_scale_z, ] ) self.bound_panel = HBox( @@ -388,16 +388,16 @@ def alpha_s(self): return self._alpha_s @property - def alpha_x(self): - return self._alpha_x + def length_scale_x(self): + return self._length_scale_x @property - def alpha_y(self): - return self._alpha_y + def length_scale_y(self): + return self._length_scale_y @property - def alpha_z(self): - return self._alpha_z + def length_scale_z(self): + return self._length_scale_z @property def initial_beta(self): diff --git a/geoapps/inversion/potential_fields/gravity/constants.py b/geoapps/inversion/potential_fields/gravity/constants.py index 7cda2d11b..3463f319a 100644 --- a/geoapps/inversion/potential_fields/gravity/constants.py +++ b/geoapps/inversion/potential_fields/gravity/constants.py @@ -79,9 +79,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -95,7 +95,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 1.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": False, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/potential_fields/magnetic_scalar/constants.py b/geoapps/inversion/potential_fields/magnetic_scalar/constants.py index d8d8478cf..e79aa141a 100644 --- a/geoapps/inversion/potential_fields/magnetic_scalar/constants.py +++ b/geoapps/inversion/potential_fields/magnetic_scalar/constants.py @@ -82,9 +82,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -98,7 +98,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 1.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": False, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/potential_fields/magnetic_vector/constants.py b/geoapps/inversion/potential_fields/magnetic_vector/constants.py index 0a8e381a7..d2ffbcdca 100644 --- a/geoapps/inversion/potential_fields/magnetic_vector/constants.py +++ b/geoapps/inversion/potential_fields/magnetic_vector/constants.py @@ -86,9 +86,9 @@ "max_cg_iterations": 30, "tol_cg": 1e-4, "alpha_s": 1.0, - "alpha_x": 1.0, - "alpha_y": 1.0, - "alpha_z": 1.0, + "length_scale_x": 1.0, + "length_scale_y": 1.0, + "length_scale_z": 1.0, "s_norm": 0.0, "x_norm": 2.0, "y_norm": 2.0, @@ -102,7 +102,7 @@ "coolEps_q": True, "coolEpsFact": 1.2, "beta_search": False, - "sens_wts_threshold": 1.0, + "sens_wts_threshold": 0.001, "every_iteration_bool": False, "parallelized": True, "n_cpu": None, diff --git a/geoapps/inversion/utils.py b/geoapps/inversion/utils.py index e97357203..8d831f639 100644 --- a/geoapps/inversion/utils.py +++ b/geoapps/inversion/utils.py @@ -12,6 +12,7 @@ import numpy as np from discretize import TreeMesh from scipy.spatial import ConvexHull, Delaunay, cKDTree, qhull +from SimPEG.survey import BaseSurvey from SimPEG.utils import mkvc @@ -105,7 +106,7 @@ def calculate_2D_trend( def create_nested_mesh( - locations: np.ndarray, + survey: BaseSurvey, base_mesh: TreeMesh, method: str = "padding_cells", padding_cells: int = 8, @@ -128,6 +129,7 @@ def create_nested_mesh( minimum_level: Minimum octree level to preserve everywhere outside the local survey area. finalize: Return a finalized local treemesh. """ + locations = get_unique_locations(survey) nested_mesh = TreeMesh( [base_mesh.h[0], base_mesh.h[1], base_mesh.h[2]], x0=base_mesh.x0 ) @@ -348,3 +350,21 @@ def tile_locations( if len(out) == 1: return out[0] return tuple(out) + + +def get_unique_locations(survey: BaseSurvey) -> np.ndarray: + if survey.source_list: + locations = [] + for source in survey.source_list: + source_location = source.location + if source_location is not None: + if not isinstance(source_location, list): + locations += [[source_location]] + else: + locations += [source_location] + locations += [receiver.locations for receiver in source.receiver_list] + locations = np.vstack([np.vstack(np.atleast_2d(*locs)) for locs in locations]) + else: + locations = survey.receiver_locations + + return np.unique(locations, axis=0) diff --git a/geoapps/utils/surveys.py b/geoapps/utils/surveys.py index 6e0da0200..82cca392f 100644 --- a/geoapps/utils/surveys.py +++ b/geoapps/utils/surveys.py @@ -20,6 +20,7 @@ from geoh5py.workspace import Workspace from scipy.spatial import cKDTree +from geoapps.inversion.utils import get_unique_locations from geoapps.utils.statistics import is_outlier @@ -38,7 +39,7 @@ def get_containing_cells( ) elif isinstance(mesh, TensorMesh): - locations = data.drape_locations(data.survey.unique_locations) + locations = data.drape_locations(get_unique_locations(data.survey)) xi = np.searchsorted(mesh.nodes_x, locations[:, 0]) - 1 yi = np.searchsorted(mesh.nodes_y, locations[:, -1]) - 1 inds = xi + yi * mesh.shape_cells[0] diff --git a/pyproject.toml b/pyproject.toml index c58416b21..a13f4d19e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ param-sweeps = {url = "https://github.com/MiraGeoscience/param-sweeps/archive/re ## dependencies for core algorithms dask = {version = "2022.10.0", extras = ["distributed"], optional = true} -discretize = {version = "~0.7.4", optional = true } # also in simpeg +discretize = {version = "~0.8.3", optional = true } # also in simpeg distributed = {version = "2022.10.0", optional = true} fsspec = {version = "2022.*", optional = true } # also in simpeg matplotlib = {version = "~3.7.1", optional = true } # also in simpeg and geoana @@ -63,20 +63,18 @@ libhwloc = {version = "2.9.0"} simpeg_archive = {version = "~0.9.1.dev5", source = "pypi", optional = true} #mira-simpeg = {version = "~0.15.1.dev9", source = "pypi", optional = true} -mira-simpeg = {url = "https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip#sha256=", optional = true} +mira-simpeg = {url = "https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip#sha256=", optional = true} ## indirect dependencies, forcing them here for installation through Conda not pip empymod = {version = "~2.2.1", optional = true} # from simpeg and geoana -geoana = {version = "~0.0.6", optional = true} # from simpeg +geoana = {version = "~0.4.0", optional = true} # from simpeg h5py = "~3.8.0" # from geoh5py mkl = {version = "2022.*", optional = true} # from simpeg Pillow = "~9.4.0" # from geoh5py -properties = "~0.6.1" # from omf, simpeg and geoana pydiso = {version = "~0.0.3", optional = true} # from simpeg pymatsolver = {version = "~0.2.0", optional = true} # from simpeg pypng = "*" # from omf six = "~1.16.0" # from omf -utm = "~0.7.0" vectormath = "~0.2.2" # from omf zarr = {version = "~2.14.2", optional = true} # from simpgeg using Dask diff --git a/tests/params_test.py b/tests/params_test.py index c3a486b2c..7b19a6c17 100644 --- a/tests/params_test.py +++ b/tests/params_test.py @@ -646,22 +646,22 @@ def test_validate_alpha_s(): catch_invalid_generator(param, "test", "type") -def test_validate_alpha_x(): - param = "alpha_x" +def test_validate_length_scale_x(): + param = "length_scale_x" newval = 0.1 param_test_generator(param, newval) catch_invalid_generator(param, "test", "type") -def test_validate_alpha_y(): - param = "alpha_y" +def test_validate_length_scale_y(): + param = "length_scale_y" newval = 0.1 param_test_generator(param, newval) catch_invalid_generator(param, "test", "type") -def test_validate_alpha_z(): - param = "alpha_z" +def test_validate_length_scale_z(): + param = "length_scale_z" newval = 0.1 param_test_generator(param, newval) catch_invalid_generator(param, "test", "type") diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index 3505e6fcb..d9bad9367 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -26,8 +26,8 @@ target_run = { "data_norm": 3.6444e-11, - "phi_d": 0.007553, - "phi_m": 0.2285, + "phi_d": 0.001958, + "phi_m": 0.003213, } np.random.seed(0) @@ -146,7 +146,6 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): initial_beta_ratio=1e2, coolingRate=4, max_cg_iterations=200, - sens_wts_threshold=1.0, prctile=5, store_sensitivities="ram", **data_kwargs, @@ -171,10 +170,12 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): if __name__ == "__main__": # Full run - mstart = test_airborne_tem_fwr_run("./", n_grid_points=5, refinement=(0, 0, 4)) + mstart = test_airborne_tem_fwr_run( + Path("./"), n_grid_points=5, refinement=(0, 0, 4) + ) m_rec = test_airborne_tem_run( - "./", + Path("./"), max_iterations=15, pytest=False, ) diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 5e7922e1b..36206b3e1 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -136,14 +136,14 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): if __name__ == "__main__": # Full run m_start = test_dc_2d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=3, refinement=(4, 8), ) m_rec = test_dc_2d_run( - "./", + Path("./"), max_iterations=20, pytest=False, ) diff --git a/tests/run_tests/driver_dc_p3d_test.py b/tests/run_tests/driver_dc_p3d_test.py index aaf8dfd96..1756ee80c 100644 --- a/tests/run_tests/driver_dc_p3d_test.py +++ b/tests/run_tests/driver_dc_p3d_test.py @@ -167,14 +167,14 @@ def test_dc_p3d_run( if __name__ == "__main__": # Full run m_start = test_dc_p3d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=3, refinement=(4, 8), ) m_rec = test_dc_p3d_run( - "./", + Path("./"), max_iterations=20, pytest=False, ) diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index f172c8bce..28fe0f507 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -26,8 +26,8 @@ target_run = { "data_norm": 0.14308, - "phi_d": 36.06, - "phi_m": 241.1, + "phi_d": 134.2, + "phi_m": 85.05, } np.random.seed(0) @@ -163,14 +163,14 @@ def test_dc_single_line_fwr_run( # Full run m_start = test_dc_3d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=5, refinement=(4, 8), ) m_rec = test_dc_3d_run( - "./", + Path("./"), n_lines=5, max_iterations=15, pytest=False, diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index f07d32b08..ac1799997 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -22,8 +22,8 @@ target_run = { "data_norm": 0.0071214, - "phi_d": 0.0002049, - "phi_m": 0.00936, + "phi_d": 0.0002005, + "phi_m": 0.009362, } @@ -99,6 +99,7 @@ def test_gravity_run( gz_channel=gz.uid, gz_uncertainty=2e-3, lower_bound=0.0, + upper_bound=1.0, max_global_iterations=max_iterations, initial_beta_ratio=1e-2, prctile=100, @@ -137,13 +138,13 @@ def test_gravity_run( if __name__ == "__main__": # Full run m_start = test_gravity_fwr_run( - "./", + Path("./"), n_grid_points=20, refinement=(4, 8), ) m_rec = test_gravity_run( - "./", + Path("./"), max_iterations=15, pytest=False, ) diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 810ef3193..a300be742 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -103,7 +103,6 @@ def test_ip_2d_run( conductivity_model=1e-2, s_norm=0.0, x_norm=0.0, - y_norm=0.0, z_norm=0.0, gradient_type="components", chargeability_channel_bool=True, @@ -134,14 +133,14 @@ def test_ip_2d_run( if __name__ == "__main__": # Full run mstart = test_ip_2d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=3, refinement=(4, 8), ) m_rec = test_ip_2d_run( - "./", + Path("./"), max_iterations=20, pytest=False, ) diff --git a/tests/run_tests/driver_ip_p3d_test.py b/tests/run_tests/driver_ip_p3d_test.py index 455bcf551..15e1c76c7 100644 --- a/tests/run_tests/driver_ip_p3d_test.py +++ b/tests/run_tests/driver_ip_p3d_test.py @@ -169,14 +169,14 @@ def test_ip_p3d_run( if __name__ == "__main__": # Full run m_start = test_ip_p3d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=3, refinement=(4, 8), ) m_rec = test_ip_p3d_run( - "./", + Path("./"), max_iterations=20, pytest=False, ) diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 47bb32a53..664427f25 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -26,8 +26,8 @@ target_run = { "data_norm": 0.00797, - "phi_d": 5.524, - "phi_m": 0.1174, + "phi_d": 4.667, + "phi_m": 0.1133, } np.random.seed(0) @@ -128,14 +128,14 @@ def test_ip_3d_run( if __name__ == "__main__": # Full run mstart = test_ip_3d_fwr_run( - "./", + Path("./"), n_electrodes=20, n_lines=5, refinement=(4, 8), ) m_rec = test_ip_3d_run( - "./", + Path("./"), n_lines=5, max_iterations=15, pytest=False, diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 81e29067a..14dec1513 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -4,6 +4,7 @@ # # geoapps is distributed under the terms and conditions of the MIT License # (see LICENSE file at the root of this source code package). +from pathlib import Path import numpy as np from geoh5py.objects import Octree @@ -169,13 +170,13 @@ def test_joint_surveys_inv_run( if __name__ == "__main__": # Full run m_start = test_joint_surveys_fwr_run( - "./", + Path("./"), n_grid_points=20, refinement=(4, 8), ) m_rec = test_joint_surveys_inv_run( - "./", + Path("./"), max_iterations=15, pytest=False, ) diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py index 9b8af19a6..b4ef75524 100644 --- a/tests/run_tests/driver_mag_test.py +++ b/tests/run_tests/driver_mag_test.py @@ -24,8 +24,8 @@ target_run = { "data_norm": 11.707134, - "phi_d": 1.598, - "phi_m": 8.824e-6, + "phi_d": 34.68, + "phi_m": 4.946e-6, } @@ -110,9 +110,8 @@ def test_susceptibility_run( tmi_channel_bool=True, z_from_topo=False, tmi_channel=tmi.uid, - tmi_uncertainty=4.0, + tmi_uncertainty=1.0, max_global_iterations=max_iterations, - initial_beta_ratio=1e0, store_sensitivities="ram", ) params.write_input_file(path=tmp_path, name="Inv_run") @@ -135,8 +134,10 @@ def test_susceptibility_run( if __name__ == "__main__": # Full run - m_start = test_susceptibility_fwr_run("./", n_grid_points=20, refinement=(4, 8)) - m_rec = test_susceptibility_run("./", max_iterations=30, pytest=False) + m_start = test_susceptibility_fwr_run( + Path("./"), n_grid_points=20, refinement=(4, 8) + ) + m_rec = test_susceptibility_run(Path("./"), max_iterations=30, pytest=False) residual = np.linalg.norm(m_rec - m_start) / np.linalg.norm(m_start) * 100.0 assert ( residual < 15.0 diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 95f5ee68d..d83bb5b1d 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -198,10 +198,12 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): if __name__ == "__main__": # Full run - mstart = test_magnetotellurics_fwr_run("./", n_grid_points=8, refinement=(4, 8)) + mstart = test_magnetotellurics_fwr_run( + Path("./"), n_grid_points=8, refinement=(4, 8) + ) m_rec = test_magnetotellurics_run( - "./", + Path("./"), max_iterations=15, pytest=False, ) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index cd4ed929c..5a861c484 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -26,8 +26,8 @@ target_mvi_run = { "data_norm": 8.9433, - "phi_d": 0.02951, - "phi_m": 4.164e-6, + "phi_d": 0.02647, + "phi_m": 4.297e-6, } @@ -140,8 +140,10 @@ def test_magnetic_vector_run( if __name__ == "__main__": # Full run - m_start = test_magnetic_vector_fwr_run("./", n_grid_points=20, refinement=(4, 8)) - m_rec = test_magnetic_vector_run("./", max_iterations=30, pytest=False) + m_start = test_magnetic_vector_fwr_run( + Path("./"), n_grid_points=20, refinement=(4, 8) + ) + m_rec = test_magnetic_vector_run(Path("./"), max_iterations=30, pytest=False) residual = np.linalg.norm(m_rec - m_start) / np.linalg.norm(m_start) * 100.0 assert ( residual < 50.0 diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index cc280a004..fbfebc470 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -21,9 +21,9 @@ # Move this file out of the test directory and run. target_run = { - "data_norm": 0.008729, - "phi_d": 2.195, - "phi_m": 0.4823, + "data_norm": 0.008731, + "phi_d": 2.213, + "phi_m": 0.1786, } np.random.seed(0) @@ -139,7 +139,6 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e4, - sens_wts_threshold=60.0, prctile=100, store_sensitivities="ram", **data_kwargs, @@ -163,10 +162,10 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): if __name__ == "__main__": # Full run - mstart = test_tipper_fwr_run("./", n_grid_points=8, refinement=(4, 8)) + mstart = test_tipper_fwr_run(Path("./"), n_grid_points=8, refinement=(4, 8)) m_rec = test_tipper_run( - "./", + Path("./"), max_iterations=15, pytest=False, )