Allow recursive includes in parameter files #6175
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
gassmoeller
force-pushed
the
recursive_include
branch
from
41f31a9 to
d893a70
Compare
tjhei
approved these changes
Dec 7, 2024
| `Some parameter` and `Some other parameter`, then the final file will use the value of | ||
| `Some parameter` from `file_b.prm`, but the value of `Some other parameter` from `file_a.prm`. | ||
|
|
||
| Also note, that the include statement can include the file path as relative or absolute path, |
There was a problem hiding this comment.
Suggested change
| Also note, that the include statement can include the file path as relative or absolute path, | |
| Also note, that the include statement can include the file path as a relative or absolute path, |
source/main.cc
Outdated
| // by making sure included files are unique, because we may have multiple | ||
| // files including the same file in a non-circular way. So we just limit | ||
| // the number of included files to a reasonable number. | ||
| Assert(n_included_files < 15, |
| @@ -1,10 +1,93 @@ | |||
| # test that output/original.prm is written correctly | |||
|
|
|||
| # based on no_flow.prm: | |||
| include $ASPECT_SOURCE_DIR/tests/no_flow.prm | |||
There was a problem hiding this comment.
Just an idea for the future: we could automatically add a comment in the original.prm that shows the include statement (or something like "# including content of :")
tjhei
approved these changes
Dec 9, 2024
|
Sorry I didn't get around to look at it earlier, but yes, I think this is cool :) |
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.
This PR addresses issue #6165 and allows to recursively include parameter files on several levels of input files. See there for a motivation and application cases that are now possible.
I also simplified one benchmark to show what is now possible with this change.
It is worth noting that this PR changes one existing behavior: Currently
includestatements in input files are not expanded when we copy the input file into the output directory asoriginal.prm, while with this PR they will contain the content of the included files. While this is a change, I actually think the new form is better, because it makes theoriginal.prmmore independent from the included file (so they continue to work exactly as they were when the output was generated, even if the base file changes).@MFraters I think you were interested in this feature ;-)