Skip to content

refactor: Reinvent AtomTypeMix into IsotopeMix - #2221

Merged
trisyoungs merged 19 commits into
dissolve2/remove-configuration-atomtypemixfrom
dissolve2/refactor-atomtypemix
Aug 15, 2025
Merged

refactor: Reinvent AtomTypeMix into IsotopeMix#2221
trisyoungs merged 19 commits into
dissolve2/remove-configuration-atomtypemixfrom
dissolve2/refactor-atomtypemix

Conversation

@trisyoungs

@trisyoungs trisyoungs commented Aug 13, 2025

Copy link
Copy Markdown
Member

Follows #2219

This PR focuses on the AtomTypeMix and associated classes AtomTypeData and IsotopeData and simplify / combining them into a single class IsotopeMix providing all functionality. IsotopeMix stores a lot less data than AtomTypeMix at the expense of having to calculate values when required, but since these values are not needed in hot loops IMO this is a reasonable compromise.

I have tried to minimised impact in other classes, but XRayWeights warranted a partial refactor here. Also, the unit test associated to AtomTypeMix is removed as functionality of IsotopeMix is well-covered in tests of the NeutronWeights class (the principal user of IsotopeMix).

@trisyoungs trisyoungs changed the title StufStufff refactor: Update weights classes, reinvent AtomTypeMix Aug 13, 2025
@trisyoungs
trisyoungs force-pushed the dissolve2/refactor-atomtypemix branch from d686afd to 0d69642 Compare August 13, 2025 15:26
@trisyoungs trisyoungs changed the title refactor: Update weights classes, reinvent AtomTypeMix refactor: Reinvent AtomTypeMix into IsotopeMix Aug 15, 2025
@trisyoungs
trisyoungs marked this pull request as ready for review August 15, 2025 09:40

@RobBuchananCompPhys RobBuchananCompPhys left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Review in progress! Will try and get to the end after lunch.

@trisyoungs
trisyoungs merged commit a837436 into dissolve2/remove-configuration-atomtypemix Aug 15, 2025
@trisyoungs
trisyoungs deleted the dissolve2/refactor-atomtypemix branch August 15, 2025 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants