Adding mixture of initial sources #150
Merged
Conversation
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
Update rng in PPs after source generation
| !! Sample particle Energy/Group and angle Angle | ||
| !! Sample particle Energy/Group and angle | ||
| !! | ||
| !! Sets diraction of a particle together with its energy. |
Collaborator
There was a problem hiding this comment.
Suggested change
| !! Sets diraction of a particle together with its energy. | |
| !! Sets direction of a particle together with its energy. |
| !! See source_inter for details | ||
| !! | ||
| !! Errors: | ||
| !! - when the number of weigths doesn't correspond to the number of sources |
Collaborator
There was a problem hiding this comment.
Suggested change
| !! - when the number of weigths doesn't correspond to the number of sources | |
| !! - when the number of weights doesn't correspond to the number of sources |
SharedModules/genericProcedures.f90
Outdated
| w = dir(3) | ||
|
|
||
| ! Perform standard roatation. Note that indexes are parametrised | ||
| ! Perform standard rotation. Note that indexes are parametrised |
Collaborator
There was a problem hiding this comment.
Suggested change
| ! Perform standard rotation. Note that indexes are parametrised | |
| ! Perform standard rotation. Note that indexes are parameterised |
Tallies/tallyAdmin_class.f90
Outdated
|
|
||
| end do | ||
|
|
||
| ! Register all clerks to recive their reports |
Collaborator
There was a problem hiding this comment.
Suggested change
| ! Register all clerks to recive their reports | |
| ! Register all clerks to receive their reports |
Tallies/tallyAdmin_class.f90
Outdated
|
|
||
| end do | ||
|
|
||
| ! Verify that final memLoc and memSize are consistant |
Collaborator
There was a problem hiding this comment.
Suggested change
| ! Verify that final memLoc and memSize are consistant | |
| ! Verify that final memLoc and memSize are consistent |
| !! | ||
| !! Result: | ||
| !! Null is source is not of ceNuclearDatabase class | ||
| !! Null if source is not of ceNuclearDatabase class |
Collaborator
There was a problem hiding this comment.
Suggested change
| !! Null if source is not of ceNuclearDatabase class | |
| !! Null if source is not of ceNeutronDatabase class |
| !! Result: | ||
| !! Null is source is not of ceNuclearDatabase class | ||
| !! Null if source is not of ceNuclearDatabase class | ||
| !! Target points to source if source is ceNuclearDatabase class |
Collaborator
There was a problem hiding this comment.
Suggested change
| !! Target points to source if source is ceNuclearDatabase class | |
| !! Target points to source if source is ceNeutronDatabase class |
| !! Sample particle Energy/Group and angle Angle | ||
| !! Sample particle Energy/Group and angle | ||
| !! | ||
| !! Sets diraction of a particle together with its energy. |
Collaborator
There was a problem hiding this comment.
Suggested change
| !! Sets diraction of a particle together with its energy. | |
| !! Sets direction of a particle together with its energy. |
| use particle_class, only : particleState | ||
|
|
||
| ! Source | ||
| use source_inter, only : source |
Collaborator
There was a problem hiding this comment.
Suggested change
| use source_inter, only : source | |
| use source_inter, only : source |
| character(100), parameter :: Here = 'init (mixSource_class.f90)' | ||
|
|
||
| ! Get number of sources | ||
| N = size(self % sources) |
Collaborator
There was a problem hiding this comment.
This is a bit bewildering. Might be good to highlight that sources has already been initialised elsewhere due to trying to avoid circular dependencies.
| if (size(weights) /= N) then | ||
| call fatalError(Here, 'The number of sources and weights is not the same') | ||
| end if | ||
| if (any(weights == ZERO)) call fatalError(Here, 'Some of the weights are zero') |
Collaborator
There was a problem hiding this comment.
Don't we also want to ensure weights are positive?
Suggested change
| if (any(weights == ZERO)) call fatalError(Here, 'Some of the weights are zero') | |
| if (any(weights <= ZERO)) call fatalError(Here, 'Some of the weights are not positive') |
ChasingNeutrons
requested changes
Jan 25, 2025
Collaborator
ChasingNeutrons
left a comment
ChasingNeutrons
left a comment
There was a problem hiding this comment.
Looks good, just a few small things.
added 2 commits
January 25, 2025 17:25
Update rng in PPs after source generation
ChasingNeutrons
approved these changes
Jan 25, 2025
Closed
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.
I've added a source which is a combination of sources, each assigned a weight (or probability). The mixSource samples which source is actually used from the weights. the sources inside mixSource have to be built inside the Factory, which is a bit unusual; however it's necessary to avoid circular dependencies.
This PR also advances the RNG in both fixedSource and eigen PP after source generation, as this was not done before and resulting in a considerable bias in fixed source mode D: