Skip to content

Rename composition_property struct#932

Merged
MFraters merged 1 commit into
GeodynamicWorldBuilder:mainfrom
alanjyu:rename_property_struct
Mar 31, 2026
Merged

Rename composition_property struct#932
MFraters merged 1 commit into
GeodynamicWorldBuilder:mainfrom
alanjyu:rename_property_struct

Conversation

@alanjyu
Copy link
Copy Markdown
Contributor

@alanjyu alanjyu commented Mar 31, 2026

Following #926, renamed Parameters::composition_property (a struct indicating all properties of one composition) to distinguish from composition_properties (a map linking composition indices with their composition_property). All renamed variables are internal so previous results and tests should not be affected.

I have also tested making composition_properties a vector and did not find it a good idea. Since users are allowed to assign arbitrary composition indices (as long as they are unique), handling this cleanly is more cumbersome with a vector.

The feature parser will come shortly after.

@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 23797376669

Details

  • 13 of 13 (100.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 98.467%

Totals Coverage Status
Change from base Build 23787134883: 0.0%
Covered Lines: 11114
Relevant Lines: 11287

💛 - Coveralls

@github-actions
Copy link
Copy Markdown

Benchmark Main Feature Difference (99.9% CI)
Slab interpolation simple none 1.312 ± 0.007 (s=334) 1.312 ± 0.007 (s=355) -0.1% .. +0.1%
Slab interpolation curved simple none 1.313 ± 0.008 (s=336) 1.313 ± 0.008 (s=352) -0.2% .. +0.2%
Spherical slab interpolation simple none 1.281 ± 0.009 (s=367) 1.281 ± 0.009 (s=338) -0.1% .. +0.2%
Slab interpolation simple curved CMS 1.351 ± 0.008 (s=345) 1.349 ± 0.006 (s=324) -0.3% .. -0.0%
Spherical slab interpolation simple CMS 1.624 ± 0.010 (s=282) 1.622 ± 0.009 (s=275) -0.3% .. +0.0%
Spherical fault interpolation simple none 1.298 ± 0.006 (s=364) 1.297 ± 0.010 (s=332) -0.2% .. +0.1%
Cartesian min max surface 3.102 ± 0.014 (s=146) 3.105 ± 0.021 (s=147) -0.1% .. +0.3%
Spherical min max surface 8.654 ± 0.103 (s=50) 8.654 ± 0.093 (s=56) -0.8% .. +0.7%

Copy link
Copy Markdown
Member

@MFraters MFraters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

In general I don't like abbreviations like cp_output and cp_parsed. I think it is clearer when it is written out. In this case the scope where those abbreviations are being used is very small and clear, so I think in this case it is fine.

@MFraters MFraters merged commit 8a508d6 into GeodynamicWorldBuilder:main Mar 31, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants