GEOPY-2773: Airborne FEM coaxial do not rotate transmitter, and ppm normalization needs to be ajusted#141
Merged
domfournier merged 4 commits intorelease/GA_4.8from May 1, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Updates GeoH5 saving directives and Dask-based sensitivity computation to better support configurable log filenames and revised parallel chunking behavior.
Changes:
- Clarify directive docstrings for predicted data and sensitivity outputs.
- Parameterize GeoH5-attached log file naming via a
base_nameinSaveLogFilesGeoH5. - Adjust Dask chunk splitting / parallel block evaluation logic in FDEM sensitivity computation and utilities.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
simpeg/directives/_save_geoh5.py |
Updates log-file saving/attachment behavior and improves directive docstrings. |
simpeg/dask/utils.py |
Replaces cpu_count() usage in block re-splitting with thread_count. |
simpeg/dask/electromagnetics/frequency_domain/simulation.py |
Refactors parallel sensitivity-row computation and thread-count handling for Dask execution. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
77
to
+83
| # # Re-split over cpu_count if too few blocks | ||
| if len(blocks) < thread_count and optimize: | ||
| flatten_blocks = [] | ||
| for block in blocks: | ||
| flatten_blocks += block | ||
|
|
||
| chunks = np.array_split(np.arange(len(flatten_blocks)), cpu_count()) | ||
| chunks = np.array_split(np.arange(len(flatten_blocks)), thread_count) |
Comment on lines
+69
to
+76
| for ind in indices: | ||
| if Ainv_deriv_u.ndim == 1: | ||
| deriv_columns = Ainv_deriv_u[:, np.newaxis] | ||
| else: | ||
| deriv_indices = np.arange( | ||
| count, count + blocks_receiver_derivs[ind].shape[1] | ||
| ) | ||
| deriv_columns = Ainv_deriv_u[:, deriv_indices] |
Comment on lines
+370
to
388
| n_rows = np.sum([addresses[ind][1][2] for ind in indices]) | ||
| delayed_eval = delayed(compute_rows) | ||
| block_delayed.append( | ||
| array.from_delayed( | ||
| delayed_eval( | ||
| simulation, | ||
| ATinvdf_duT, | ||
| np.arange(count, count + n_cols), | ||
| count, | ||
| blocks_receiver_derivs, | ||
| Zero(), | ||
| fields_array, | ||
| address, | ||
| addresses, | ||
| Jmatrix, | ||
| indices, | ||
| ), | ||
| dtype=np.float32, | ||
| shape=(n_rows, m_size), | ||
| ) | ||
| ) |
| ) | ||
| ) | ||
| else: | ||
| n_rows = np.sum([addresses[ind][1][2] for ind in indices]) |
| compute_row_size = np.ceil(self.max_chunk_size / (A_i.A.shape[0] * 32.0 * 1e-6)) | ||
| blocks = get_parallel_blocks( | ||
| self.survey.source_list, compute_row_size, optimize=True | ||
| self.survey.source_list, compute_row_size, optimize=False |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
GEOPY-2773 - Airborne FEM coaxial do not rotate transmitter, and ppm normalization needs to be ajusted