Merged
Conversation
c27ef09 to
8e23d8c
Compare
This file contains hidden or 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
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.
This pull request introduces improvements to the thermobarometry inversion framework in BurnMan, focusing on how uncertainties in pressure and temperature ("state uncertainties") are handled and incorporated into misfit calculations.
Updates
tools.thermobarometry.assemblage_affinity_covariance_matrix()andtools.thermobarometry.assemblage_affinity_misfit(). Including state uncertainties increases the total uncertainties and decreases the misfit corresponding to reaction affinities.tools.thermobarometry.assemblage_state_misfit()function to calculate a misfit based on prior state (P, T) and uncertainties.tools.thermobarometry.estimate_conditions()to optionally use the newtools.thermobarometry.assemblage_state_misfit()function. This also fixes a bug - the old code internally calculated Cov([P, T])^-1 using pinv, which because of the inherent difference in scales resulted in an erroneous zero eigenvalue.examples/example_optimal_thermobarometry.pyand output to use the newtools.thermobarometry.assemblage_state_misfit()function. The change in output reflects the bug fix described above.tests.test_tools.pycovering the new functionality.burnman/optimize/linear_fitting.py