diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 9ae5d18c..e3d12e7c 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 +# input_hash: df903f8d5f97aa53e048a59653b36a5acf8ff615a3b907992eb74b753d8cf30a channels: - conda-forge @@ -306,10 +306,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 80a734ec..df5fd517 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 +# input_hash: df903f8d5f97aa53e048a59653b36a5acf8ff615a3b907992eb74b753d8cf30a channels: - conda-forge @@ -158,10 +158,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 305b081e..c4cf68d2 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 +# input_hash: 03d1f3ef4c61f2960917993a4919e1b140142b11a1eb751062ca845672f6e6b4 channels: - conda-forge @@ -296,10 +296,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 68549521..44583d3e 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 +# input_hash: 03d1f3ef4c61f2960917993a4919e1b140142b11a1eb751062ca845672f6e6b4 channels: - conda-forge @@ -146,10 +146,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 53c446b6..0421cb2e 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 +# input_hash: 3dbea284166720deb24b29cf2170db9a32f056b8075113cae4cc86949c2d551b channels: - conda-forge @@ -309,10 +309,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 8431eefe..2abb80a4 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 +# input_hash: 3dbea284166720deb24b29cf2170db9a32f056b8075113cae4cc86949c2d551b channels: - conda-forge @@ -160,10 +160,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 352e2dd2..26902a54 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd +# input_hash: a3ef3af1bb1d93eb8d5ac7e146beec4f1bc5d2f0f6af964c6b9d67be798ff119 channels: - conda-forge @@ -299,10 +299,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index ba17cc5e..cbb3751b 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd +# input_hash: a3ef3af1bb1d93eb8d5ac7e146beec4f1bc5d2f0f6af964c6b9d67be798ff119 channels: - conda-forge @@ -148,10 +148,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 64c3ecf9..eaa6087d 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 +# input_hash: faba276316c29373b2d6b7b8c7642398283e4ca103c3aa3df2fd0358aea7e262 channels: - conda-forge @@ -309,10 +309,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 95b00e22..beb52047 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 +# input_hash: faba276316c29373b2d6b7b8c7642398283e4ca103c3aa3df2fd0358aea7e262 channels: - conda-forge @@ -160,10 +160,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 61bbe7d7..52554c97 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 +# input_hash: e6a7f9b65a8eab774bcc6e97dd60c58d129bef69f0979db3e945d74561748784 channels: - conda-forge @@ -299,10 +299,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index e2ed4dd3..61aa0e02 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 +# input_hash: e6a7f9b65a8eab774bcc6e97dd60c58d129bef69f0979db3e945d74561748784 channels: - conda-forge @@ -148,10 +148,8 @@ dependencies: - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@25bf69c7afdfce5e9d4ac7d667c88790aad9c934 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@bdf223def86a077a7e3f02b631fbffd7727527f2 - - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 7bf90b4a..031cb6b5 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: afb1c10339c4c180cd200e7fb18bfa0b1a79eeaf2936102a169de6beb9bdf706 - linux-64: 951d0e25ecbfd95cd4250992ff4a2fd809d3fcbaaff150dc70296bb2f71736c8 + win-64: 03d1f3ef4c61f2960917993a4919e1b140142b11a1eb751062ca845672f6e6b4 + linux-64: df903f8d5f97aa53e048a59653b36a5acf8ff615a3b907992eb74b753d8cf30a channels: - url: conda-forge used_env_vars: [] @@ -8598,15 +8598,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: grid-apps @@ -8618,15 +8617,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: mira-simpeg @@ -8671,71 +8669,3 @@ package: url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: linux-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: win-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: linux-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: win-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 4d91b087..f67b7248 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 1b992ff9f8e331f00f3c73c19b2d90a02b15bad512f46790f540c5b81e9a6efd - linux-64: 3ee78189e9804da7b2dfd0806eb05c17c2b0d23e3496fe93dd20fc4ee3d5d724 + win-64: a3ef3af1bb1d93eb8d5ac7e146beec4f1bc5d2f0f6af964c6b9d67be798ff119 + linux-64: 3dbea284166720deb24b29cf2170db9a32f056b8075113cae4cc86949c2d551b channels: - url: conda-forge used_env_vars: [] @@ -8683,15 +8683,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: grid-apps @@ -8703,15 +8702,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: mira-simpeg @@ -8756,71 +8754,3 @@ package: url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: linux-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: win-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: linux-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: win-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index d7bce3b9..7ba2446f 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: d3f6839c7d9ab3576b1808d9f1a2c3c60548a7c2c6a55c70f399e51ee3052040 - linux-64: 4573afe541246abdcc3b1dd3eaebe69348f71a0bfed06a53c897f32ac38c2fa0 + win-64: e6a7f9b65a8eab774bcc6e97dd60c58d129bef69f0979db3e945d74561748784 + linux-64: faba276316c29373b2d6b7b8c7642398283e4ca103c3aa3df2fd0358aea7e262 channels: - url: conda-forge used_env_vars: [] @@ -8683,15 +8683,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: grid-apps @@ -8703,15 +8702,14 @@ package: geoapps-utils: 0.6.0a1 geoh5py: 0.12.0a1 numpy: '>=1.26.0,<1.27.0' - octree-creation-app: 0.4.0a1 pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f hash: - sha256: e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + sha256: b950dd55b4fb70d2ef28488a3f684c374a170b9f source: type: url - url: git+https://github.com/MiraGeoscience/grid-apps.git@e5bc756e65c0deb2c35e9b5bad8b4572697e2f9f + url: git+https://github.com/MiraGeoscience/grid-apps.git@b950dd55b4fb70d2ef28488a3f684c374a170b9f category: main optional: false - name: mira-simpeg @@ -8756,71 +8754,3 @@ package: url: git+https://github.com/MiraGeoscience/simpeg.git@dc256f618543d8ee94fd36737749715fe497f8b7 category: main optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: linux-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: octree-creation-app - version: 0.4.0a1 - manager: pip - platform: win-64 - dependencies: - discretize: ==0.11.* - geoapps-utils: 0.6.0a1 - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - pydantic: '>=2.5.2,<3.0.0' - scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - hash: - sha256: 7e04880d7da72ba0fc46a2aacafa172cca010c81 - source: - type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7e04880d7da72ba0fc46a2aacafa172cca010c81 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: linux-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false -- name: param-sweeps - version: 0.3.0-alpha.1 - manager: pip - platform: win-64 - dependencies: - geoh5py: 0.12.0a1 - numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - hash: - sha256: ba132694b432f76848573964f07b791c27734879 - source: - type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@ba132694b432f76848573964f07b791c27734879 - category: main - optional: false diff --git a/pyproject.toml b/pyproject.toml index 960adc57..a42e1a6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,9 +97,6 @@ geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", re #mira-simpeg = {version = ">=0.23.0.1b1, <0.23.1.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} -#param-sweeps = {version = ">=0.3.0a, <0.4.dev", source = "pypi", allow-prereleases = true} -param-sweeps = {git = "https://github.com/MiraGeoscience/param-sweeps.git", rev = "develop"} - ## about pip dependencies # to be specified to work with conda-lock # - from PyPI: my_package = { version = "1.2.3", source = "pypi" } diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index ab2f83d5..c500a5ce 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -15,6 +15,7 @@ import numpy as np from geoapps_utils.base import Driver, get_logger +from geoapps_utils.param_sweeps.generate import generate from geoapps_utils.utils.transformations import azimuth_to_unit_vector from geoh5py.data import FloatData, ReferencedData from geoh5py.groups import UIJsonGroup @@ -22,7 +23,6 @@ from geoh5py.shared.utils import fetch_active_workspace from geoh5py.ui_json import InputFile, monitored_directory_copy from grid_apps.octree_creation.driver import OctreeDriver -from param_sweeps.generate import generate from simpeg_drivers.driver import InversionDriver, InversionLogger from simpeg_drivers.options import BaseForwardOptions @@ -32,7 +32,7 @@ from simpeg_drivers.plate_simulation.options import PlateSimulationOptions -logger = get_logger(__name__) +logger = get_logger(__name__, propagate=False) class PlateSimulationDriver(Driver): diff --git a/simpeg_drivers/utils/synthetics/meshes/octrees.py b/simpeg_drivers/utils/synthetics/meshes/octrees.py index 7c3c9043..57fa8e63 100644 --- a/simpeg_drivers/utils/synthetics/meshes/octrees.py +++ b/simpeg_drivers/utils/synthetics/meshes/octrees.py @@ -12,8 +12,8 @@ from discretize import TreeMesh from discretize.utils import mesh_builder_xyz from geoh5py.objects import Octree, Points, Surface -from octree_creation_app.driver import OctreeDriver -from octree_creation_app.utils import treemesh_2_octree +from grid_apps.octree_creation.driver import OctreeDriver +from grid_apps.utils import treemesh_2_octree def get_base_octree(