Skip to content

GEOPY-2190: Non-zero evaluation of the rotated gradient of a constant model #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
domfournier merged 4 commits into from
May 14, 2025
Merged

GEOPY-2190: Non-zero evaluation of the rotated gradient of a constant model #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b047cd2
Better check for floating actives
domfournier May 14, 2025
0cec365
Update unit test
domfournier May 14, 2025
6c44ade
Update mvi test target after grad operator change
domfournier May 14, 2025
05b2711
Merge branch 'release/0.3.0' into GEOPY-2190
domfournier May 14, 2025
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
5 changes: 4 additions & 1 deletion simpeg_drivers/utils/regularization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,10 @@ def set_rotated_operators(
grad_op_active = function.regularization_mesh.Pac.T @ (
grad_op @ function.regularization_mesh.Pac
)
active_faces = grad_op_active.max(axis=1).toarray().ravel() > 0
active_faces = np.isclose(
grad_op_active @ np.ones(function.regularization_mesh.n_cells), 0
)
active_faces &= grad_op_active.max(axis=1).toarray().ravel() != 0

setattr(
function.regularization_mesh,
Expand Down
2 changes: 1 addition & 1 deletion tests/run_tests/driver_mvi_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# To test the full run and validate the inversion.
# Move this file out of the test directory and run.

target_mvi_run = {"data_norm": 6.3559205278626525, "phi_d": 0.0091, "phi_m": 0.00603}
target_mvi_run = {"data_norm": 6.3559205278626525, "phi_d": 0.00933, "phi_m": 0.00401}


def test_magnetic_vector_fwr_run(
Expand Down
11 changes: 9 additions & 2 deletions tests/run_tests/driver_rotated_gradients_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# To test the full run and validate the inversion.
# Move this file out of the test directory and run.

target_run = {"data_norm": 0.006830937520353864, "phi_d": 0.0276, "phi_m": 0.0288}
target_run = {"data_norm": 0.006830937520353864, "phi_d": 0.0309, "phi_m": 0.028}


def test_gravity_rotated_grad_fwr_run(
Expand Down Expand Up @@ -142,13 +142,20 @@ def test_rotated_grad_run(
inactive_ind = run_ws.get_entity("active_cells")[0].values == 0
assert np.all(nan_ind == inactive_ind)

# Smooth functions should be zero for uniform model
for obj in driver.regularization.objfcts:
for smooth in obj.objfcts[1:]:
np.testing.assert_allclose(
smooth(np.ones(driver.models.n_active)), 0, atol=1e-6
)


if __name__ == "__main__":
# Full run
test_gravity_rotated_grad_fwr_run(
Path("./"),
n_grid_points=10,
refinement=(4, 8),
refinement=(6, 8),
)

test_rotated_grad_run(
Expand Down
Loading