Query NASA Curve Fit Type from XML file #255
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
- std::unique_ptr to hold XML doc - default destructor
Mainly to reduce code duplication of error message
Also deprecating current constructor which doesn't allow for phase name specification
Start throwing warnings in the appropriate circumstances and introduce local start_block variable to help track where we start and separate that from the phase block, etc.
Need this to be able to handle multiple species data and reaction set data (with multiple phases) in the same XML file.
If there is a phase block, we check the speciesArray/datasrc and reactionArray/datasrc attributes (error out if they're not there) and then set the apporiate XML pointers to the right places in the file. Note we adhere to what I believe is Cantera's convention of putting a '#' at the beginning of the name to refer to internal blocks (as opposed to external filenames, like elements.xml).
Deprecated old constructor (in a previous commit). Also went ahead and moved default constructor from private to explicitly using delete keyword.
We set the phase name which will trigger parsing by the speciesArray and reactionArray names in the XML file
Explicitly testing several components of parsing. Note that Issue libantioch#253 was uncovered as part of this.
Function to query whether there's NASA7 or NASA9 curve fits in the XML file so that the proper function can be called.
Leverage existing tests, but we do hit both NASA7 and NASA9 cases.
|
Will merge this and #254 in the morning if there are no objections. |
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.
Should be merged after #254.
Closes #251.
Added function that queries the XML file. We just look at the first species and check for the key for NASA7 or NASA9 and error if it's not one of the two. We rely on the subsequent parsing of the thermo during the
read_thermodynamic_datacall to catch inconsistent/mixed use of NASA7 and NASA9. There is unit testing of both NASA7 and NASA9 cases.