GEOPY-2046: Fix warning about differing number of parameters between ui_json and data.

simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json

@@ -105,6 +105,7 @@
         "parent": "mesh",
         "value": ""
     },
+    "save_sensitivities": false,
     "n_cpu": {
         "min": 1,
         "group": "Compute",

simpeg_drivers-assets/uijson/fdem1d_forward.ui.json

@@ -32,6 +32,11 @@
         "label": "Z imag component",
         "value": true
     },
+    "u_cell_size": {
+        "visible": false,
+        "label": "Vertical core cell size (m)",
+        "value": 0.0
+    },
     "v_cell_size": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -48,6 +53,11 @@
         "label": "Depth of core (m)",
         "value": 500.0
     },
+    "horizontal_padding": {
+        "visible": false,
+        "label": "Horizontal padding (m)",
+        "value": 1000.0
+    },
     "vertical_padding": {
         "min": 0.0,
         "group": "1D Mesh",

simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json

@@ -80,6 +80,11 @@
         "dependencyType": "enabled",
         "value": ""
     },
+    "u_cell_size": {
+        "visible": false,
+        "label": "Vertical core cell size (m)",
+        "value": 0.0
+    },
     "v_cell_size": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -96,6 +101,11 @@
         "label": "Depth of core (m)",
         "value": 500.0
     },
+    "horizontal_padding": {
+        "visible": false,
+        "label": "Horizontal padding (m)",
+        "value": 1000.0
+    },
     "vertical_padding": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -272,6 +282,7 @@
         "property": "",
         "enabled": true
     },
+    "length_scale_y": "",
     "length_scale_z": {
         "min": 0.0,
         "group": "Regularization",
@@ -285,6 +296,7 @@
         "property": "",
         "enabled": true
     },
+    "gradient_rotation": "",
     "s_norm": {
         "association": "Cell",
         "dataType": "Float",
@@ -319,6 +331,7 @@
         "enabled": true,
         "tooltip": "Lp-norm used in the x-smoothness term of the objective function."
     },
+    "y_norm": "",
     "z_norm": {
         "association": "Cell",
         "dataType": "Float",
@@ -547,6 +560,17 @@
         "value": "ram",
         "visible": false
     },
+    "max_chunk_size": {
+        "min": 0,
+        "group": "Compute",
+        "optional": true,
+        "enabled": true,
+        "label": "Maximum chunk size (Mb)",
+        "value": 128,
+        "verbose": 3,
+        "visible": false,
+        "tooltip": "Limit the chunk size used by Dask for distributed computation."
+    },
     "out_group": {
         "label": "SimPEG group",
         "value": "",

simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json

@@ -219,13 +219,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": "",

simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json

@@ -273,6 +273,7 @@
         "property": "",
         "enabled": true
     },
+    "length_scale_y": "",
     "length_scale_z": {
         "min": 0.0,
         "group": "Regularization",
@@ -335,6 +336,7 @@
         "enabled": true,
         "tooltip": "Lp-norm used in the x-smoothness term of the objective function."
     },
+    "y_norm": "",
     "z_norm": {
         "association": "Cell",
         "dataType": "Float",

simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json

@@ -428,6 +428,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,

simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json

@@ -228,7 +228,6 @@
         "parent": "mesh",
         "value": ""
     },
-    "output_tile_files": false,
     "alpha_s": {
         "min": 0.0,
         "group": "Regularization",
@@ -257,6 +256,7 @@
         "property": "",
         "enabled": true
     },
+    "length_scale_y": "",
     "length_scale_z": {
         "min": 0.0,
         "group": "Regularization",
@@ -319,6 +319,7 @@
         "enabled": true,
         "tooltip": "Lp-norm used in the x-smoothness term of the objective function."
     },
+    "y_norm": "",
     "z_norm": {
         "association": "Cell",
         "dataType": "Float",

simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json

@@ -186,6 +186,17 @@
         "value": 1.0,
         "enabled": false
     },
+    "gradient_rotation": {
+        "group": "Regularization",
+        "association": "Cell",
+        "dataType": "Float",
+        "dataGroupType": "Dip direction & dip",
+        "label": "Gradient rotation",
+        "optional": true,
+        "enabled": false,
+        "parent": "mesh",
+        "value": ""
+    },
     "s_norm": {
         "min": 0.0,
         "max": 2.0,
@@ -415,6 +426,7 @@
         "value": "Pardiso"
     },
     "tile_spatial": 1,
+    "parallelized": true,
     "store_sensitivities": {
         "choiceList": [
             "disk",

simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json

@@ -505,6 +505,7 @@
         "tooltip": "Direct solver to use for the forward calculations",
         "value": "Pardiso"
     },
+    "parallelized": true,
     "tile_spatial": 1,
     "store_sensitivities": {
         "choiceList": [

simpeg_drivers-assets/uijson/tdem1d_forward.ui.json

@@ -9,7 +9,7 @@
     "monitoring_directory": "",
     "workspace_geoh5": "",
     "inversion_type": "tdem 1d",
-    "physical property": "conductivity",
+    "physical_property": "conductivity",
     "forward_only": true,
     "data_object": {
         "main": true,
@@ -33,12 +33,19 @@
         "tooltip": "Set the units of the data.",
         "value": "dB/dt (T/s)"
     },
+    "x_channel_bool": false,
+    "y_channel_bool": false,
     "z_channel_bool": {
         "group": "Survey",
         "main": true,
         "label": "Z component",
         "value": true
     },
+    "u_cell_size": {
+        "visible": false,
+        "label": "Vertical core cell size (m)",
+        "value": 0.0
+    },
     "v_cell_size": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -55,6 +62,11 @@
         "label": "Depth of core (m)",
         "value": 500.0
     },
+    "horizontal_padding": {
+        "visible": false,
+        "label": "Vertical padding (m)",
+        "value": 0.0
+    },
     "vertical_padding": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -189,6 +201,17 @@
         "visible": false,
         "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library."
     },
+    "max_chunk_size": {
+        "min": 0,
+        "group": "Compute",
+        "optional": true,
+        "enabled": true,
+        "label": "Maximum chunk size (Mb)",
+        "value": 128,
+        "verbose": 3,
+        "visible": false,
+        "tooltip": "Limit the chunk size used by Dask for distributed computation."
+    },
     "out_group": {
         "label": "SimPEG group",
         "value": "",

simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json

@@ -33,6 +33,8 @@
         "tooltip": "Set the units of the data.",
         "value": "dB/dt (T/s)"
     },
+    "x_channel": "",
+    "y_channel": "",
     "z_channel": {
         "association": [
             "Cell",
@@ -48,6 +50,8 @@
         "enabled": true,
         "value": ""
     },
+    "x_uncertainty": "",
+    "y_uncertainty": "",
     "z_uncertainty": {
         "association": [
             "Cell",
@@ -63,6 +67,11 @@
         "dependencyType": "enabled",
         "value": ""
     },
+    "u_cell_size": {
+        "visible": false,
+        "label": "Vertical core cell size (m)",
+        "value": 0.0
+    },
     "v_cell_size": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -79,6 +88,11 @@
         "label": "Depth of core (m)",
         "value": 500.0
     },
+    "horizontal_padding": {
+        "visible": false,
+        "label": "Vertical padding (m)",
+        "value": 0.0
+    },
     "vertical_padding": {
         "min": 0.0,
         "group": "1D Mesh",
@@ -250,6 +264,7 @@
         "property": "",
         "enabled": true
     },
+    "length_scale_y": "",
     "length_scale_z": {
         "min": 0.0,
         "group": "Regularization",
@@ -263,6 +278,7 @@
         "property": "",
         "enabled": true
     },
+    "gradient_rotation": "",
     "s_norm": {
         "association": "Cell",
         "dataType": "Float",
@@ -297,6 +313,7 @@
         "enabled": true,
         "tooltip": "Lp-norm used in the x-smoothness term of the objective function."
     },
+    "y_norm": "",
     "z_norm": {
         "association": "Cell",
         "dataType": "Float",
@@ -524,6 +541,17 @@
         "value": "ram",
         "visible": false
     },
+    "max_chunk_size": {
+        "min": 0,
+        "group": "Compute",
+        "optional": true,
+        "enabled": true,
+        "label": "Maximum chunk size (Mb)",
+        "value": 128,
+        "verbose": 3,
+        "visible": false,
+        "tooltip": "Limit the chunk size used by Dask for distributed computation."
+    },
     "out_group": {
         "label": "SimPEG group",
         "value": "",

simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py

@@ -38,6 +38,7 @@ class IP3DForwardOptions(BaseForwardOptions):
     inversion_type: str = "induced polarization 3d"
 
     chargeability_channel_bool: bool = True
+    model_type: str = "Conductivity (S/m)"
     conductivity_model: float | FloatData
 
 
@@ -61,5 +62,6 @@ class IP3DInversionOptions(BaseInversionOptions):
 
     chargeability_channel: FloatData
     chargeability_uncertainty: float | FloatData | None = None
+    model_type: str = "Conductivity (S/m)"
     conductivity_model: float | FloatData
     lower_bound: float | FloatData | None = 0.0

simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py

@@ -50,6 +50,7 @@ class IP2DForwardOptions(BaseForwardOptions):
     line_selection: LineSelectionOptions
     mesh: DrapeModel | None = None
     drape_model: DrapeModelOptions = DrapeModelOptions()
+    model_type: str = "Conductivity (S/m)"
     conductivity_model: float | FloatData
 
 
@@ -81,6 +82,7 @@ class IP2DInversionOptions(BaseInversionOptions):
     line_selection: LineSelectionOptions
     mesh: DrapeModel | None = None
     drape_model: DrapeModelOptions = DrapeModelOptions()
+    model_type: str = "Conductivity (S/m)"
     conductivity_model: float | FloatData
     lower_bound: float | FloatData | None = 0.0
     length_scale_y: None = None

simpeg_drivers/electromagnetics/frequency_domain_1d/params.py

@@ -67,7 +67,6 @@ class FDEM1DInversionOptions(FDEMInversionOptions):
 
     title: str = "Frequency-domain EM-1D (FEM-1D) Inversion"
     inversion_type: str = "fdem 1d"
-    y_norm: None = None
     drape_model: DrapeModelOptions = DrapeModelOptions(
         u_cell_size=10.0,
         v_cell_size=10.0,
@@ -78,3 +77,5 @@ class FDEM1DInversionOptions(FDEMInversionOptions):
     )
     auto_scale_misfits: bool = False
     sens_wts_threshold: float = 100.0
+    length_scale_y: None = None
+    y_norm: None = None

simpeg_drivers/utils/meshes.py

@@ -122,6 +122,7 @@ def auto_mesh_parameters(
                     "levels": topography_refinement,
                     "horizon": True,
                 },
+                None,
             ],
             "out_group": out_group,
         }

tests/data_test.py

@@ -128,7 +128,6 @@ def test_survey_data(tmp_path: Path):
             mesh=mesh,
             starting_model=0.0,
             tile_spatial=2,
-            resolution=0.0,
         )
 
         driver = MVIInversionDriver(params)