Commit 880135e
Nrel atb usa costs (#160)
* code: re-locate imports
* data: add ATB electricity inputs for 2022 and 2024
* code: introduce new script compile_cost_assumptions_nrel.py
* code: fix imports in _helpers.py
* code: filter columns and core_metric_parameter
* code: new changes dropping duplicates
* code: add additional OCC as core_metric_parameter
* code: %-yr
* code: newest changes to nrel
* code: filter and rename technologies
* code-config: update config and compile_cost_assumptions_nrel.py
* code: rename columns
* code: add unit tests read_atb_input_file
* code: re-factor
* code: unit test calculate_fom_percentage
* code: new progress
* code: add unit tests for repeat_values
* code: add unit tests for fom_percentage
* code: modify unit test for fom percentage
* code: update documentation
* code: modify code
* code: re-work code
* code: remove unnecessary print from unit test file
* data: add technical data for CCS-equipped power plants and update coal efficiency
* data: coal and gas retrofits
* data: pypsa battery changed to 'Utility-Scale_Battery_Storage_6Hr_Battery_Storage'
* data: updated technology names to displayname ATB, added discount rates
* code: remove WACC_Real
* code: update scripts/compile_cost_assumptions_nrel.py
* code: updated NREL ATB nomenclature according to 'displayname'
* data: removed unnecessary data for future years
* data: added hydrogen production technologies
* code: update on including atb costs into existing costs
* code: atb costs included in existing costs
* data: updated header column 'financial_case'
* code: change in query
* data: updated nomenclature 'further description' in 'discount_rates_usa.csv'
* code: include discount rate
* code: separate add discount rate as external function
* code: remove unnecessary outputs
* data: add output US
* doc: update release_notes
* config: remove unnecessary configs
* code: remove pypsa dependency
* code: add get_query_string
* doc: solve typo
* code: change comment
* docu: update documentation
* data: correct mistake in manual_input.csv
* doc: replace PyPSA-Eur-sec with PyPSA-Earth in README.md
* code: substitute from pypsa.descriptors import Dict with Dict=dict in _helpers.py
* data: added missing currency year for hydrogen production technologies
* code: remove index from NREL output files
* code: add units for CF and modify unit for FOM
* code: modify from $ and € to USD and EUR
* data: modified € to EUR
* data: add efficiency for Coal-IGCC-90%-CCS and modify efficiency for Coal-IGCC
* data: add ICCT data for hydrogen production & storage, FT and DAC
* doc: update release notes
* code: fix bug in queries
* data: add US-specific fuel costs for coal, gas and oil
* code: remove tax_credit_case
* code: update __init__
* code: Nuclear - AP1000 to Nuclear - AP100
* code: match technology names from ATB2022 to those in ATB2024
* data: add US-specific discount rate for 2020
* data: remove scenario and financial_case from fuel_costs_usa.csv
* data: simplify names for hydrogen production technologies
* code: remove unnecessary technologies from atb_e_2022
* data: modify structure of discount rates and fuel costs files
* code: add fuel costs
* data: include newest values from fuel_costs
* data: correct source for gas fuel cost
* docstring: add docstring to the functions
* code: revert back to x instead of row
* doc: update doc strings
* doc: updated documentation
* code: update unit tests
* code: final touches
* data: fix currency years
* data: remove duplicates from discount_rates_usa
* code: remove uncessary file and spaces
* code: change fixture scope
* data: add outputs folder
* remove unnecessary file
* code: remove duplicated before concat with discount_rates and fuel_costs. Plus rename file
* code: modify .gitignore
* remove .DS_Store
* code: cast value to float
* code: remove unnecessary white-spaces
* env: add pytest to environment.yaml
* add licenses
* data: update calculation coal cost
* data: update reference for coal costs
* data: correct unit for USA oil and gas costs
* config: remove fastparquet
* remove hash
* code: fix typo in get_conversion_dictionary
* code: changes to convertion --> conversion and fix unit tests
* comment to PR
* code: explicitly mention the origin of NREL ATB input files
* update output cost files
* code: fix issues in variables naming
---------
Co-authored-by: Daniele Lerede <[email protected]>
Co-authored-by: Fabrizio Finozzi <[email protected]>1 parent 35e5144 commit 880135e
File tree
32 files changed
+33997
-249
lines changed- docs
- inputs
- outputs
- US
- scripts
- test
- test_data
32 files changed
+33997
-249
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | | - | |
| 24 | + | |
26 | 25 | | |
27 | 26 | | |
28 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
39 | 59 | | |
40 | 60 | | |
41 | 61 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
10 | 17 | | |
11 | 18 | | |
12 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
38 | 45 | | |
39 | 46 | | |
40 | 47 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Large diffs are not rendered by default.
0 commit comments