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.

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

Made new inputs for HALEU transition analysis #123

Merged
merged 44 commits into from
Feb 14, 2022
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
89e1ffa
added license expiration dates
abachma2 Jan 4, 2022
aff7aa5
made into a loop to make csv files for all transitions at once
abachma2 Jan 4, 2022
4c29e71
Updated with license expiration dates
abachma2 Jan 4, 2022
23e8461
added functions to split up if I want to loop or just do one case
abachma2 Jan 5, 2022
08a2f75
added in function for commodities sent to LWRs
abachma2 Jan 5, 2022
5c978c9
added tests for new function, pep8 fixes
abachma2 Jan 5, 2022
afc3093
moved reactors into separate files, changed LWRs to deployinst
abachma2 Jan 26, 2022
7896fa2
file for VOYGR definition
abachma2 Jan 27, 2022
a58e3d4
working on way to create xml recipe
abachma2 Jan 27, 2022
6359262
moved ad rx recipes into separate files
abachma2 Jan 27, 2022
8d0ffc8
got xml creation file working, put spent fuel into MMR recipes
abachma2 Jan 28, 2022
3ff1b40
put recipe into the wrong file
abachma2 Jan 28, 2022
106fab7
changed 6000 to 6012
abachma2 Jan 28, 2022
5df713b
changed mass to total UCO mass
abachma2 Jan 28, 2022
94a3854
updated with info from FSAR
abachma2 Jan 28, 2022
5a6fafa
removed negative sign from masses
abachma2 Jan 28, 2022
22d274e
changed 6000 to 6012 for cyclus
abachma2 Jan 28, 2022
46e5c4a
changed leu recipe to 4.5%
abachma2 Jan 28, 2022
f86f30d
working with removal of negative sign
abachma2 Jan 28, 2022
cc17b21
made remaining needed input files
abachma2 Jan 28, 2022
0cd2669
updated mass to mass/refuel, not mass/assembly
abachma2 Jan 31, 2022
0e18679
updated fresh fuel recipe
abachma2 Feb 3, 2022
7f3c91f
updated core mass
abachma2 Feb 3, 2022
4c8e2bd
renamed file
abachma2 Feb 7, 2022
1092f91
added spent fuel composition
abachma2 Feb 7, 2022
4052827
added other reactors to scenario
abachma2 Feb 7, 2022
db8e8aa
removed files from git
abachma2 Feb 7, 2022
7808e8b
corrected spent fuel comp
abachma2 Feb 11, 2022
09a1440
changed 6000 to 6012
abachma2 Feb 11, 2022
b73963f
modified rx_commission_decommission function
abachma2 Feb 11, 2022
51e4caf
fixed typos in input files
abachma2 Feb 11, 2022
d27a057
updated for new files for advanced reactors
abachma2 Feb 11, 2022
081d421
accidentally removed all reactor inputs
abachma2 Feb 11, 2022
59c4df2
Revert "accidentally removed all reactor inputs"
abachma2 Feb 11, 2022
dfbd233
pep8 fixes
abachma2 Feb 11, 2022
dc04bf5
updated voygr recipes for leu and fresh fuel
abachma2 Feb 14, 2022
d58a048
fixed typo
abachma2 Feb 14, 2022
4ec2036
changes requested by @yardasol
abachma2 Feb 14, 2022
49cfe19
removed LWR input files
abachma2 Feb 14, 2022
66a40ce
removed old notebook, added files to create recipes
abachma2 Feb 14, 2022
2c60a18
addressing more comments from @yardasol
abachma2 Feb 14, 2022
20cce21
grammar and formatting fixes
abachma2 Feb 14, 2022
99bf475
pep8 fixes
abachma2 Feb 14, 2022
0d1d7f5
pep8 fixes
abachma2 Feb 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 93 additions & 93 deletions database/reactors_pris_2020.csv

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion input/haleu/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@ for LWR fuel cycle, and the deployment times for the LWRs. These
files and the |Cyclus| input files are generated by running
``/transition-scenarios/scripts/create_input.py``.

Definitions for each advanced reactor and the corresponding recipes
is in ``inputs/united_states/reactors/'' and ``inputs/united_states/recipes'',
respectively. Each of the necessary files are read into the ``.xml'' files
in ``inputs/'' when |Cyclus| is run.

Analysis:
=========
The analysis directory contains a jupyter notebook (``analysis/scenario_data_analysis.ipynb``)
The analysis directory contains a jupyter notebook (``analysis/initial_analysis.ipynb``)
to calculate and compare resource requirements of each fuel cycle
scenario simulated. All of the figures created in the jupyter notebook
are saved in the ``figures/`` directory.
24 changes: 21 additions & 3 deletions input/haleu/analysis/df_to_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,25 @@
import cymetric as cm
import transition_metrics as tm

outfile = '../outputs/xe100_1percent.sqlite'

transactions = tm.add_receiver_prototype(outfile)
transactions.to_csv('xe_1percent_transactions.csv')
def loop_over_scenarios():
reactors = ['xe100', 'mmr']
scenarios = ['nogrowth', '1percent']

for reactor in reactors:
for scenario in scenarios:
outfile = f'../outputs/{reactor}_{scenario}.sqlite'

transactions = tm.add_receiver_prototype(outfile)
transactions.to_csv(f'{reactor}_{scenario}_transactions.csv')


def single_scenario():
scenario = 'current'
outfile = f'../outputs/united_states_2020.sqlite'
transactions = tm.add_receiver_prototype(outfile)
transactions.to_csv(f'{scenario}_transactions.csv')


if __name__ == '__main__':
single_scenario()
Binary file modified input/haleu/analysis/figures/energy_scenarios_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,860 changes: 1,860 additions & 0 deletions input/haleu/analysis/initial_analysis.ipynb

Large diffs are not rendered by default.

Loading