Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"monitoring_directory": "",
"workspace_geoh5": "",
"inversion_type": "joint cross gradient",
"physical_property": [
""
],
"physical_property": "",
"forward_only": false,
"group_a": {
"main": true,
Expand Down
5 changes: 0 additions & 5 deletions simpeg_drivers/joint/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions simpeg_drivers/joint/joint_cross_gradient/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion simpeg_drivers/joint/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 | None = None

group_a: SimPEGGroup
group_a_multiplier: float = 1.0
Expand Down Expand Up @@ -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."""
Expand Down