Skip to content
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

Updating OpenMC SS script before splitting it up #17

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Updating OpenMC SS script before splitting it up #17

wants to merge 3 commits into from

Conversation

anu1217
Copy link
Contributor

@anu1217 anu1217 commented Aug 7, 2024

  • Updating OpenMC script (and associated files) to reflect the most current version before this file is broken up into subsections
  • Tracking nuclides from all timesteps
  • Switched to coupled depletion operator
  • Cleaned up code/deleted unused parts

gonuke
gonuke requested changes Aug 7, 2024
View reviewed changes
Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

There appear to be lingering merge conflicts

SS_Activation_OpenMC.py Outdated
@@ -1,3 +1,194 @@
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

This indicates a merge conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gonuke gonuke gonuke requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@anu1217 @gonuke