Skip to content

Merge develop into master #16

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.

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

Merged
merged 88 commits into from
Mar 2, 2023
Merged

Merge develop into master #16

merged 88 commits into from
Mar 2, 2023

Conversation

MilosAtz
Copy link
Contributor

@MilosAtz MilosAtz commented Mar 2, 2023

Bring new DASSH features into the main branch:

  • Pressure loss due to spacer grids in bare rod bundles
  • Turbulent mixing in bare rod bundles
  • Hot channel factor methodology to get peak temperatures plus uncertainty
  • Standalone pin-power processing via entry point dassh_power
  • Bug fixes, new unit tests

MilosAtz added 30 commits March 25, 2022 13:19
…ect for laminar case (once flow rate is known)
Merge new mixing correlations into develop
Adding new pressure drop capabilities to original feature branch
Flowsplit and friction correlated parameters calculated only at the beginning of the sweep; allows for iteration to determine transition flowsplit
fixing bug in main where no args were passed
Merge pin power integration workflow into develop
Merge spacer grid pressure drop capabilities into develop branch
@codecov-commenter
Copy link

Codecov Report

Merging #16 (7670afe) into master (8823e4b) will increase coverage by 3.84%.
The diff coverage is 84.35%.

❗ Current head 7670afe differs from pull request most recent head 8447d33. Consider uploading reports for the commit 8447d33 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##           master      #16      +/-   ##
==========================================
+ Coverage   75.67%   79.51%   +3.84%     
==========================================
  Files          42       47       +5     
  Lines        9758    10438     +680     
==========================================
+ Hits         7384     8300     +916     
+ Misses       2374     2138     -236     
Flag Coverage Δ
unittests 79.51% <84.35%> (+3.84%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
dassh/correlations/friction_uctd.py 82.81% <0.00%> (ø)
dassh/plot.py 33.88% <27.27%> (+20.57%) ⬆️
dassh/correlations/flowsplit_uctd.py 71.42% <55.55%> (+1.05%) ⬆️
dassh/correlations/flowsplit_ctd.py 78.03% <73.62%> (-11.53%) ⬇️
dassh/region_rodded.py 87.37% <80.88%> (+4.16%) ⬆️
dassh/correlations/grid_cdd.py 81.81% <81.81%> (ø)
dassh/reactor.py 88.09% <85.36%> (+0.48%) ⬆️
dassh/__main__.py 55.75% <87.50%> (+9.72%) ⬆️
dassh/correlations/mixing_kc.py 88.37% <88.37%> (ø)
dassh/hotspot.py 89.23% <89.23%> (ø)
... and 19 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@MilosAtz
Copy link
Contributor Author

MilosAtz commented Mar 2, 2023

Updates to User Guide forthcoming

@MilosAtz MilosAtz merged commit 8f65cf4 into master Mar 2, 2023
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