Skip to content

Commit 04a2d5a

Browse files
authored
Merge pull request #217 from MiraGeoscience/GEOPY-2208
GEOPY-2208: Investigate physical_property validation error
2 parents 6811603 + 563d1a4 commit 04a2d5a

4 files changed

Lines changed: 7 additions & 11 deletions

File tree

simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
"monitoring_directory": "",
1010
"workspace_geoh5": "",
1111
"inversion_type": "joint cross gradient",
12-
"physical_property": [
13-
""
14-
],
12+
"physical_property": "",
1513
"forward_only": false,
1614
"group_a": {
1715
"main": true,

simpeg_drivers/joint/driver.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,14 @@ def drivers(self) -> list[InversionDriver] | None:
6868
"""List of inversion drivers."""
6969
if self._drivers is None:
7070
drivers = []
71-
physical_property = []
7271
# Create sub-drivers
7372
for group in self.params.groups:
7473
_ = group.options # Triggers something... otherwise ui_json is empty
7574
group = group.copy(parent=self.params.out_group)
76-
7775
driver = simpeg_group_to_driver(group, self.workspace)
78-
79-
physical_property.append(driver.params.physical_property)
8076
drivers.append(driver)
8177

8278
self._drivers = drivers
83-
self.params.physical_property = physical_property
8479

8580
return self._drivers
8681

simpeg_drivers/joint/joint_cross_gradient/options.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ class JointCrossGradientOptions(BaseJointOptions):
3838
)
3939

4040
title: str = "Joint Cross Gradient Inversion"
41-
physical_property: list[str] = [""]
42-
4341
inversion_type: str = "joint cross gradient"
4442

4543
mesh: Octree | None = None

simpeg_drivers/joint/options.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class BaseJointOptions(BaseData):
4444
run_command: str = "simpeg_drivers.driver"
4545
conda_environment: str = "simpeg-drivers"
4646
forward_only: bool = False
47-
physical_property: list[str] = ["conductivity"]
47+
physical_property: str | None = None
4848

4949
group_a: SimPEGGroup
5050
group_a_multiplier: float = 1.0
@@ -101,6 +101,11 @@ class BaseJointOptions(BaseData):
101101
percentile: float = 95.0
102102
epsilon_cooling_factor: float = 1.2
103103

104+
n_workers: int | None = 1
105+
n_threads: int | None = None
106+
max_ram: float | None = None
107+
performance_report: bool = False
108+
104109
@property
105110
def groups(self) -> list[SimPEGGroup]:
106111
"""List all active groups."""

0 commit comments

Comments
 (0)