FIX: eqcalculate: Calculate degrees of freedom based on Model #270
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
…tabase. When the Phase is defined in a Database with many more components than are defined to be active in the present calculation, _eqcalculate() would incorrectly calculate degrees of freedom based on all possible components, instead of the active ones.
bocklund
reviewed
Apr 6, 2020
bocklund
reviewed
Apr 6, 2020
bocklund
reviewed
Apr 6, 2020
bocklund
approved these changes
Apr 10, 2020
There was a problem hiding this comment.
Good that you added the Model argument. I think the only reason this was working for non-standard Models before was that the callables were already being built by equilibrium and passed down to _eqcalculate.
Removing the dead mode code is optional (though we should probably remove that from the calculate API for the next breaking change)
bocklund
added a commit
that referenced
this pull request
Apr 11, 2020
In reviewing #270, I overlooked the fact that `calculate` takes the argument `model`, which a caller could pass as a keyword argument to `_eqcalculate`. #270 changed `_eqcalculate` to explicitly take a `models` argument and pass it to `calculate`. This preserves the behavior from #270 and stays backwards compatible if anyone was using `model` as a keyword argument that got passed through to `calculate`.
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.
When the Phase is defined in a Database with many more components than are defined
to be active in the present calculation,
_eqcalculate()would incorrectly calculate degrees of freedom based on all possible components, instead of the active ones.This would then lead to errors inside
calculate(), when the length of the passedpointsarray would exceed themaximum_internal_dof.This fix does two things:
modelsobject, which is based on the active components.unpack_phasesto return only the active phases, instead of returning nothing and causing a fallback to all phases in the Database. (This wasn't a correctness issue, but it did cause unnecessary computation.)