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
3 changes: 2 additions & 1 deletion simpeg_drivers/joint/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ def data_misfit(self):
fun.name = f"Group_{label.upper()}:Tile_{ii}"

multipliers += [
getattr(self.params, f"group_{label}_multiplier") ** 2.0
(getattr(self.params, f"group_{label}_multiplier") or 1.0)
** 2.0
] * len(driver.data_misfit.objfcts)

if self.client:
Expand Down
3 changes: 3 additions & 0 deletions simpeg_drivers/joint/joint_petrophysics/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from typing import ClassVar

from geoh5py.data import FloatData, ReferencedData
from geoh5py.groups import SimPEGGroup
from geoh5py.objects import Octree

from simpeg_drivers import assets_path
Expand Down Expand Up @@ -49,6 +50,8 @@ class JointPetrophysicsOptions(BaseJointOptions):
title: str = "Joint Petrophysically Guided Inversion (PGI)"
inversion_type: str = "joint petrophysics"

group_a_multiplier: float | None = None
group_b_multiplier: float | None = None
group_b: SimPEGGroup | None = None
mesh: Octree
models: JointPetrophysicsModelOptions
15 changes: 14 additions & 1 deletion tests/run_tests/driver_joint_pgi_homogeneous_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def test_homogeneous_run(
orig_data = []
petrophysics = None
gradient_rotation = None
mesh = None

for suffix in "AB":
components = SyntheticsComponents(
geoh5=geoh5,
Expand Down Expand Up @@ -226,6 +226,19 @@ def test_homogeneous_run(
)
drivers.append(MagneticInversionDriver(params))

# Test if single group is valid
params = JointPetrophysicsOptions.build(
topography_object=topography,
geoh5=geoh5,
group_a=drivers[0].out_group,
mesh=global_mesh,
petrophysical_model=petrophysics,
)
driver = JointPetrophysicsDriver(params)
assert len(driver.data_misfit.objfcts) == 1
assert driver.data_misfit.multipliers == [1.0]

# Re-build full
params = JointPetrophysicsOptions.build(
topography_object=topography,
geoh5=geoh5,
Expand Down