Allow XML to have multiple archetype elements
#1874
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
Pull Request Test Coverage Report for Build 16057951560Details
💛 - Coveralls |
Downstream Build Status Report - 43e32f8 - 2025-07-03 18:29:02 +0000Build
|
abachma2
reviewed
Jul 3, 2025
| clean_outs() | ||
| # Cyclus simulation input for recipe including | ||
| sim_input = os.path.join(INPUT, "include_source_w_archetype.xml") | ||
| holdsrtn = [1] # needed because nose does not send() to test generator |
There was a problem hiding this comment.
Do we still need this if we don't use nose? Maybe this is outside the scope of this PR and should be a new issue.
There was a problem hiding this comment.
great question! I'm not sure where else things like this may exist, so it might be worth a new issue to clean these up
There was a problem hiding this comment.
Sounds good. I'll make a new issue for that then.
Improved documentation and comments Co-authored-by: Amanda Bachmann <abachmann@anl.gov> Signed-off-by: Paul Wilson <paul.wilson@wisc.edu>
dean-krueger
approved these changes
Jul 3, 2025
I think @trysarahtops will be eager to try this out to make her input files simpler! |
|
All the tests passed. Merging now. |
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.
The previous XML schema only allowed a single
archetypeblock to exist. This change allows multiplearchetypeblocks, as long as there is at least one.A motivating use case for this is to facilitate including XML snippets that contain long lists of facility prototypes that may be useful in many simulations. Without this change, the top level input file must include all the archetype specs for the archetypes that are used in those facilities. With this change, the archetype specs that are used in that included file can be included there to make sure they are available.
Fortunately, this required no code changes and only a change in our XML schema. We already processed archetypes in a way that didn't care how many blocks there were, nor cared if there were duplicates of the same archetype.
A test has been added that demonstrates how to use this kind of inclusion, which requires the
xpointermetadata in the include line.