Conflict resolution #2
Merged
Conversation
This file contains 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
Fix problem where inelastic S(a,b) was not scoring to mgXS tallies.
Avoid code repeat when setting up the basic data common to all universes (id, origin and rotation).
…nual Add section title for composition definition in the manual
Update mgXsClerk_class.f90
Due to a copy-paste error keyword 'origin' was used to check if 'rotation' is provided in the input dictionary.
Move reading of id, origin and rotation to `universe_inter`
Fix typos and add entries to User Manual.rst
Undefined materials will throw a fatal error. This should help catch any typos before running a whole simulation. Also fixed a few typos in the file.
Added a fatalError to material map
Can sample monoenergetic source particles (CE or MG) isotropically from a specified material. Sampling efficiency can be improved (or specific instances of a material can be targeted) by providing a bounding box.
Also increased the number of allowable rejections in the UFS volume sampling calculation - the previous was slightly conservative.
Some new benchmark problems
Determine the maximum value of the key without implicit assumptions.
Co-authored-by: valeriaRaffuzzi <108435337+valeriaRaffuzzi@users.noreply.github.com>
…esponse Density response
Update .gitignore to ignore build folder
Mikolaj-A-Kowalski
added a commit
that referenced
this pull request
Sep 4, 2024
Conflict resolution #2
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.
I don't think this is the most efficient way to do this with git, but I wanted to merge some PRs so I solved the conflicts!
Ideally if you accept this then the PR in main SCONE should get updated too, and then we can merge it straightforwardly. If there's a better way to do this let me know.