Merge rift_O4d_junior into rift_O4d#143
Merged
oshaughn merged 8 commits intoJun 11, 2026
Merged
Conversation
# Conflicts: # .github/workflows/ci.yml # .gitlab-ci.yml
…glob) The auto-wired consolidate_dgrid / consolidate_dslice post-extrinsic jobs never produced all_dgrid.dat: every run needed a hand consolidation. Two bugs: 1. write_consolidate_distance_grids_sub wrote 'cd <search_dir>' into the shell driver, and the caller passed search_dir=.../iteration_$(macroiteration)_ile. Condor macros are only substituted in .sub files, never inside a shell script, so bash saw a literal $(macroiteration) (command substitution -> empty) and cd'd into 'iteration__ile' (no such dir) -> the consolidate node failed and retried forever. 2. The input glob 'EXTR_out.xml_*_.dgrid' has no '-<event>' infix, so it matched none of the real per-event batched-extrinsic outputs EXTR_out-<event>.xml_<k>_.dgrid. Fix: glob search_dir/input_glob directly (no cd, no macro); callers pass an iteration_*_ile wildcard for search_dir and EXTR_out*.xml_*_.dgrid (and .dslice) for the glob. Verified: the generated command consolidates 1000 .dgrid -> 5000 rows on a real distance_grid_e2e run. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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
2 participants
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.
Reconciles commits that landed in oshaughnessy-junior/rift_O4d_junior but were not present in oshaughn/rift_O4d.\n\nThis PR is a clean merge of oshaughnessy-junior/rift_O4d_junior into oshaughn/rift_O4d; the local merge-tree check completed without conflicts.\n\nAlso reconciled oshaughnessy-junior/rift_O4d_junior_calmarg_in_loop separately via merge commit 5043f94.