Particle property Solid Comp #1692
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
added 2 commits
May 15, 2017 17:32
…e depletion. This can be used to track a simplistic petrological evolution of material in the model.
|
Property renamed as requested @gassmoeller |
|
/run-tests |
…nged name from peridotite to composition.
|
Changes made. Now tracks all composition fields. |
gassmoeller
reviewed
May 17, 2017
doc/modules/changes/20170515_schools
Outdated
| if there is a compositonal field named "porosity". | ||
| if there is a compositonal field named "porosity". A second new particle property | ||
| is also added which indicates the peridotite depletion value. This can be used | ||
| to track the petrological evolution of material. |
| { | ||
| std::ostringstream field_name; | ||
| field_name << this->introspection().name_for_compositional_index(i); | ||
| property_information.push_back(std::make_pair(field_name.str(),1)); |
There was a problem hiding this comment.
You can simplify these 3 lines into the following:
const std::string field_name = this->introspection().name_for_compositional_index(i);
property_information.push_back(std::make_pair(field_name,1));
added 2 commits
May 16, 2017 23:38
|
Requested changes made. Thank you for suffering through my ignorance and thank you for all your help over the last ten days. |
|
The last formality. You will need to download the Make a new commit and push your branch. Then the tester should pass, and this is ready to go. |
|
Patch applied |
|
Thanks! Ready to go. |
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.
I added a new particle property solid comp which records the peridotite depletion. I believe this is currently the best way in aspect to track the petrological evolution of the the model and in conjunction with pT path, can be used to compare to MELTS or other thermodynamic software/databases.