Skip to content

Fix vaccum name in materials#971

Merged
gonuke merged 34 commits into
svalinn:v3.2.4-rc1from
bam241:fix_vaccum
Jan 6, 2025
Merged

Fix vaccum name in materials#971
gonuke merged 34 commits into
svalinn:v3.2.4-rc1from
bam241:fix_vaccum

Conversation

@bam241

@bam241 bam241 commented Dec 11, 2024

Copy link
Copy Markdown
Member

This aims to follow up on #805.

Right now I just pulled @pshriwise branch and rebased it.

Description

This fixes the definition of the Graveyard and the Vacuum, to respectively exactly mat:Graveyard or mat:graveyard and mat:Vacuum or mat:vacuum"

Motivation and Context

the previous implementation would lead to detection of a vacuum where there was not, if the name of the material contained "vacuum" or "graveyard"

Changelog file

  • done ?

This works is sponsored by Proxima Fusion

@bam241

bam241 commented Dec 11, 2024

Copy link
Copy Markdown
Member Author

@gonuke in the issue you mention a solution that would be backward compatible with most model out there.

Do you have an idea of the backward compatibility we main encounter ? (so I can implement a fix :) )

@gonuke

gonuke commented Dec 11, 2024

Copy link
Copy Markdown
Member

@gonuke in the issue you mention a solution that would be backward compatible with most model out there.

Do you have an idea of the backward compatibility we main encounter ? (so I can implement a fix :) )

Not really... you all are the users 😀

Maybe it's not reasonable, but I just wanted to make sure it was considered.

@gonuke gonuke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for this cleanup @bam241 . I have a couple of minor questions, but otherwise it looks good.

If you want to consider this for the next release, you can update the base branch as v3.2.4-rc1. (It may require a rebase on that branch and reconciling conflicts in the ChangeLog.)

Comment thread src/dagmc/dagmcmetadata.cpp Outdated
Comment thread src/dagmc/dagmcmetadata.hpp Outdated
Comment on lines +363 to +371
const std::string graveyard_str_{"Graveyard"};
const std::string vacuum_str_{"Vacuum"};
const std::string vacuum_mat_str_{"mat:Vacuum"};
const std::string graveyard_mat_str_{"mat:Graveyard"};
const std::string reflecting_str_{"Reflecting"};
const std::string white_str_{"White"};
const std::string periodic_str_{"Periodic"};

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We frequently - but not always - convert these to lower case. Is there a reason to not just define them as lower case?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think they are only converted to lower case when comparing with a group name read from a h5 geometry.
My guess is the default if not lower case, but allowing some flexibility for the users.

I don't have preferences there, it is really up to you and Pat :)

@pshriwise as you are the initiator of the branch do you have a take on this ?

@bam241

bam241 commented Dec 13, 2024

Copy link
Copy Markdown
Member Author

@pshriwise @gonuke would it be interesting to add a setter for the Graveyard and Vacuum string.

Allowing users to change them on the DAGMC call instead of having to change the whole geometry definition?

That way we could ensure a little of backward compatibility.

we could keep the default as they are now, but allow some flexibility...

@bam241

bam241 commented Dec 13, 2024

Copy link
Copy Markdown
Member Author

@pshriwise @gonuke would it be interesting to add a setter for the Graveyard and Vacuum string.

Allowing users to change them on the DAGMC call instead of having to change the whole geometry definition?

That way we could ensure a little of backward compatibility.

we could keep the default as they are now, but allow some flexibility...

maybe @makeclean has also an opinion on my last question :)

@bam241 bam241 changed the base branch from develop to v3.2.4-rc1 January 6, 2025 15:18
@bam241

bam241 commented Jan 6, 2025

Copy link
Copy Markdown
Member Author

@gonuke I rebased against svalinn:v3.2.4-rc1 and changed the target branch.

about your comment, I guess I am not the one with the most expertise about this.
I keep as they were.

@bam241

bam241 commented Jan 6, 2025

Copy link
Copy Markdown
Member Author

(btw unit test didn't run after my rebase -- Do they only run on PR vs develop ?.)

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.

3 participants