Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Refactor depcode #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 32 commits into from
Dec 8, 2021
Merged

Refactor depcode #64

merged 32 commits into from
Dec 8, 2021

Conversation

@yardasol
Copy link
Contributor

This PR changes the structure of the Depcode class to use python's Abstract Base Class to make the changes outlined in #59 .

This PR also adjusts the import statements in the test suite to match the new class names.

@yardasol yardasol added this to the OpenMC support milestone Oct 15, 2021
@pep8speaks
Copy link
Contributor

pep8speaks commented Oct 15, 2021 •
edited
Loading

Hello @yardasol! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2021-12-07 18:38:35 UTC

gwenchee
gwenchee requested changes Oct 25, 2021
View reviewed changes
Copy link
Contributor

@gwenchee gwenchee left a comment

Choose a reason for hiding this comment

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

Looks good. I have some comments about variable naming etc. Also, you seem to have some pep8 issues.

saltproc/depcode.py Outdated
----------
dep_file : str
Path to file containing results of depletion simulation
moment : int
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesnt seem very intuitive. Why not a boolean with a variable name read_at_start

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree. moment makes me think of moment of force, stuff like that. I'll look into changing this.

yardasol and others added 3 commits October 26, 2021 10:07
@yardasol @gwenchee
typo fix
6120f89 
Co-authored-by: Gwendolyn Chee <[email protected]>
@yardasol @gwenchee
typo fix
627f14a 
Co-authored-by: Gwendolyn Chee <[email protected]>
@yardasol @gwenchee
typo fix
92cbc51 
Co-authored-by: Gwendolyn Chee <[email protected]>
@yardasol yardasol requested review from LukeSeifert, munkm and smpark7 and removed request for LukeSeifert and smpark7 November 11, 2021 20:58
LukeSeifert
LukeSeifert reviewed Nov 12, 2021
View reviewed changes
Copy link
Contributor

@LukeSeifert LukeSeifert left a comment

Choose a reason for hiding this comment

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

Looks good! Everything seems to be working as well when I ran it with the msbr example case (had to change Andrei's cross section locations to my own and create an empty "data" directory in saltproc, but had to do that before anyways).

saltproc/depcode.py
Path to user template file for depletion code
inp : str
Path to input file for depletion code rerunning
reactor : Reactor
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this data type is correct

saltproc/depcode.py
Contains information about power load curve and cumulative
depletion time for the integration test.
dts : int
dep_step : int
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice change here, much more clear variable name than dts

@yardasol yardasol requested a review from gwenchee November 15, 2021 15:57
@yardasol yardasol requested review from gwenchee and removed request for gwenchee and smpark7 November 30, 2021 21:22
@yardasol
Copy link
Contributor Author

@gwenchee @LukeSeifert @munkm I believe I've addressed all requested changes, so if there aren't any more issues could one of you approve so we can merge?

gwenchee
gwenchee approved these changes Dec 7, 2021
View reviewed changes
Copy link
Contributor

@gwenchee gwenchee left a comment

Choose a reason for hiding this comment

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

You haven't addressed the moment comment we discussed above but besides that LGTM!

@yardasol
Copy link
Contributor Author

yardasol commented Dec 7, 2021

@gwenchee did you see my follow up comment about that?

Update: moment is used to slice arrays when processing materials, so it makes sense that it's an integer.

I guess since we are only every using 0 or 1 as the value for moment, it does make sense to change it to a boolean and then add an if-statement in the body of read_dep_comp. I'll make a commit for this

@yardasol yardasol modified the milestones: OpenMC support, 0.3.0 Release Dec 7, 2021
@yardasol yardasol linked an issue Dec 7, 2021 that may be closed by this pull request
The depcode class should not assume a particular depletion code choice. It should be a pure virtual class. #59
Closed
@yardasol yardasol merged commit 1b50fc1 into arfc:master Dec 8, 2021
This was referenced Dec 8, 2021
Closed
Merged
Merged
Closed
@yardasol yardasol deleted the refactor-depcode branch March 9, 2022 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LukeSeifert LukeSeifert LukeSeifert left review comments

@gwenchee gwenchee gwenchee approved these changes

@munkm munkm Awaiting requested review from munkm

Assignees

@pep8speaks pep8speaks

Labels

Comp:Build Comp:Core Difficulty:2-Challenging Priority:2-Normal Type:Feature Type:Style Type:Test

Projects

None yet

Milestone

0.3.0 Release

Development

Successfully merging this pull request may close these issues.

The depcode class should not assume a particular depletion code choice. It should be a pure virtual class.

4 participants

@yardasol @pep8speaks @gwenchee @LukeSeifert