From 578c92764b32757fd6ff8ee0e6ff3e9dd2a57550 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 27 May 2025 09:52:28 -0700 Subject: [PATCH 1/4] Rever physical property value for cross gradient --- .../uijson/joint_cross_gradient_inversion.ui.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 588f294d..c58b0d97 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -9,9 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "joint cross gradient", - "physical_property": [ - "" - ], + "physical_property": "", "forward_only": false, "group_a": { "main": true, From 9cc8543a52b98b0a1ca5ecfa9056e5ac41bbf569 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 29 May 2025 13:01:31 -0700 Subject: [PATCH 2/4] Fix option class --- simpeg_drivers/joint/joint_cross_gradient/options.py | 2 -- simpeg_drivers/joint/options.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/simpeg_drivers/joint/joint_cross_gradient/options.py b/simpeg_drivers/joint/joint_cross_gradient/options.py index 923429ed..3c79e150 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/options.py +++ b/simpeg_drivers/joint/joint_cross_gradient/options.py @@ -38,8 +38,6 @@ class JointCrossGradientOptions(BaseJointOptions): ) title: str = "Joint Cross Gradient Inversion" - physical_property: list[str] = [""] - inversion_type: str = "joint cross gradient" mesh: Octree | None = None diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index 7e033bae..b0c62ab4 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -44,7 +44,7 @@ class BaseJointOptions(BaseData): run_command: str = "simpeg_drivers.driver" conda_environment: str = "simpeg-drivers" forward_only: bool = False - physical_property: list[str] = ["conductivity"] + physical_property: str = "" group_a: SimPEGGroup group_a_multiplier: float = 1.0 From 000cf77f81e16dea0782ac8221d9bcca004916be Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 29 May 2025 13:12:18 -0700 Subject: [PATCH 3/4] Fix overwriting of physical properties --- simpeg_drivers/joint/driver.py | 5 ----- simpeg_drivers/joint/options.py | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index fc90167a..927015ef 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -68,19 +68,14 @@ def drivers(self) -> list[InversionDriver] | None: """List of inversion drivers.""" if self._drivers is None: drivers = [] - physical_property = [] # Create sub-drivers for group in self.params.groups: _ = group.options # Triggers something... otherwise ui_json is empty group = group.copy(parent=self.params.out_group) - driver = simpeg_group_to_driver(group, self.workspace) - - physical_property.append(driver.params.physical_property) drivers.append(driver) self._drivers = drivers - self.params.physical_property = physical_property return self._drivers diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index b0c62ab4..acef6783 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -101,6 +101,11 @@ class BaseJointOptions(BaseData): percentile: float = 95.0 epsilon_cooling_factor: float = 1.2 + n_workers: int | None = 1 + n_threads: int | None = None + max_ram: float | None = None + performance_report: bool = False + @property def groups(self) -> list[SimPEGGroup]: """List all active groups.""" From 563d1a481e2e5f045e96ec9066a3c9db9b79efda Mon Sep 17 00:00:00 2001 From: dominiquef Date: Thu, 29 May 2025 14:00:28 -0700 Subject: [PATCH 4/4] Allow None for phys prop on joint --- simpeg_drivers/joint/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index acef6783..ee36906a 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -44,7 +44,7 @@ class BaseJointOptions(BaseData): run_command: str = "simpeg_drivers.driver" conda_environment: str = "simpeg-drivers" forward_only: bool = False - physical_property: str = "" + physical_property: str | None = None group_a: SimPEGGroup group_a_multiplier: float = 1.0