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 734a7ae7..e0bc7568 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -158,7 +158,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py310h3788b33_0 - mumps-include=5.7.3=h82cca05_9 @@ -298,9 +298,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 46492f13..8fa1de60 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -151,9 +151,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 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 76d45c96..8f26b001 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -145,7 +145,7 @@ dependencies: - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py310hc19bc0b_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -288,9 +288,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 9528a5db..54189990 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -139,9 +139,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 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 feed3cc0..1eb56f11 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -161,7 +161,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py311hd18a35c_0 - mumps-include=5.7.3=h82cca05_9 @@ -302,9 +302,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index ee5bba97..8d278931 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -154,9 +154,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 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 413ddb01..b63b7975 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -148,7 +148,7 @@ dependencies: - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py311h3257749_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -292,9 +292,9 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 4008b04c..a4361864 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -142,9 +142,9 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 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 d066f23f..67e17f8e 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -161,7 +161,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py312h68727a3_0 - mumps-include=5.7.3=h82cca05_9 @@ -302,9 +302,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index b8e5193f..767fee86 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -154,9 +154,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 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 f8dd8af5..9a7ba5d5 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -148,7 +148,7 @@ dependencies: - mccabe=0.7.0=pyhd8ed1ab_1 - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py312hd5eb7cc_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -292,9 +292,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index ab427099..73b31112 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -142,9 +142,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 474c397f..5e6ef53f 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -4327,29 +4327,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8358,12 +8358,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8375,12 +8375,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8392,12 +8392,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8409,16 +8409,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8430,16 +8430,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8451,12 +8451,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index cdcee6f4..ce8f35f4 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -4406,29 +4406,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8472,12 +8472,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8489,12 +8489,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8523,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index a8cdb301..569cdb30 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -4406,29 +4406,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8472,12 +8472,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8489,12 +8489,12 @@ package: 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/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8523,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index a166847d..0b5fadeb 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "direct current 2d", "forward_only": true, + "physical_property": "conductivity", "data_object": { "main": true, "group": "Survey", @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "potential_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -199,23 +176,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -239,13 +208,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -263,16 +225,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "gradient_type": { - "choiceList": [ - "total", - "components" - ], - "group": "Sparse/blocky model", - "label": "Gradient type", - "value": "total", - "verbose": 3, - "tooltip": "Choose whether the IRLS weights for regularization terms are updated using total or partial gradients." - } + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 2ae3f547..6a1f5e6b 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 2d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "potential_channel": { "association": "Cell", "dataType": "Float", @@ -258,8 +235,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -288,6 +263,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -335,6 +311,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", @@ -387,7 +364,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -438,7 +415,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -449,7 +426,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -461,6 +438,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -529,22 +507,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -567,7 +537,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -579,13 +548,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -603,6 +565,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 1d7c233d..c81f46aa 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 3d", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -104,23 +105,14 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -155,13 +147,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 3f2da74b..6498ea8f 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 3d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -177,8 +178,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -335,7 +334,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -386,7 +385,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -397,7 +396,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -409,6 +408,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -477,22 +477,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -526,7 +518,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -538,13 +529,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -562,6 +546,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 850d01d7..ef771680 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current pseudo 3d", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -27,6 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, + "line_id": 1, "potential_channel_bool": true, "u_cell_size": { "min": 0.0, @@ -157,23 +159,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -197,13 +191,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 9b37d4cb..a0d7a9f2 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current pseudo 3d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -27,6 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, + "line_id": 1, "potential_channel": { "association": "Cell", "dataType": "Float", @@ -215,7 +217,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, "inversion_style": "voxel", "alpha_s": { "min": 0.0, @@ -344,7 +345,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -395,7 +396,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -406,7 +407,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -418,6 +419,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -486,22 +488,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -536,13 +530,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -572,6 +559,5 @@ "label": "Clean directory", "value": true }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index 5045ce80..a956d91a 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "fem", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -117,23 +118,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -168,13 +161,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fem_inversion.ui.json index 317f5420..f85c9627 100644 --- a/simpeg_drivers-assets/uijson/fem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fem_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "fem", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -213,8 +214,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -371,7 +370,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -422,7 +421,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -433,7 +432,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -445,6 +444,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -513,22 +513,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -562,7 +554,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -574,13 +565,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 1b535208..531d38f7 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "gravity", "forward_only": true, + "physical_property": "density", "data_object": { "main": true, "group": "Survey", @@ -25,40 +26,6 @@ ], "value": "" }, - "z_from_topo": { - "group": "Data pre-processing", - "label": "Take z from topography", - "tooltip": "Sets survey elevation to topography before any offsets are applied.", - "value": false, - "verbose": 3, - "visible": false - }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "gz_channel_bool": { "group": "Survey", "main": true, @@ -194,24 +161,17 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", @@ -235,13 +195,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -252,7 +205,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 6e75b0da..9f61329f 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "gravity", "forward_only": false, + "physical_property": "density", "data_object": { "main": true, "group": "Data", @@ -675,6 +676,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -743,23 +745,16 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 411310f5..a9341ec1 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 2d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -210,23 +187,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 89bb2891..f7cdec99 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 2d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel": { "association": "Cell", "dataType": "Float", @@ -268,8 +245,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -397,7 +372,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -448,7 +423,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -459,7 +434,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -471,6 +446,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -539,22 +515,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -567,7 +535,6 @@ "value": "Pardiso" }, "tile_spatial": 1, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -589,13 +556,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -613,6 +573,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index b4839acf..6f2f9529 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 3d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -17,30 +18,6 @@ "meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -144,23 +121,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -195,13 +164,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index a2ea78f4..d32f6e30 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 3d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -17,30 +18,6 @@ "meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel": { "association": [ "Cell", @@ -217,8 +194,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -375,7 +350,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -426,7 +401,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -437,7 +412,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -517,22 +492,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -556,7 +523,6 @@ "verbose": 2, "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library." }, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -578,13 +544,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -602,6 +561,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 76415339..0cc50ef4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization pseudo 3d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -27,32 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": true, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", + "line_id": 1, "chargeability_channel_bool": true, "u_cell_size": { "min": 0.0, @@ -194,23 +170,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -234,13 +202,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 11d17248..5b74c35c 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization pseudo 3d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -27,32 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": true, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", + "line_id": 1, "chargeability_channel": { "association": "Cell", "dataType": "Float", @@ -253,7 +229,6 @@ "value": "" }, "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -381,7 +356,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -432,7 +407,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -443,7 +418,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -455,6 +430,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -523,22 +499,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -561,7 +529,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -573,13 +540,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -609,6 +569,5 @@ "label": "Clean directory", "value": true }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index f0e051b6..03185f01 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -9,6 +9,9 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "joint cross gradient", + "physical_property": [ + "" + ], "forward_only": false, "group_a": { "main": true, @@ -150,8 +153,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -261,7 +262,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -312,7 +313,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -323,7 +324,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -335,6 +336,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -397,23 +399,32 @@ "verbose": 2, "enabled": true }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": { + "choiceList": [ + "Pardiso", + "Mumps" + ], + "group": "Compute", + "label": "Direct solver", + "tooltip": "Direct solver to use for the forward calculations", + "value": "Pardiso" + }, + "tile_spatial": 1, "store_sensitivities": { "choiceList": [ "disk", @@ -424,7 +435,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -436,13 +446,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index dbbe154e..5b8b832c 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "joint surveys", + "physical_property": "", "forward_only": false, "group_a": { "main": true, @@ -182,8 +183,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -340,7 +339,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -391,7 +390,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -402,7 +401,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -414,6 +413,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -476,23 +476,32 @@ "verbose": 2, "enabled": true }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": { + "choiceList": [ + "Pardiso", + "Mumps" + ], + "group": "Compute", + "label": "Direct solver", + "tooltip": "Direct solver to use for the forward calculations", + "value": "Pardiso" + }, + "tile_spatial": 1, "store_sensitivities": { "choiceList": [ "disk", @@ -503,7 +512,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -515,13 +523,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index ee67902e..d2184368 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic scalar", + "physical_property": "susceptibility", "forward_only": true, "inducing_field_strength": { "min": 0.0, @@ -190,24 +191,17 @@ "property": "", "value": 0.0001 }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", @@ -231,13 +225,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -248,7 +235,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 452d77e4..3e2630f6 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic scalar", + "physical_property": "susceptibility", "forward_only": false, "inducing_field_strength": { "min": 0.0, @@ -478,8 +479,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -636,7 +635,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -687,7 +686,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -698,7 +697,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -709,6 +708,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -777,23 +777,16 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", @@ -816,7 +809,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -828,13 +820,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -845,7 +830,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 8421abd4..c39c64a9 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic vector", + "physical_property": "susceptibility", "forward_only": true, "inducing_field_strength": { "min": 0.1, @@ -222,24 +223,17 @@ "property": "", "value": 0.0 }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", @@ -263,13 +257,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -280,7 +267,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 48cd5ba5..05c44729 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic vector", + "physical_property": "susceptibility", "forward_only": false, "inducing_field_strength": { "min": 0.1, @@ -542,8 +543,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -700,7 +699,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -751,7 +750,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -762,7 +761,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -773,6 +772,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -841,23 +841,16 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", @@ -880,7 +873,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -892,13 +884,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -909,7 +894,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index 1d0634ef..d3c969d1 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetotellurics", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "zxx_real_channel_bool": { "group": "Survey", "main": true, @@ -184,23 +159,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -235,13 +202,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index c68922fc..220c8152 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetotellurics", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "zxx_real_channel": { "association": [ "Cell", @@ -424,8 +399,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -582,7 +555,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -633,7 +606,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -644,7 +617,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -656,6 +629,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -724,22 +698,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -773,7 +739,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -785,13 +750,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json b/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json index 3729451f..d9e0b5a3 100644 --- a/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json +++ b/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json @@ -30,7 +30,7 @@ "main": true, "group": "Sensitivity", "label": "Cutoff (%)", - "toottip": "The created mask will eliminate cells below the cutoff percentage.", + "tooltip": "The created mask will eliminate cells below the cutoff percentage.", "value": 10.0, "min": 0.0, "max": 100.0, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index b8afa77c..13a07113 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tdem", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -136,23 +137,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -187,13 +180,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index a47a67d9..67a75b24 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tdem", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -250,8 +251,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -408,7 +407,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -459,7 +458,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -470,7 +469,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -482,6 +481,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -550,22 +550,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -598,7 +590,6 @@ "tooltip": "Only RAM storage available for now.", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -610,13 +601,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 8ffcd7f3..eed93181 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tipper", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "txz_real_channel_bool": { "group": "Survey", "main": true, @@ -160,23 +135,15 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -211,13 +178,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 654182fa..335f7528 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tipper", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "txz_real_channel": { "association": [ "Cell", @@ -304,8 +279,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -462,7 +435,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -513,7 +486,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -524,7 +497,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -536,6 +509,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -604,22 +578,14 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", "value": 1, - "visible": false + "visible": true }, "solver_type": { "choiceList": [ @@ -643,7 +609,6 @@ "verbose": 2, "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library." }, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -665,13 +630,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 2732852c..b56737c6 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -257,13 +257,10 @@ def update_irls_directive(self): f_min_change=self.params.f_min_change, max_irls_iterations=self.params.max_irls_iterations, misfit_tolerance=self.params.beta_tol, - percentile=getattr(self.params, "percentile", None) - or self.params.prctile, - cooling_rate=getattr(self.params, "cooling_rate", None) - or self.params.coolingRate, - cooling_factor=getattr(self.params, "cooling_factor", None) - or self.params.coolingFactor, - irls_cooling_factor=self.params.coolEpsFact, + percentile=self.params.percentile, + cooling_rate=self.params.cooling_rate, + cooling_factor=self.params.cooling_factor, + irls_cooling_factor=self.params.epsilon_cooling_factor, chifact_start=( self.params.starting_chi_factor if has_chi_start diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py index 9db40a3b..ab9f2117 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py @@ -48,10 +48,9 @@ class SensitivityCutoffParams(BaseData): default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/sensitivity_cutoff.ui.json" ) - title: ClassVar[str] = "Depth of Investigation: Sensitivity Cutoff" - run_command: ClassVar[str] = ( - "simpeg_drivers.depth_of_investigation.sensitivity_cutoff.driver" - ) + + title: str = "Depth of Investigation: Sensitivity Cutoff" + run_command: str = "simpeg_drivers.depth_of_investigation.sensitivity_cutoff.driver" conda_environment: str = "simpeg_drivers" mesh: Octree diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 336d0c6d..aff86b94 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -57,6 +57,7 @@ BaseForwardOptions, BaseInversionOptions, ) +from simpeg_drivers.joint.params import BaseJointOptions from simpeg_drivers.utils.utils import tile_locations mlogger = logging.getLogger("distributed") @@ -296,6 +297,7 @@ def params( BaseForwardOptions, BaseInversionOptions, SweepParams, + BaseJointOptions, ), ): raise TypeError( @@ -498,13 +500,11 @@ def configure_dask(self): if self.client: dconf.set(scheduler=self.client) else: - dconf.set(scheduler="threads") n_cpu = self.params.n_cpu if n_cpu is None: n_cpu = int(multiprocessing.cpu_count()) - if self.params.parallelized: - dconf.set(scheduler="threads", pool=ThreadPool(self.params.n_cpu)) + dconf.set(scheduler="threads", pool=ThreadPool(n_cpu)) @classmethod def start(cls, filepath: str | Path, driver_class=None): diff --git a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py index 6d8e6dd2..171e37b7 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py @@ -41,13 +41,13 @@ class DCBatch2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current Pseudo 3D Forward" - title: ClassVar[str] = "Direct Current (DC) 2D Batch Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_batch2d_forward.ui.json" ) - inversion_type: str = "direct current pseudo 3d" + title: str = "Direct Current (DC) 2D Batch Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current pseudo 3d" data_object: PotentialElectrode potential_channel_bool: bool = True @@ -76,13 +76,13 @@ class DCBatch2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current Pseudo 3D Inversion" - title: ClassVar[str] = "Direct Current (DC) 2D Batch Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_batch2d_inversion.ui.json" ) - inversion_type: str = "direct current pseudo 3d" + title: str = "Direct Current (DC) 2D Batch Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current pseudo 3d" data_object: PotentialElectrode potential_channel: FloatData diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/three_dimensions/params.py index 177a7378..7550478e 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/params.py @@ -30,13 +30,13 @@ class DC3DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current 3D Forward" - title: ClassVar[str] = "Direct Current 3D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_3d_forward.ui.json" ) - inversion_type: str = "direct current 3d" + title: str = "Direct Current 3D Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current 3d" potential_channel_bool: bool = True model_type: str = "Conductivity (S/m)" @@ -53,13 +53,13 @@ class DC3DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current 3D Inversion" - title: ClassVar[str] = "Direct Current 3D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_3d_inversion.ui.json" ) - inversion_type: str = "direct current 3d" + title: str = "Direct Current 3D Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current 3d" potential_channel: FloatData potential_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py b/simpeg_drivers/electricals/direct_current/two_dimensions/params.py index b0206fe4..53fff8e0 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/params.py @@ -38,13 +38,13 @@ class DC2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current 2D Forward" - title: ClassVar[str] = "Direct Current 2D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_2d_forward.ui.json" ) - inversion_type: str = "direct current 2d" + title: str = "Direct Current 2D Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current 2d" potential_channel_bool: bool = True line_selection: LineSelectionOptions @@ -66,13 +66,13 @@ class DC2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current 2D Inversion" - title: ClassVar[str] = "Direct Current 2D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_2d_inversion.ui.json" ) - inversion_type: str = "direct current 2d" + title: str = "Direct Current 2D Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current 2d" potential_channel: FloatData potential_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py index c465b0e8..935662ad 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py @@ -41,13 +41,13 @@ class IPBatch2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization Pseudo 3D Forward" - title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_batch2d_forward.ui.json" ) - inversion_type: str = "induced polarization pseudo 3d" + title: str = "Induced Polarization (IP) 2D Batch Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization pseudo 3d" data_object: PotentialElectrode chargeability_channel_bool: bool = True @@ -55,6 +55,7 @@ class IPBatch2DForwardOptions(BaseForwardOptions): mesh: Octree | None = None conductivity_model: float | FloatData drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" file_control: FileControlOptions = FileControlOptions() @@ -75,13 +76,13 @@ class IPBatch2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization Pseudo 3D Inversion" - title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_batch2d_inversion.ui.json" ) - inversion_type: str = "induced polarization pseudo 3d" + title: str = "Induced Polarization (IP) 2D Batch Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization pseudo 3d" data_object: PotentialElectrode chargeability_channel: FloatData @@ -89,6 +90,7 @@ class IPBatch2DInversionOptions(BaseInversionOptions): line_selection: LineSelectionOptions mesh: Octree | None = None drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData lower_bound: float | FloatData | None = 0.0 file_control: FileControlOptions = FileControlOptions() diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py index 6f6dffcd..83a001bc 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py @@ -29,13 +29,13 @@ class IP3DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization 3D Forward" - title: ClassVar[str] = "Induced Polarization 3D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_3d_forward.ui.json" ) - inversion_type: str = "induced polarization 3d" + title: str = "Induced Polarization 3D Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 3d" chargeability_channel_bool: bool = True conductivity_model: float | FloatData @@ -51,13 +51,13 @@ class IP3DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization 3D Inversion" - title: ClassVar[str] = "Induced Polarization 3D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_3d_inversion.ui.json" ) - inversion_type: str = "induced polarization 3d" + title: str = "Induced Polarization 3D Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 3d" chargeability_channel: FloatData chargeability_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py index 5559dec2..a86747a8 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py @@ -37,13 +37,13 @@ class IP2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization 2D Forward" - title: ClassVar[str] = "Induced Polarization 2D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_2d_forward.ui.json" ) - inversion_type: str = "induced polarization 2d" + title: str = "Induced Polarization 2D Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 2d" chargeability_channel_bool: bool = True line_selection: LineSelectionOptions @@ -67,13 +67,13 @@ class IP2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization 2D Inversion" - title: ClassVar[str] = "Induced Polarization 2D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_2d_inversion.ui.json" ) - inversion_type: str = "induced polarization 2d" + title: str = "Induced Polarization 2D Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 2d" chargeability_channel: FloatData chargeability_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain/params.py b/simpeg_drivers/electromagnetics/frequency_domain/params.py index 9834aaef..1012f6da 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/params.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/params.py @@ -40,11 +40,11 @@ class FDEMForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Forward" - title: ClassVar[str] = "Frequency-domain EM (FEM) Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_forward.ui.json" - inversion_type: str = "fem" + title: str = "Frequency-domain EM (FEM) Forward" physical_property: str = "conductivity" + inversion_type: str = "fem" data_object: Receivers z_real_channel_bool: bool @@ -88,11 +88,11 @@ class FDEMInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Inversion" - title: ClassVar[str] = "Frequency-domain EM (FEM) Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_inversion.ui.json" - inversion_type: str = "fem" + title: str = "Frequency-domain EM (FEM) Inversion" physical_property: str = "conductivity" + inversion_type: str = "fem" data_object: Receivers z_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/electromagnetics/time_domain/params.py b/simpeg_drivers/electromagnetics/time_domain/params.py index 30946950..95ab42ca 100644 --- a/simpeg_drivers/electromagnetics/time_domain/params.py +++ b/simpeg_drivers/electromagnetics/time_domain/params.py @@ -42,11 +42,11 @@ class TDEMForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Time Domain Electromagnetics Forward" - title: ClassVar[str] = "Time-domain EM (TEM) Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tdem_forward.ui.json" - inversion_type: str = "tdem" + title: str = "Time-domain EM (TEM) Forward" physical_property: str = "conductivity" + inversion_type: str = "tdem" data_object: Receivers z_channel_bool: bool | None = None @@ -81,11 +81,11 @@ class TDEMInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Time Domain Electromagnetics Inversion" - title: ClassVar[str] = "Time-domain EM (TEM) Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tdem_inversion.ui.json" - inversion_type: str = "tdem" + title: str = "Time-domain EM (TEM) Inversion" physical_property: str = "conductivity" + inversion_type: str = "tdem" data_object: Receivers z_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/joint/joint_cross_gradient/params.py b/simpeg_drivers/joint/joint_cross_gradient/params.py index 77eb66af..4b5f2477 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/params.py +++ b/simpeg_drivers/joint/joint_cross_gradient/params.py @@ -33,16 +33,16 @@ class JointCrossGradientOptions(BaseJointOptions): """ name: ClassVar[str] = "Joint Cross Gradient Inversion" - title: ClassVar[str] = "Joint Cross Gradient Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/joint_cross_gradient_inversion.ui.json" ) + title: str = "Joint Cross Gradient Inversion" + physical_property: list[str] = [""] + inversion_type: str = "joint cross gradient" - data_object: None = None mesh: Octree | None = None - starting_model: None = None cross_gradient_weight_a_b: float = 1.0 cross_gradient_weight_c_a: float | None = None cross_gradient_weight_c_b: float | None = None diff --git a/simpeg_drivers/joint/joint_surveys/params.py b/simpeg_drivers/joint/joint_surveys/params.py index 463d4173..ec7d6d57 100644 --- a/simpeg_drivers/joint/joint_surveys/params.py +++ b/simpeg_drivers/joint/joint_surveys/params.py @@ -14,6 +14,7 @@ from pathlib import Path from typing import ClassVar +from geoh5py.data import FloatData from pydantic import model_validator from simpeg_drivers import assets_path @@ -24,13 +25,20 @@ class JointSurveysOptions(BaseJointOptions): """Joint Surveys inversion options.""" name: ClassVar[str] = "Joint Surveys Inversion" - title: ClassVar[str] = "Joint Surveys Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/joint_surveys_inversion.ui.json" ) + title: str = "Joint Surveys Inversion" + inversion_type: str = "joint surveys" + model_type: str = "Conductivity (S/m)" + starting_model: float | FloatData + reference_model: float | FloatData | None = None + lower_bound: float | FloatData | None = None + upper_bound: float | FloatData | None = None + @model_validator(mode="after") def all_groups_same_physical_property(self): physical_properties = [k.options["physical_property"] for k in self.groups] diff --git a/simpeg_drivers/joint/params.py b/simpeg_drivers/joint/params.py index a74fcfb6..b93f6953 100644 --- a/simpeg_drivers/joint/params.py +++ b/simpeg_drivers/joint/params.py @@ -11,12 +11,20 @@ from __future__ import annotations -from geoh5py.groups import SimPEGGroup +import multiprocessing -from simpeg_drivers.params import BaseInversionOptions +from geoapps_utils.driver.data import BaseData +from geoh5py.data import FloatData +from geoh5py.groups import SimPEGGroup, UIJsonGroup +from geoh5py.objects import DrapeModel, Octree +from geoh5py.shared.utils import fetch_active_workspace +from pydantic import ConfigDict, field_validator, model_validator +import simpeg_drivers +from simpeg_drivers.params import ActiveCellsOptions, SolverType -class BaseJointOptions(BaseInversionOptions): + +class BaseJointOptions(BaseData): """ Base Joint Options. @@ -28,8 +36,16 @@ class BaseJointOptions(BaseInversionOptions): :param group_c_multiplier: Multiplier for the data misfit function for Group C. """ - physical_property: str = "" - data_object: None = None + model_config = ConfigDict(frozen=False) + + icon: str | None = None + documentation: str | None = None + version: str = simpeg_drivers.__version__ + run_command: str = "simpeg_drivers.driver" + conda_environment: str = "simpeg-drivers" + forward_only: bool = False + physical_property: list[str] = ["conductivity"] + group_a: SimPEGGroup group_a_multiplier: float = 1.0 group_b: SimPEGGroup @@ -37,7 +53,99 @@ class BaseJointOptions(BaseInversionOptions): group_c: SimPEGGroup | None = None group_c_multiplier: float | None = None + mesh: Octree | DrapeModel | None + + active_cells: ActiveCellsOptions + tile_spatial: int = 1 + parallelized: bool = True + solver_type: SolverType = SolverType.Pardiso + save_sensitivities: bool = False + n_cpu: int | None = None + max_chunk_size: int = 128 + out_group: SimPEGGroup | UIJsonGroup | None = None + generate_sweep: bool = False + distributed_workers: str | None = None + alpha_s: float | FloatData | None = 1.0 + length_scale_x: float | FloatData = 1.0 + length_scale_y: float | FloatData | None = 1.0 + length_scale_z: float | FloatData = 1.0 + s_norm: float | FloatData | None = 0.0 + x_norm: float | FloatData = 2.0 + y_norm: float | FloatData | None = 2.0 + z_norm: float | FloatData = 2.0 + gradient_type: str = "total" + max_irls_iterations: int = 25 + starting_chi_factor: float = 1.0 + + chi_factor: float = 1.0 + auto_scale_misfits: bool = True + initial_beta_ratio: float | None = 100.0 + initial_beta: float | None = None + cooling_factor: float = 2.0 + + cooling_rate: float = 1.0 + max_global_iterations: int = 50 + max_line_search_iterations: int = 20 + max_cg_iterations: int = 30 + tol_cg: float = 1e-4 + f_min_change: float = 1e-2 + solver_type: SolverType = SolverType.Pardiso + + sens_wts_threshold: float = 1e-3 + every_iteration_bool: bool = True + + store_sensitivities: str = "ram" + + beta_tol: float = 0.5 + percentile: float = 95.0 + epsilon_cooling_factor: float = 1.2 + @property def groups(self) -> list[SimPEGGroup]: """List all active groups.""" return [k for k in [self.group_a, self.group_b, self.group_c] if k is not None] + + @field_validator("n_cpu", mode="before") + @classmethod + def maximize_cpu_if_none(cls, value): + if value is None: + value = int(multiprocessing.cpu_count()) + return value + + @field_validator("mesh", mode="before") + @classmethod + def mesh_cannot_be_rotated(cls, value: Octree): + if isinstance(value, Octree) and value.rotation not in [0.0, None]: + raise ValueError( + "Rotated meshes are not supported. Please use a mesh with an angle of 0.0." + ) + return value + + @model_validator(mode="before") + @classmethod + def out_group_if_none(cls, data): + group = data.get("out_group", None) + + if isinstance(group, SimPEGGroup): + return data + + if isinstance(group, UIJsonGroup | type(None)): + name = ( + cls.model_fields["title"].default # pylint: disable=unsubscriptable-object + if group is None + else group.name + ) + with fetch_active_workspace(data["geoh5"], mode="r+") as geoh5: + group = SimPEGGroup.create(geoh5, name=name) + + data["out_group"] = group + + return data + + @model_validator(mode="after") + def update_out_group_options(self): + assert self.out_group is not None + with fetch_active_workspace(self.geoh5, mode="r+"): + self.out_group.options = self.serialize() + self.out_group.metadata = None + return self diff --git a/simpeg_drivers/natural_sources/magnetotellurics/params.py b/simpeg_drivers/natural_sources/magnetotellurics/params.py index db0df7f9..3d8de712 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/params.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/params.py @@ -39,13 +39,13 @@ class MTForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Magnetotellurics Forward" - title: ClassVar[str] = "Magnetotellurics Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetotellurics_forward.ui.json" ) - inversion_type: str = "magnetotellurics" + title: str = "Magnetotellurics Forward" physical_property: str = "conductivity" + inversion_type: str = "magnetotellurics" data_object: MTReceivers zxx_real_channel_bool: bool | None = None @@ -89,13 +89,13 @@ class MTInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Magnetotellurics Inversion" - title: ClassVar[str] = "Magnetotellurics Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetotellurics_inversion.ui.json" ) - inversion_type: str = "magnetotellurics" + title: str = "Magnetotellurics Inversion" physical_property: str = "conductivity" + inversion_type: str = "magnetotellurics" data_object: MTReceivers zxx_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/natural_sources/tipper/params.py b/simpeg_drivers/natural_sources/tipper/params.py index 664454b1..40723196 100644 --- a/simpeg_drivers/natural_sources/tipper/params.py +++ b/simpeg_drivers/natural_sources/tipper/params.py @@ -35,11 +35,11 @@ class TipperForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Tipper Forward" - title: ClassVar[str] = "Tipper Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tipper_forward.ui.json" - inversion_type: str = "tipper" + title: str = "Tipper Forward" physical_property: str = "conductivity" + inversion_type: str = "tipper" data_object: TipperReceivers txz_real_channel_bool: bool | None = None @@ -67,11 +67,11 @@ class TipperInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Tipper Inversion" - title: ClassVar[str] = "Tipper Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tipper_inversion.ui.json" - inversion_type: str = "tipper" + title: str = "Tipper Inversion" physical_property: str = "conductivity" + inversion_type: str = "tipper" data_object: TipperReceivers txz_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 52954334..2060c9aa 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -11,7 +11,6 @@ from __future__ import annotations -import multiprocessing from enum import Enum from logging import getLogger from pathlib import Path @@ -23,7 +22,9 @@ from geoh5py.groups import PropertyGroup, SimPEGGroup, UIJsonGroup from geoh5py.objects import DrapeModel, Octree, Points from geoh5py.shared.utils import fetch_active_workspace -from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator +from pydantic import BaseModel, ConfigDict, field_validator, model_validator + +import simpeg_drivers logger = getLogger(__name__) @@ -75,7 +76,6 @@ class CoreOptions(BaseData): :param conda_environment: Name of the conda environment used to run the application with all of its dependencies. :param inversion_type: Type of inversion. - :param physical_property: Physical property of the model. :param data_object: Data object containing survey geometry and data channels. :param mesh: Mesh object containing models (starting, reference, active, etc..). @@ -83,52 +83,42 @@ class CoreOptions(BaseData): data in the forward operation. :param active_cells: Active cell data as either a topography surface/data or a 3D model. :param tile_spatial: Number of tiles to split the data. - :param parallelized: Parallelize the inversion/forward operation. - :param n_cpu: Number of CPUs to use if parallelized. If None, all cpu will be used. :param max_chunk_size: Maximum chunk size used for parallel operations. :param save_sensitivities: Save sensitivities to file. :param out_group: Output group to save results. :param generate_sweep: Generate sweep file instead of running the app. + :param distributed_workers: Distributed workers. """ # TODO: Refactor to allow frozen True. Currently params.data_object is # updated after z_from_topo applied in entity_factory.py. See # simpeg_drivers/components/data.py ln. 127 - model_config = ConfigDict(frozen=False, arbitrary_types_allowed=True, extra="allow") - run_command: ClassVar[str] = "simpeg_drivers.driver" + model_config = ConfigDict( + frozen=False, + arbitrary_types_allowed=True, + extra="allow", + validate_default=True, + ) + + title: str | None = None + icon: str | None = None + documentation: str | None = None + version: str = simpeg_drivers.__version__ + run_command: str = "simpeg_drivers.driver" conda_environment: str = "simpeg_drivers" inversion_type: str - physical_property: str data_object: Points - z_from_topo: bool = Field(default=False, deprecated=True) mesh: Octree | DrapeModel | None starting_model: float | FloatData active_cells: ActiveCellsOptions - solver_type: SolverType = SolverType.Pardiso tile_spatial: int = 1 - parallelized: bool = True n_cpu: int | None = None - max_chunk_size: int = 128 + solver_type: SolverType = SolverType.Pardiso save_sensitivities: bool = False + max_chunk_size: int = 128 out_group: SimPEGGroup | UIJsonGroup | None = None generate_sweep: bool = False - - @field_validator("z_from_topo", mode="before") - @classmethod - def deprecated(cls, v, info): - logger.warning( - "Field %s is deprecated. Since version 0.3.0, " - "any data location adjustments must be done in pre-processing.", - info.field_name, - ) - return v - - @field_validator("n_cpu", mode="before") - @classmethod - def maximize_cpu_if_none(cls, value): - if value is None: - value = int(multiprocessing.cpu_count()) - return value + distributed_workers: str | None = None @field_validator("mesh", mode="before") @classmethod @@ -148,7 +138,11 @@ def out_group_if_none(cls, data): return data if isinstance(group, UIJsonGroup | type(None)): - name = cls.title if group is None else group.name + name = ( + cls.model_fields["title"].default # pylint: disable=unsubscriptable-object + if group is None + else group.name + ) with fetch_active_workspace(data["geoh5"], mode="r+") as geoh5: group = SimPEGGroup.create(geoh5, name=name) @@ -277,16 +271,16 @@ class BaseInversionOptions(CoreOptions): :param max_irls_iterations: Maximum IRLS iterations. :param starting_chi_factor: Starting chi factor. - :param prctile: Prctile. + :param percentile: Percentile. :param beta_tol: Beta tolerance. :param chi_factor: Chi factor. :param auto_scale_misfits: Automatically scale misfits. :param initial_beta: Initial beta. :param initial_beta_ratio: Initial beta ratio. - :param coolingFactor: Cooling factor. + :param cooling_factor: Cooling factor. - :param coolingRate: Cooling rate. + :param cooling_rate: Cooling rate. :param max_global_iterations: Maximum global iterations. :param max_line_search_iterations: Maximum line search iterations. :param max_cg_iterations: Maximum CG iterations. @@ -295,10 +289,8 @@ class BaseInversionOptions(CoreOptions): :param sens_wts_threshold: Sensitivity weights threshold. :param every_iteration_bool: Every iteration bool. - :param save_sensitivities: Save sensitivities. - :param parallelized: Parallelized. - :param n_cpu: Number of CPUs. + :param solver_type: Direct solver provider. Either Mumps or Pardiso. :param tile_spatial: Tile the data spatially. :param store_sensitivities: Store sensitivities. :param max_chunk_size: Maximum chunk size. @@ -308,14 +300,8 @@ class BaseInversionOptions(CoreOptions): :param generate_sweep: Generate sweep. - :param output_tile_files: Output tile files. - :param inversion_style: Inversion style. - :param max_ram: Maximum RAM. :param coolEps_q: Cool eps q. :param coolEpsFact: Cool eps fact. :param beta_search: Beta search. - :param ga_group: GA group. - :param distributed_workers: Distributed workers. - :param no_data_value: No data value. """ model_config = ConfigDict( @@ -323,8 +309,9 @@ class BaseInversionOptions(CoreOptions): ) name: ClassVar[str] = "Inversion" - title: ClassVar[str] = "Geophysical inversion" - run_command: ClassVar[str] = "simpeg_drivers.driver" + + title: str = "Geophysical inversion" + run_command: str = "simpeg_drivers.driver" forward_only: bool = False conda_environment: str = "simpeg_drivers" @@ -350,35 +337,24 @@ class BaseInversionOptions(CoreOptions): auto_scale_misfits: bool = True initial_beta_ratio: float | None = 100.0 initial_beta: float | None = None - coolingFactor: float = 2.0 + cooling_factor: float = 2.0 - coolingRate: float = 1.0 + cooling_rate: float = 1.0 max_global_iterations: int = 50 max_line_search_iterations: int = 20 max_cg_iterations: int = 30 tol_cg: float = 1e-4 f_min_change: float = 1e-2 + solver_type: SolverType = SolverType.Pardiso sens_wts_threshold: float = 1e-3 every_iteration_bool: bool = True - save_sensitivities: bool = False - tile_spatial: int = 1 store_sensitivities: str = "ram" beta_tol: float = 0.5 - prctile: float = 95.0 - coolEps_q: bool = True - coolEpsFact: float = 1.2 - beta_search: bool = False - - chunk_by_rows: bool = True - output_tile_files: bool = False - inversion_style: str = "voxel" - max_ram: float | None = None - ga_group: SimPEGGroup | None = None - distributed_workers: int | None = None - no_data_value: float | None = None + percentile: float = 95.0 + epsilon_cooling_factor: float = 1.2 class EMDataMixin: diff --git a/simpeg_drivers/potential_fields/gravity/params.py b/simpeg_drivers/potential_fields/gravity/params.py index b819431c..1be787df 100644 --- a/simpeg_drivers/potential_fields/gravity/params.py +++ b/simpeg_drivers/potential_fields/gravity/params.py @@ -36,15 +36,16 @@ class GravityForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Gravity Forward" - title: ClassVar[str] = "Gravity Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/gravity_forward.ui.json" - inversion_type: str = "gravity" + title: str = "Gravity Forward" physical_property: str = "density" + inversion_type: str = "gravity" gx_channel_bool: bool = False gy_channel_bool: bool = False gz_channel_bool: bool = True + guv_channel_bool: bool = False gxx_channel_bool: bool = False gxy_channel_bool: bool = False gxz_channel_bool: bool = False @@ -77,16 +78,17 @@ class GravityInversionOptions(BaseInversionOptions): :param gzz_uncertainty: gzz uncertainty. """ - name: ClassVar[str] = "Gravity Inversion" - title: ClassVar[str] = "Gravity Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/gravity_inversion.ui.json" + name: ClassVar[str] = "Gravity Inversion" - inversion_type: str = "gravity" + title: str = "Gravity Inversion" physical_property: str = "density" + inversion_type: str = "gravity" gx_channel: FloatData | None = None gy_channel: FloatData | None = None gz_channel: FloatData | None = None + guv_channel: FloatData | None = None gxx_channel: FloatData | None = None gxy_channel: FloatData | None = None gxz_channel: FloatData | None = None @@ -96,6 +98,7 @@ class GravityInversionOptions(BaseInversionOptions): gx_uncertainty: FloatData | float | None = None gy_uncertainty: FloatData | float | None = None gz_uncertainty: FloatData | float | None = None + guv_uncertainty: FloatData | float | None = None gxx_uncertainty: FloatData | float | None = None gxy_uncertainty: FloatData | float | None = None gxz_uncertainty: FloatData | float | None = None diff --git a/simpeg_drivers/potential_fields/gravity/uijson.py b/simpeg_drivers/potential_fields/gravity/uijson.py index 30f75004..9957f419 100644 --- a/simpeg_drivers/potential_fields/gravity/uijson.py +++ b/simpeg_drivers/potential_fields/gravity/uijson.py @@ -50,8 +50,8 @@ class GravityForwardUIJson(SimPEGDriversUIJson): topography_object: ObjectForm topography: DataForm active_model: DataForm + save_sensitivities: BoolForm parallelized: BoolForm - n_cpu: IntegerForm tile_spatial: DataForm max_chunk_size: IntegerForm out_group: GroupForm @@ -63,6 +63,8 @@ class GravityForwardUIJson(SimPEGDriversUIJson): gps_receivers_offset: Deprecated | None = None output_tile_files: Deprecated | None = None chunk_by_rows: Deprecated | None = None + parallelized: Deprecated | None = None + n_cpu: Deprecated | None = None ga_group: Deprecated | None = None @@ -127,6 +129,9 @@ class GravityInversionUIJson(SimPEGDriversUIJson): cooling_rate: IntegerForm = Field( validation_alias=AliasChoices("cooling_rate", "coolingRate") ) + epsilon_cooling_factor: float = Field( + validation_alias=AliasChoices("epsilon_cooling_factor", "coolEpsFact") + ) max_global_iterations: IntegerForm max_line_search_iterations: IntegerForm max_cg_iterations: IntegerForm @@ -135,11 +140,11 @@ class GravityInversionUIJson(SimPEGDriversUIJson): sens_wts_threshold: FloatForm every_iteration_bool: BoolForm save_sensitivities: BoolForm - parallelized: BoolForm n_cpu: IntegerForm tile_spatial: DataForm store_sensitivities: ChoiceForm max_chunk_size: IntegerForm + out_group: GroupForm generate_sweep: BoolForm distributed_workers: str @@ -147,4 +152,5 @@ class GravityInversionUIJson(SimPEGDriversUIJson): inversion_style: Deprecated | None = None max_ram: Deprecated | None = None chunk_by_rows: Deprecated | None = None + parallelized: Deprecated | None = None ga_group: Deprecated | None = None diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/params.py b/simpeg_drivers/potential_fields/magnetic_scalar/params.py index b1eb06c8..e0748e9b 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/params.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/params.py @@ -37,13 +37,13 @@ class MagneticForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Magnetic Scalar Forward" - title: ClassVar[str] = "Magnetic Scalar Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_scalar_forward.ui.json" ) - inversion_type: str = "magnetic scalar" + title: str = "Magnetic Scalar Forward" physical_property: str = "susceptibility" + inversion_type: str = "magnetic scalar" tmi_channel_bool: bool = True bx_channel_bool: bool = False @@ -87,13 +87,13 @@ class MagneticInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Magnetic Scalar Inversion" - title: ClassVar[str] = "Magnetic Scalar Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_scalar_inversion.ui.json" ) - inversion_type: str = "magnetic scalar" + title: str = "Magnetic Scalar Inversion" physical_property: str = "susceptibility" + inversion_type: str = "magnetic scalar" tmi_channel: FloatData | None = None bx_channel: FloatData | None = None diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/params.py index fe5f515f..1be6d7a2 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/params.py @@ -37,13 +37,13 @@ class MVIForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Magnetic Vector Forward" - title: ClassVar[str] = "Magnetic Vector Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_vector_forward.ui.json" ) - inversion_type: str = "magnetic vector" + title: str = "Magnetic Vector Forward" physical_property: str = "susceptibility" + inversion_type: str = "magnetic vector" tmi_channel_bool: bool = True bx_channel_bool: bool = False @@ -55,6 +55,11 @@ class MVIForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False + inducing_field_strength: float | FloatData = 50000.0 + inducing_field_inclination: float | FloatData = 90.0 + inducing_field_declination: float | FloatData = 0.0 + starting_inclination: float | FloatData | None = None + starting_declination: float | FloatData | None = None class MVIInversionOptions(BaseInversionOptions): @@ -91,13 +96,13 @@ class MVIInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Magnetic Vector Inversion" - title: ClassVar[str] = "Magnetic Vector Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_vector_inversion.ui.json" ) - inversion_type: str = "magnetic vector" + title: str = "Magnetic Vector Inversion" physical_property: str = "susceptibility" + inversion_type: str = "magnetic vector" tmi_channel: FloatData | None = None bx_channel: FloatData | None = None @@ -122,3 +127,7 @@ class MVIInversionOptions(BaseInversionOptions): inducing_field_strength: float | FloatData = 50000.0 inducing_field_inclination: float | FloatData = 90.0 inducing_field_declination: float | FloatData = 0.0 + starting_inclination: float | FloatData | None = None + starting_declination: float | FloatData | None = None + reference_inclination: float | FloatData | None = None + reference_declination: float | FloatData | None = None diff --git a/simpeg_drivers/uijson.py b/simpeg_drivers/uijson.py index dafd2b40..2b4321c0 100644 --- a/simpeg_drivers/uijson.py +++ b/simpeg_drivers/uijson.py @@ -24,7 +24,7 @@ class SimPEGDriversUIJson(BaseUIJson): """Base class for simpeg-drivers UIJson.""" icon: str - documentation: str + documentation: str = "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/stable/intro.html" @field_validator("version", mode="before") @classmethod @@ -49,6 +49,6 @@ def write_default(cls): data["version"] = simpeg_drivers.__version__ uijson = cls.model_construct(**data) - data = uijson.model_dump_json(indent=4) + data = uijson.model_dump_json(indent=4, exclude_unset=False) with open(cls.default_ui_json, "w", encoding="utf-8") as file: file.write(data) diff --git a/tests/data_test.py b/tests/data_test.py index ed439b44..084d44b2 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -70,7 +70,7 @@ def test_save_data(tmp_path: Path): def test_survey_data(tmp_path: Path): X, Y, Z = np.meshgrid(np.linspace(0, 100, 3), np.linspace(0, 100, 3), 0) verts = np.column_stack([X.ravel(), Y.ravel(), Z.ravel()]) - with Workspace(tmp_path / "test_workspace.geoh5") as workspace: + with Workspace.create(tmp_path / "test_workspace.geoh5") as workspace: test_data_object = Points.create( workspace, vertices=verts, name="test_data_object" ) diff --git a/tests/driver_test.py b/tests/driver_test.py index aace593d..41e10969 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -52,7 +52,7 @@ def test_smallness_terms(tmp_path: Path): lower_bound=0.0, max_global_iterations=1, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", ) params.alpha_s = None diff --git a/tests/meshes_test.py b/tests/meshes_test.py index db1d3bf6..686c03d8 100644 --- a/tests/meshes_test.py +++ b/tests/meshes_test.py @@ -69,7 +69,7 @@ def test_initialize(tmp_path: Path): def test_to_treemesh(tmp_path): - with Workspace(tmp_path / "test_octree.geoh5") as workspace: + with Workspace.create(tmp_path / "test_octree.geoh5") as workspace: # Positive cells sizes and Z ordering cells = np.array( [ @@ -153,7 +153,7 @@ def test_to_treemesh(tmp_path): def test_ensure_cell_convention(tmp_path): - with Workspace(tmp_path / "test_octree.geoh5") as workspace: + with Workspace.create(tmp_path / "test_octree.geoh5") as workspace: octree_cells = np.array( [ (0, 0, 0, 1), diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index 230d76da..f2b3abc5 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -180,9 +180,9 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=1e2, max_global_iterations=max_iterations, initial_beta_ratio=1e2, - coolingRate=4, + cooling_rate=4, max_cg_iterations=200, - prctile=5, + percentile=5, sens_wts_threshold=1.0, store_sensitivities="ram", solver_type="Mumps", diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index f4f0b71a..042685ef 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -117,13 +117,12 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): x_norm=1.0, z_norm=1.0, gradient_type="components", - potential_channel_bool=True, max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, lower_bound=0.1, - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_dc_b2d_test.py b/tests/run_tests/driver_dc_b2d_test.py index 0cd9db13..41f16ac7 100644 --- a/tests/run_tests/driver_dc_b2d_test.py +++ b/tests/run_tests/driver_dc_b2d_test.py @@ -124,9 +124,9 @@ def test_dc_p3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=10.0, - prctile=100, + percentile=100, upper_bound=10, - coolingRate=1, + cooling_rate=1, file_control=FileControlOptions(cleanup=False), ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index 1fa04a7b..44cfe52c 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -73,7 +73,6 @@ def test_dc_3d_fwr_run( active_cells=active_cells, data_object=survey, starting_model=model, - resolution=None, ) fwr_driver = DC3DForwardDriver(params) fwr_driver.run() @@ -113,13 +112,13 @@ def test_dc_3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=10.0, - prctile=100, + percentile=100, upper_bound=10, tile_spatial=n_lines, store_sensitivities="ram", auto_scale_misfits=False, save_sensitivities=True, - coolingRate=1, + cooling_rate=1, chi_factor=0.5, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") @@ -164,7 +163,6 @@ def test_dc_single_line_fwr_run( active_cells=active_cells, data_object=survey, starting_model=model, - resolution=None, ) fwr_driver = DC3DForwardDriver(params) diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index a31a6f20..1d77f573 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -142,8 +142,8 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e1, - prctile=100, - coolingRate=3, + percentile=100, + cooling_rate=3, chi_factor=0.25, store_sensitivities="ram", sens_wts_threshold=1.0, diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index 7f0884a4..4475dda6 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -150,7 +150,7 @@ def test_gravity_run( lower_bound=0.0, max_global_iterations=max_iterations, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", save_sensitivities=True, ) diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index b628ede3..b5f7fa3c 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -210,9 +210,9 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=1e2, max_global_iterations=max_iterations, initial_beta_ratio=1e1, - coolingRate=2, + cooling_rate=2, max_cg_iterations=200, - prctile=100, + percentile=100, sens_wts_threshold=1.0, store_sensitivities="ram", solver_type="Mumps", diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 6a0f6618..0ff4bb1b 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -106,10 +106,10 @@ def test_ip_2d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, store_sensitivities="ram", - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py index 2b45f5d1..b54297d0 100644 --- a/tests/run_tests/driver_ip_b2d_test.py +++ b/tests/run_tests/driver_ip_b2d_test.py @@ -132,9 +132,9 @@ def test_ip_p3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, - coolingRate=1, + cooling_rate=1, file_control=FileControlOptions(cleanup=False), ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 057f36d7..d8989fe0 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -98,11 +98,11 @@ def test_ip_3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, tile_spatial=n_lines, store_sensitivities="ram", - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 3bc54c1a..4e36ec7b 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -261,7 +261,7 @@ def test_joint_cross_gradient_inv_run( y_norm=0.0, z_norm=0.0, gradient_type="components", - prctile=100, + percentile=100, store_sensitivities="ram", ) diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 4dc5b757..38228676 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -158,7 +158,7 @@ def test_joint_surveys_inv_run( lower_bound=0.0, max_global_iterations=max_iterations, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", ) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index a7a8b193..964ff67a 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -158,14 +158,14 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): y_norm=1.0, z_norm=1.0, gradient_type="components", - coolingRate=1, + cooling_rate=1, lower_bound=0.75, model_type="Resistivity (Ohm-m)", background_conductivity=100.0, max_global_iterations=max_iterations, initial_beta_ratio=1e3, sens_wts_threshold=1.0, - prctile=100, + percentile=100, store_sensitivities="ram", solver_type="Mumps", **data_kwargs, diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index 6839b44d..e40627eb 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -66,7 +66,6 @@ def test_magnetic_vector_fwr_run( inducing_field_inclination=inducing_field[1], inducing_field_declination=inducing_field[2], data_object=survey, - starting_model_object=model.parent, starting_model=model, starting_inclination=45, starting_declination=270, @@ -118,7 +117,7 @@ def test_magnetic_vector_run( initial_beta_ratio=1e1, store_sensitivities="ram", save_sensitivities=True, - prctile=100, + percentile=100, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index 7a3fccbb..3ce97738 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -150,8 +150,8 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): max_global_iterations=max_iterations, initial_beta_ratio=1e3, starting_chi_factor=1.0, - coolingRate=1, - prctile=100, + cooling_rate=1, + percentile=100, chi_factor=1.0, max_line_search_iterations=5, store_sensitivities="ram", diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py index 30053808..afd05b67 100644 --- a/tests/run_tests/sensitivity_cutoff_test.py +++ b/tests/run_tests/sensitivity_cutoff_test.py @@ -56,13 +56,12 @@ def setup_inversion_results( reference_model=0.0, s_norm=0.0, gradient_type="components", - gz_channel_bool=True, gz_channel=gz, gz_uncertainty=2e-3, lower_bound=0.0, max_global_iterations=1, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", save_sensitivities=True, ) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index fe671f01..cb6133b2 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -29,7 +29,7 @@ def test_version_warning(tmp_path, caplog): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") with caplog.at_level(logging.WARNING): _ = SimPEGDriversUIJson( @@ -72,7 +72,7 @@ class MyUIJson(SimPEGDriversUIJson): def test_deprecations(tmp_path, caplog): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") class MyUIJson(SimPEGDriversUIJson): my_param: Deprecated @@ -93,8 +93,29 @@ class MyUIJson(SimPEGDriversUIJson): assert "Skipping deprecated field: my_param." in caplog.text +def test_pydantic_deprecation(tmp_path): + workspace = Workspace.create(tmp_path / "test.geoh5") + + class MyUIJson(SimPEGDriversUIJson): + my_param: str = Field(deprecated="Use my_param2 instead.", exclude=True) + + uijson = MyUIJson( + version="0.3.0-alpha.1", + title="My app", + icon="", + documentation="", + geoh5=str(workspace.h5file), + run_command="myapp.driver", + monitoring_directory="", + conda_environment="my-app", + workspace_geoh5="", + my_param="whoopsie", + ) + assert "my_param" not in uijson.model_dump() + + def test_alias(tmp_path): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") class MyUIJson(SimPEGDriversUIJson): my_param: str = Field(validation_alias=AliasChoices("my_param", "myParam")) @@ -118,6 +139,9 @@ class MyUIJson(SimPEGDriversUIJson): def test_gravity_uijson(tmp_path): + import warnings + + warnings.filterwarnings("error") geoh5, _, starting_model, survey, topography = setup_inversion_workspace( tmp_path, background=0.0, anomaly=0.75, inversion_type="gravity" ) diff --git a/tests/utils_meshes_test.py b/tests/utils_meshes_test.py index 226fafbd..cd308164 100644 --- a/tests/utils_meshes_test.py +++ b/tests/utils_meshes_test.py @@ -83,7 +83,7 @@ def test_auto_pad(): def test_auto_mesh_parameters(tmp_path): - with Workspace(tmp_path / "test.geoh5") as ws: + with Workspace.create(tmp_path / "test.geoh5") as ws: locs = create_test_survey() locs, topo = generate_random_topography(locs, drape_survey=0)