Removed interface compatibility. #1706
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
|
/run-tests |
|
Arushi, here the reaction terms are missing (need to be filled with 0). |
tjhei
reviewed
May 16, 2017
|
|
||
| virtual | ||
| double | ||
| entropy_derivative ( const double temperature, |
There was a problem hiding this comment.
This function was very long, I am using it as a private member just for this class.
There was a problem hiding this comment.
I think that makes sense. But you can then remove the virtual marker.
tjhei
reviewed
May 16, 2017
| @@ -649,6 +615,7 @@ namespace aspect | |||
| this->model_dependence.compressibility = NonlinearDependence::none; | |||
| this->model_dependence.specific_heat = NonlinearDependence::none; | |||
| this->model_dependence.thermal_conductivity = NonlinearDependence::none; | |||
| // this->model_dependence.entropy_derivative_temperature = NonlinearDependence::temperature; | |||
There was a problem hiding this comment.
From what I understood in the interface class, we don't have model dependence for entropy derivative. I removed the comment.
tjhei
approved these changes
May 16, 2017
|
Okay, makes sense! |
|
Rebase done. |
3 tasks
|
Addresses #1538. |
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.
In material_model/latent_heat_melt