Prelude to YAML serialization #795
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
Codecov Report
@@ Coverage Diff @@
## master #795 +/- ##
=========================================
+ Coverage 71.44% 71.54% +0.1%
=========================================
Files 372 372
Lines 43952 44348 +396
=========================================
+ Hits 31400 31730 +330
- Misses 12552 12618 +66
Continue to review full report at Codecov.
|
For entries that are lists of maps in the general case but often only contain one item, it is convenient to allow them to be provided as just a map. This modifies methods used to work with vectors of AnyMap objects to handle the case where the child object is just a map.
This allows for error checking at the time of adding the alias, as well as providing a public interface for adding aliases.
The first phase in a Kinetics object is not necessarily the reacting phase for Kinetics objects loaded from CTI/XML files, but is for YAML files.
speth
force-pushed
the
yaml-serialization-prep
branch
from
5579ea4
to
8772272
Compare
bryanwweber
reviewed
Jan 15, 2020
bryanwweber
reviewed
Jan 15, 2020
speth
force-pushed
the
yaml-serialization-prep
branch
from
8772272
to
5545939
Compare
bryanwweber
reviewed
Jan 15, 2020
bryanwweber
previously approved these changes
Jan 15, 2020
bryanwweber
dismissed
their stale review
Didn't mean to request/submit review
Ensure that the name returned by Sub::name() is a name that can be used to reconstruct a substance of the same type. Make phase names in liquidvapor.yaml match the substance model names.
After calculating properties using finite differences (e.g. cp), the fluid was returned to its original state by setting the state in terms of pressure and temperature. However, because setting the state using these variables is an iterative calculation with some error tolerance, the state was not restored exactly. By restoring the state based on the initial temperature and density, the restored state is identical to the initial state.
speth
force-pushed
the
yaml-serialization-prep
branch
from
5545939
to
cdef8c7
Compare
bryanwweber
approved these changes
Jan 20, 2020
doc/sphinx/yaml/phases.rst
Outdated
| One of ``solvent``, ``charged-species``, ``weak-acid-associated``, | ||
| ``strong-acid-associated``, ``polar-neutral``, or ``nonpolar-neutral``. | ||
| The types ``solvent``, ``charged-species``, and ``nonpolar-neutral`` can be | ||
| inferred automatically. |
There was a problem hiding this comment.
Can you add something here about how these types are automatically inferred?
doc/sphinx/yaml/phases.rst
Outdated
| inferred automatically. | ||
|
|
||
| ``weak-acid-charge`` | ||
| Charge to use for species can break apart into charged species. |
There was a problem hiding this comment.
Suggested change
| Charge to use for species can break apart into charged species. | |
| Charge to use for species that can break apart into charged species. |
doc/sphinx/yaml/species.rst
Outdated
| the ``ideal-gas`` model is assumed. | ||
| A mapping or list of mappings. Each mapping contains an equation of state | ||
| model specification for the species, any parameters for that model, and any | ||
| parameters for interactions with other species. :ref:`sec-yaml-species-eos`. |
There was a problem hiding this comment.
Is the reference intended to be a complete sentence here?
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.
Checklist
scons build&scons test) and unit tests address code coverageTo make the upcoming PR which implements serialization to the YAML format a bit smaller and more manageable, I have extracted a number of commits which resolve some issues that I encountered and interface additions that I found were needed while implementing serialization, which can be considered separately.
Changes proposed in this pull request
AnyMapclass, including:clear()method__file__) when iteratingAnyMaptreeequation-of-statefield to allow multiple model options