Merge develop into ww_edge_cases to resolve conflict#10
Closed
jon-proximafusion wants to merge 9 commits into
Closed
Merge develop into ww_edge_cases to resolve conflict#10jon-proximafusion wants to merge 9 commits into
jon-proximafusion wants to merge 9 commits into
Conversation
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
…riting material with same name bug fix (openmc-dev#3984)
Bring the weight window edge case work up to date with develop. The only conflict was in openmc/examples.py, resolved by keeping the new sphere_with_shielded_pocket example (develop had no addition at that location) while retaining develop's other examples.py changes. Co-authored-by: jon-proxima <jon@proximafusion.com> Co-authored-by: John Tramm <jtramm@gmail.com>
|
oh wow this is much larger LOC than I thought, perhaps better to chop out the useful parts of 3968 and make new PRs |
Author
|
Closing this in favor of splitting the two smallest, independent weight window fixes into focused standalone PRs against develop: openmc-dev#3990 (zero or negative lower bound turns the game off) and openmc-dev#3991 (scale the cutoff with the window normalization). That avoids pulling all of develop into this branch. The remaining develop conflict on openmc-dev#3968 is best resolved by you on the branch directly. |
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
7 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.
Brings the
ww_edge_casesbranch (PR openmc-dev#3968) up to date with currentdevelop, which it currentlyconflicts with.
Merging
developin produced a single conflict, inopenmc/examples.py:develophad no addition atthe end of the file, while this branch adds the
sphere_with_shielded_pocketexample. Resolved by keepingthat example.
develop's otherexamples.pychange (replacingC0with elemental carbon) is retained,and everything else (model.py, constants.h, the C++ sources, and the tests) merged automatically.
Merging this makes openmc-dev#3968 conflict-free and current with
develop.