From 9db3922155b3b5f6eef310326fd3cb3630209cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 3 Dec 2025 00:12:51 -0500 Subject: [PATCH 1/3] [DEVOPS-922] adjust or fix text in ui.json --- .../uijson/direct_current_3d_forward.ui.json | 6 +++--- .../uijson/direct_current_3d_inversion.ui.json | 8 ++++---- .../uijson/direct_current_batch2d_forward.ui.json | 6 +++--- .../uijson/direct_current_batch2d_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/fdem1d_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/fdem_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/fdem_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/gravity_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/gravity_inversion.ui.json | 8 ++++---- .../uijson/induced_polarization_3d_forward.ui.json | 6 +++--- .../uijson/induced_polarization_3d_inversion.ui.json | 8 ++++---- .../induced_polarization_batch2d_forward.ui.json | 6 +++--- .../induced_polarization_batch2d_inversion.ui.json | 8 ++++---- .../uijson/joint_cross_gradient_inversion.ui.json | 8 ++++---- .../uijson/joint_petrophysics_inversion.ui.json | 10 +++++----- .../uijson/joint_surveys_inversion.ui.json | 8 ++++---- .../uijson/magnetic_scalar_inversion.ui.json | 8 ++++---- .../uijson/magnetic_vector_forward.ui.json | 6 +++--- .../uijson/magnetic_vector_inversion.ui.json | 8 ++++---- .../uijson/magnetotellurics_forward.ui.json | 6 +++--- .../uijson/magnetotellurics_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/plate_simulation.ui.json | 10 +++++----- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/tdem_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 8 ++++---- simpeg_drivers-assets/uijson/tipper_forward.ui.json | 6 +++--- simpeg_drivers-assets/uijson/tipper_inversion.ui.json | 8 ++++---- 29 files changed, 106 insertions(+), 106 deletions(-) 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 1de15ecb1..1a93c3706 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Direct Current (DC) 3D Forward", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -80,7 +80,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -100,7 +100,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "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 616f5ba93..5eba2847c 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Direct Current (DC) 3D Inversion", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -153,7 +153,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -173,7 +173,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -428,7 +428,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, 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 3e9146feb..8628a6301 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Direct Current (DC) 2D Batch Forward", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -134,7 +134,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -154,7 +154,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "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 9bcf0d9df..7c19bce08 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Direct Current (DC) 2D Batch Inversion", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -192,7 +192,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -212,7 +212,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -439,7 +439,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 1cf06e6aa..af248f1b3 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Frequency-domain EM (FEM) 1D Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -133,7 +133,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -153,7 +153,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index 006b742cb..dd5510db4 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Frequency-domain EM (FEM) 1D Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -229,7 +229,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -249,7 +249,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -463,7 +463,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index c4a4edee0..c72f54d41 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Frequency-domain EM (FEM) Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -93,7 +93,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -113,7 +113,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index 38ea9a101..acd5692f1 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Frequency-domain EM (FEM) Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -189,7 +189,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -209,7 +209,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -464,7 +464,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index f27bda493..2c18a11ca 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Gravity Forward", "icon": "surveyairbornegravity", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -136,7 +136,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -156,7 +156,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 2c74c2735..c54e8d944 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Gravity Inversion", "icon": "surveyairbornegravity", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -422,7 +422,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -442,7 +442,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -696,7 +696,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, 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 29af72fa3..889ca714c 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Induced Polarization (IP) 3D Forward", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -96,7 +96,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -116,7 +116,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "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 4f32ad146..79d43580e 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Induced Polarization (IP) 3D Inversion", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -169,7 +169,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -189,7 +189,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -444,7 +444,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, 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 7bdd7bb3d..79ffccd7a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Induced Polarization (IP) 2D Batch Forward", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -145,7 +145,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -165,7 +165,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "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 1ef91eaef..b90070988 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Induced Polarization (IP) 2D Batch Inversion", "icon": "PotentialElectrode", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -203,7 +203,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -223,7 +223,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -451,7 +451,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, 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 ffab7c999..7a5e3995a 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Joint Cross Gradient Inversion", "icon": "function", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -126,7 +126,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -146,7 +146,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -386,7 +386,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json index 683b3c0c5..22931100d 100644 --- a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json @@ -1,7 +1,7 @@ { - "version": "0.3.0-alpha.4", + "version": "0.4.0", "title": "Joint Petrophysically Guided Inversion (PGI)", - "icon": "", + "icon": "referencedata", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", "conda_environment": "simpeg_drivers", "run_command": "simpeg_drivers.driver", @@ -117,7 +117,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -137,7 +137,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -354,7 +354,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 1ee8b87d6..62557f66c 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Joint Surveys Inversion", "icon": "model", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -158,7 +158,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -178,7 +178,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -433,7 +433,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 560988560..cae10a622 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-beta.1", + "version": "0.4.0", "title": "Magnetic Inversion", "icon": "surveyairbornemagnetics", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -455,7 +455,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -475,7 +475,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -729,7 +729,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index fe4f761e5..abc4a07df 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Magnetic Vector (MVI) Forward", "icon": "surveyairbornemagnetics", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -67,7 +67,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -87,7 +87,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index b7d577ac6..11dbf627b 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-beta.1", + "version": "0.4.0", "title": "Magnetic Vector (MVI) Inversion", "icon": "surveyairbornemagnetics", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -520,7 +520,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -540,7 +540,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -794,7 +794,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index e34d6bbc6..8cdecac57 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Magnetotellurics (MT) Forward", "icon": "surveymagnetotellurics", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -134,7 +134,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -154,7 +154,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index c8c9d56f1..3a34206ed 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Magnetotellurics (MT) Inversion", "icon": "surveymagnetotellurics", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -374,7 +374,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -394,7 +394,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -649,7 +649,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/plate_simulation.ui.json b/simpeg_drivers-assets/uijson/plate_simulation.ui.json index 36b68a7c7..681b0a1bb 100644 --- a/simpeg_drivers-assets/uijson/plate_simulation.ui.json +++ b/simpeg_drivers-assets/uijson/plate_simulation.ui.json @@ -1,5 +1,5 @@ { - "version": "0.2.0-alpha.1", + "version": "0.4.0", "title": "Plate Simulation", "icon": "maxwellplate", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/plate-simulation/", @@ -57,7 +57,7 @@ "label": "Number of plates", "value": 1, "enabled": true, - "tooltip": "If more than one the plates will be parallel, equally spaced over the center of the model" + "tooltip": "If more than one the plates will be parallel, equally spaced over the centre of the model" }, "spacing": { "main": true, @@ -125,7 +125,7 @@ "group": "Plate", "value": true, "enabled": true, - "tooltip": "If checked locations are relative to the survey center and either topography or overburden in z according to 'Depth reference' selection" + "tooltip": "If checked locations are relative to the survey centre and either topography or overburden in z according to 'Depth reference' selection" }, "easting": { "label": "Easting (m)", @@ -133,7 +133,7 @@ "main": true, "value": 0.0, "enabled": true, - "tooltip": "If relative locations, Easting is relative to the center of the survey" + "tooltip": "If relative locations, Easting is relative to the centre of the survey" }, "northing": { "label": "Northing (m)", @@ -141,7 +141,7 @@ "group": "Plate", "value": 0.0, "enabled": true, - "tooltip": "If relative locations, Northing is relative to the center of the survey" + "tooltip": "If relative locations, Northing is relative to the centre of the survey" }, "elevation": { "label": "Elevation (m)", diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index e6727966e..b4d6c39f8 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Time-domain EM (TEM) 1D Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -147,7 +147,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -168,7 +168,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 355e1fa15..dbefaba05 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Time-domain EM (TEM) 1D Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -213,7 +213,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -234,7 +234,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -448,7 +448,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index a125bf260..7549311d2 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Time-domain EM (TEM) Forward", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -119,7 +119,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -139,7 +139,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 87e90e737..c9c229953 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-beta.1", + "version": "0.4.0", "title": "Time-domain EM (TEM) Inversion", "icon": "surveyairborneem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -233,7 +233,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -253,7 +253,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -508,7 +508,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 25036ff1f..a0cd36173 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Tipper Forward", "icon": "surveyztem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -110,7 +110,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -130,7 +130,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 5d9c9450a..1581dab80 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -1,5 +1,5 @@ { - "version": "0.3.0-alpha.6", + "version": "0.4.0", "title": "Tipper Inversion", "icon": "surveyztem", "documentation": "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/latest/", @@ -254,7 +254,7 @@ "optional": true, "enabled": false, "label": "Elevation channel", - "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", + "tooltip": "Set elevation from channel. If not set the topography will be set from the geometry of the selected 'topography' object", "parent": "topography_object", "dependency": "topography_object", "dependencyType": "enabled", @@ -274,7 +274,7 @@ "dependency": "topography_object", "dependencyType": "disabled", "label": "Active model", - "tooltip": "Provide the active cell boolean model directly if topography not set", + "tooltip": "Provide the active cell Boolean model directly if topography not set", "parent": "mesh", "value": "" }, @@ -529,7 +529,7 @@ "min": 1, "enabled": true, "verbose": 3, - "tooltip": "Perform an Armijo backtracking linesearch for the provided number of iterations" + "tooltip": "Perform an Armijo backtracking line search for the provided number of iterations" }, "max_cg_iterations": { "min": 0, From da7d1a6c463e79c457c55079f414c38fd93f992d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:10:46 -0500 Subject: [PATCH 2/3] [DEVOPS-922] no cap for Ohm --- .../uijson/direct_current_2d_forward.ui.json | 2 +- .../uijson/direct_current_2d_inversion.ui.json | 2 +- .../uijson/direct_current_3d_forward.ui.json | 2 +- .../uijson/direct_current_3d_inversion.ui.json | 2 +- .../uijson/direct_current_batch2d_forward.ui.json | 2 +- .../uijson/direct_current_batch2d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/fdem_inversion.ui.json | 2 +- .../uijson/induced_polarization_2d_forward.ui.json | 4 ++-- .../uijson/induced_polarization_2d_inversion.ui.json | 4 ++-- .../uijson/induced_polarization_3d_forward.ui.json | 2 +- .../uijson/induced_polarization_3d_inversion.ui.json | 2 +- .../uijson/induced_polarization_batch2d_forward.ui.json | 2 +- .../uijson/induced_polarization_batch2d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json | 2 +- .../uijson/magnetotellurics_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 2 +- simpeg_drivers-assets/uijson/tipper_forward.ui.json | 2 +- simpeg_drivers-assets/uijson/tipper_inversion.ui.json | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) 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 628824501..723664da4 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 95b756056..467bdb802 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -125,7 +125,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 1a93c3706..da8ba5a90 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 5eba2847c..48b90fee5 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 8628a6301..34a966a57 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 7c19bce08..04de4956f 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index af248f1b3..33192e3cd 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -84,7 +84,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index dd5510db4..6199b8dbc 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -132,7 +132,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_forward.ui.json b/simpeg_drivers-assets/uijson/fdem_forward.ui.json index c72f54d41..24f6eedb5 100644 --- a/simpeg_drivers-assets/uijson/fdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_forward.ui.json @@ -44,7 +44,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index acd5692f1..76991d4ca 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -92,7 +92,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 e90f20d41..d08f22cf2 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -105,7 +105,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", @@ -121,7 +121,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", "property": "", "value": 0.001 }, 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 5664233ae..999d02a83 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -124,7 +124,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", @@ -140,7 +140,7 @@ "isValue": true, "parent": "mesh", "label": "Background", - "tooltip": "Background model in the 'Model units' (S/m or Ohm-m).", + "tooltip": "Background model in the 'Model units' (S/m or ohm-m).", "property": "", "value": 0.001 }, 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 889ca714c..e9f559d4c 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -31,7 +31,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 79d43580e..969137780 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -56,7 +56,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 79ffccd7a..0917f8320 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -88,7 +88,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", 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 b90070988..e8fdbf7ca 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -107,7 +107,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 62557f66c..28815d75d 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -71,7 +71,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index 8cdecac57..e6942efed 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -78,7 +78,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 3a34206ed..277088174 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -270,7 +270,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index b4d6c39f8..02ceba28e 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -98,7 +98,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index dbefaba05..95129a3d6 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -122,7 +122,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index 7549311d2..a5720a271 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -70,7 +70,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index c9c229953..c7b96f84d 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -142,7 +142,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index a0cd36173..7af865438 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -54,7 +54,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 1581dab80..eab335148 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -150,7 +150,7 @@ "model_type": { "choiceList": [ "Conductivity (S/m)", - "Resistivity (Ohm-m)" + "Resistivity (ohm-m)" ], "main": true, "group": "Mesh and models", From b6b450cf75fdbf993988aed131e08486da8411b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Hensgen?= <24550538+sebhmg@users.noreply.github.com> Date: Wed, 3 Dec 2025 17:58:47 -0500 Subject: [PATCH 3/3] [DEVOPS-922] fix "ohm" vs "Ohm": compare with str.lower() --- .../factories/directives_factory.py | 2 +- .../components/factories/source_factory.py | 2 +- simpeg_drivers/components/models.py | 24 ++++++++++--------- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/joint/joint_surveys/driver.py | 2 +- simpeg_drivers/options.py | 2 +- simpeg_drivers/plate_simulation/driver.py | 2 +- simpeg_drivers/utils/nested.py | 2 +- .../driver_2d_rotated_gradients_test.py | 2 +- tests/run_tests/driver_dc_2d_test.py | 2 +- tests/run_tests/driver_ip_2d_test.py | 2 +- tests/run_tests/driver_ip_test.py | 2 +- .../driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mt_test.py | 2 +- tests/run_tests/driver_tipper_test.py | 4 ++-- 16 files changed, 29 insertions(+), 27 deletions(-) diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 04250362a..b4c74bddd 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -418,7 +418,7 @@ def assemble_keyword_arguments( inversion_object.permutation.T, ] - if self.params.models.model_type == "Resistivity (Ohm-m)": + if self.params.models.model_type.lower() == "resistivity (ohm-m)": kwargs["transforms"].append(lambda x: 1 / x) if "1d" in self.factory_type: diff --git a/simpeg_drivers/components/factories/source_factory.py b/simpeg_drivers/components/factories/source_factory.py index 0b0077ac4..ba1d729d1 100644 --- a/simpeg_drivers/components/factories/source_factory.py +++ b/simpeg_drivers/components/factories/source_factory.py @@ -138,7 +138,7 @@ def assemble_keyword_arguments( # pylint: disable=arguments-differ if self.factory_type in ["magnetotellurics", "tipper"]: background = deepcopy(self.params.models.conductivity_model) - if getattr(self.params.models, "model_type", None) == "Resistivity (Ohm-m)": + if getattr(self.params.models, "model_type", None) == "Resistivity (ohm-m)": background **= -1.0 kwargs["sigma_primary"] = [background] diff --git a/simpeg_drivers/components/models.py b/simpeg_drivers/components/models.py index 0650807e9..9cef58a68 100644 --- a/simpeg_drivers/components/models.py +++ b/simpeg_drivers/components/models.py @@ -165,7 +165,7 @@ def starting_model(self) -> np.ndarray | None: mstart = self._starting_model.model.copy() if mstart is not None and self.is_sigma: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type.lower() == "resistivity (ohm-m)": mstart = 1 / mstart mstart = np.log(mstart) @@ -221,7 +221,7 @@ def reference_model(self) -> np.ndarray | None: ref_model = mref.copy() if self.is_sigma: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type.lower() == "resistivity (ohm-m)": ref_model = 1 / ref_model ref_model = np.log(ref_model) @@ -263,7 +263,7 @@ def reference_declination(self) -> np.ndarray | None: def lower_bound(self) -> np.ndarray | None: if ( self.is_sigma - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + and self.driver.params.models.model_type.lower() == "resistivity (ohm-m)" ): bound_model = self._upper_bound.model else: @@ -283,7 +283,7 @@ def lower_bound(self) -> np.ndarray | None: if self.is_sigma: is_finite = np.isfinite(lbound) - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type.lower() == "resistivity (ohm-m)": lbound[is_finite] = 1 / lbound[is_finite] lbound[is_finite] = np.log(lbound[is_finite]) @@ -297,7 +297,7 @@ def lower_bound(self) -> np.ndarray | None: def upper_bound(self) -> np.ndarray | None: if ( self.is_sigma - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + and self.driver.params.models.model_type.lower() == "resistivity (ohm-m)" ): bound_model = self._lower_bound.model else: @@ -311,7 +311,7 @@ def upper_bound(self) -> np.ndarray | None: if self.is_sigma: is_finite = np.isfinite(ubound) - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type.lower() == "resistivity (ohm-m)": ubound[is_finite] = 1 / ubound[is_finite] ubound[is_finite] = np.log(ubound[is_finite]) @@ -329,7 +329,7 @@ def conductivity_model(self) -> np.ndarray | None: background_sigma = self._conductivity_model.model.copy() if background_sigma is not None: - if self.driver.params.models.model_type == "Resistivity (Ohm-m)": + if self.driver.params.models.model_type.lower() == "resistivity (ohm-m)": background_sigma = 1 / background_sigma # Don't apply log if IP inversion @@ -568,8 +568,9 @@ def save_model(self): model_type = self.model_type if ( - model_type == "conductivity_model" - and self.driver.params.models.model_type == "Resistivity (Ohm-m)" + model_type + and model_type.lower() == "conductivity_model" + and self.driver.params.models.model_type.lower() == "resistivity (ohm-m)" ): model_type = "resistivity_model" @@ -590,9 +591,10 @@ def edit_ndv_model(self, model): """Change values to NDV on models and save to workspace.""" model_type = self.model_type if ( - model_type == "conductivity_model" + model_type + and model_type.lower() == "conductivity_model" and getattr(self.driver.params.models, "model_type", None) - == "Resistivity (Ohm-m)" + == "Resistivity (ohm-m)" ): model_type = "resistivity_model" diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index bc93f59ea..135d88973 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -451,7 +451,7 @@ def _get_local_model_save_directives( ) model_directive.label = driver.params.physical_property - if getattr(driver.params.models, "model_type", None) == "Resistivity (Ohm-m)": + if getattr(driver.params.models, "model_type", None) == "Resistivity (ohm-m)": model_directive.label = "resistivity_model" model_directive.transforms = [wire, *model_directive.transforms] diff --git a/simpeg_drivers/joint/joint_surveys/driver.py b/simpeg_drivers/joint/joint_surveys/driver.py index c0906560a..e288c3b5e 100644 --- a/simpeg_drivers/joint/joint_surveys/driver.py +++ b/simpeg_drivers/joint/joint_surveys/driver.py @@ -64,7 +64,7 @@ def validate_create_models(self): model = np.exp(model) if ( getattr(self.params.models, "model_type", None) - == "Resistivity (Ohm-m)" + == "Resistivity (ohm-m)" ): model = 1.0 / model diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index 0f796517b..965edfcbf 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -319,7 +319,7 @@ class ConductivityModelOptions(ModelOptions): Options for the conductivity model used in all of EM methods. """ - model_type: Literal["Conductivity (S/m)", "Resistivity (Ohm-m)"] = ( + model_type: Literal["Conductivity (S/m)", "Resistivity (ohm-m)"] = ( "Conductivity (S/m)" ) conductivity_model: float | FloatData | None = Field( diff --git a/simpeg_drivers/plate_simulation/driver.py b/simpeg_drivers/plate_simulation/driver.py index b7dd61c06..d87522955 100644 --- a/simpeg_drivers/plate_simulation/driver.py +++ b/simpeg_drivers/plate_simulation/driver.py @@ -137,7 +137,7 @@ def simulation_parameters(self) -> BaseForwardOptions: if self._simulation_parameters is None: self._simulation_parameters = self.params.simulation_parameters() if self._simulation_parameters.physical_property == "conductivity": - self._simulation_parameters.models.model_type = "Resistivity (Ohm-m)" + self._simulation_parameters.models.model_type = "Resistivity (ohm-m)" return self._simulation_parameters @property diff --git a/simpeg_drivers/utils/nested.py b/simpeg_drivers/utils/nested.py index 6ff3a325d..719740e8b 100644 --- a/simpeg_drivers/utils/nested.py +++ b/simpeg_drivers/utils/nested.py @@ -275,7 +275,7 @@ def create_simulation( n_actives = int(actives.sum()) if getattr(simulation, "_chiMap", None) is not None: - if simulation.model_type == "vector": + if simulation.model_type and simulation.model_type.lower() == "vector": kwargs["chiMap"] = maps.IdentityMap(nP=n_actives * 3) kwargs["model_type"] = "vector" else: diff --git a/tests/run_tests/driver_2d_rotated_gradients_test.py b/tests/run_tests/driver_2d_rotated_gradients_test.py index 5d6be39f4..7e1218ae1 100644 --- a/tests/run_tests/driver_2d_rotated_gradients_test.py +++ b/tests/run_tests/driver_2d_rotated_gradients_test.py @@ -153,7 +153,7 @@ def test_dc2d_rotated_grad_run( gradient_rotation=pg, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=1.0, diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 46e9cf64c..91ac277a1 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -113,7 +113,7 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): data_object=potential.parent, potential_channel=potential, potential_uncertainty=1e-3, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", starting_model=100.0, reference_model=100.0, s_norm=0.0, diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 219ea86b6..92eb45c3c 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -64,7 +64,7 @@ def test_ip_2d_fwr_run( topography_object=components.topography, starting_model=components.model, conductivity_model=1e2, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", line_selection=LineSelectionOptions( line_object=geoh5.get_entity("line_ids")[0], line_id=101, diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 6f828a41a..7ee6fcd66 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -90,7 +90,7 @@ def test_ip_3d_run( topography_object=topography, data_object=potential.parent, conductivity_model=1e2, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", reference_model=1e-6, starting_model=1e-6, s_norm=0.0, diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 6184c201f..caba490ba 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -210,7 +210,7 @@ def test_joint_cross_gradient_inv_run( topography_object=topography, data_object=survey, potential_channel=data, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", potential_uncertainty=5e-4, tile_spatial=1, starting_model=100.0, diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index 295370853..412a8da78 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -225,7 +225,7 @@ def test_joint_surveys_conductivity_run( data_object=components.survey, starting_model=components.model, reference_model=5.0, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", ) driver_A = DC3DInversionDriver(params) driver_B = DC3DInversionDriver(params) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 45c7f2fee..70736a684 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -169,7 +169,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): z_norm=1.0, cooling_rate=1, lower_bound=0.75, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", background_conductivity=100.0, max_global_iterations=max_iterations, initial_beta_ratio=1e3, diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index fd34ff463..72786d8c0 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -66,7 +66,7 @@ def test_tipper_fwr_run( topography_object=components.topography, data_object=components.survey, starting_model=components.model, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", background_conductivity=1e2, txz_real_channel_bool=True, txz_imag_channel_bool=True, @@ -146,7 +146,7 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): y_norm=1.0, z_norm=1.0, alpha_s=1.0, - model_type="Resistivity (Ohm-m)", + model_type="Resistivity (ohm-m)", lower_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e3,