Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2fe99c1
Merge pull request #4 from ReEDS-Model/km/update-links
kennedy-mindermann Apr 30, 2026
550e815
Update aeo_updates/natural_gas_price_regression/aeo_pipeline_config.json
Yunzhi-Chen May 12, 2026
e61a0d5
Merge branch 'yc/natural_gas_update' of https://github.com/ReEDS-Mode…
Yunzhi-Chen May 12, 2026
8f15643
Fix stale filename references
Yunzhi-Chen May 12, 2026
d1eb5f4
Update aeo_updates/natural_gas_price_regression/visualization.py
Yunzhi-Chen May 12, 2026
ba50fd1
Update aeo_updates/natural_gas_price_regression/.gitignore
Yunzhi-Chen May 12, 2026
bb3aa74
Revert "Update aeo_updates/natural_gas_price_regression/aeo_pipeline_…
Yunzhi-Chen May 12, 2026
b154384
Sort region in alphabetic sequence
Yunzhi-Chen May 12, 2026
ae18ddb
Update aeo_updates/natural_gas_price_regression/inputs for alpha regr…
Yunzhi-Chen May 14, 2026
03fc4de
Update README.md
Yunzhi-Chen May 14, 2026
aa41d33
Merge pull request #5 from ReEDS-Model/AEO_2026
wesleyjcole May 19, 2026
0a34df7
Pull historical natural gas price, demand and total demand from AEO d…
Yunzhi-Chen May 19, 2026
05cfc3c
Update README.md
Yunzhi-Chen May 19, 2026
1c891a8
Revert "Update README.md"
Yunzhi-Chen May 19, 2026
0d962fe
Revert "Pull historical natural gas price, demand and total demand fr…
Yunzhi-Chen May 19, 2026
b55edb2
Fix historical year dollar year issue
Yunzhi-Chen May 19, 2026
d043cf7
Merge pull request #2 from ReEDS-Model/yc/natural_gas_update
Yunzhi-Chen May 19, 2026
b7d1037
Merge branch 'main' into yc/natural_gas_update_2026
Yunzhi-Chen May 19, 2026
f08e401
Delete national_beta.csv
Yunzhi-Chen May 19, 2026
a50bc40
Update readme and historical info
Yunzhi-Chen May 19, 2026
d173649
Update aeo_pipeline_config.json
Yunzhi-Chen May 28, 2026
5940f9a
Merge pull request #3 from ReEDS-Model/yc/natural_gas_update_2026
Yunzhi-Chen Jun 2, 2026
6b7e84c
Fix formatting issues in README.md
wesleyjcole Jun 8, 2026
f0da5ff
Merge pull request #7 from ReEDS-Model/wesleyjcole-patch-1
wesleyjcole Jun 9, 2026
73cffd8
Add temperature - gas price regression workflow
kodiobika Jun 11, 2026
4a572b3
Remove unused imports, add clarifying comments, and export to 'output…
kodiobika Jun 23, 2026
731d24c
Remove intermediate input file
kodiobika Jun 23, 2026
eb6584e
Update README.md
kodiobika Jun 23, 2026
b5b8638
Add .gitignore
kodiobika Jun 23, 2026
4abf7f1
Clarify README
kodiobika Jun 23, 2026
48eb977
Clarify README
kodiobika Jun 23, 2026
7cd0bc1
Update .gitignore
kodiobika Jun 23, 2026
9d135b5
Remove extraneous data sources and update degree day calculation
kodiobika Jul 7, 2026
f47dbfc
Delete unneeded file
kodiobika Jul 7, 2026
da1825a
Cleanup
kodiobika Jul 7, 2026
8255b24
Update README.md
kodiobika Jul 7, 2026
deaf252
Shorten name of regression params file
kodiobika Jul 7, 2026
0b0e5d8
Rename folder
kodiobika Jul 7, 2026
b70dca8
Update aeo_updates/temperature_gas_price_adj_regression/calculate_reg…
kodiobika Jul 8, 2026
6bf7d19
Bugfix
kodiobika Jul 8, 2026
749f83c
Merge pull request #8 from ReEDS-Model/ko/temp_gasprice_regression
kodiobika Jul 8, 2026
aa11388
Initial code migration
Yunzhi-Chen Aug 5, 2026
73f0431
Minimum code fix
Yunzhi-Chen Aug 5, 2026
e036f09
Update settings.yaml
Yunzhi-Chen Aug 5, 2026
19d7373
Update .gitignore
Yunzhi-Chen Aug 5, 2026
6da6d52
Restructure the code
Yunzhi-Chen Aug 6, 2026
dadd19b
Restructure ATB inputs: raw scraped_input, runtime battery extraction
Yunzhi-Chen Aug 6, 2026
48ca1b2
Ignore ATB manual_input data files (keep local only)
Yunzhi-Chen Aug 6, 2026
8ebb8a9
Create atb_2024_flat_file.csv
Yunzhi-Chen Aug 11, 2026
22f25b7
reconstruct the code
Yunzhi-Chen Aug 11, 2026
04d2901
clean up
Yunzhi-Chen Aug 12, 2026
5244331
update
Yunzhi-Chen Aug 12, 2026
d42da36
clean up
Yunzhi-Chen Aug 13, 2026
a9ec539
clean up
Yunzhi-Chen Aug 13, 2026
cdf2c0f
update
Yunzhi-Chen Aug 17, 2026
9413a82
Update README.md
Yunzhi-Chen Aug 17, 2026
770cf15
Add historical costs
Yunzhi-Chen Aug 26, 2026
88e4ad6
Add historical costs
Yunzhi-Chen Aug 26, 2026
0ff07aa
update
Yunzhi-Chen Sep 1, 2026
4f1f4ba
update
Yunzhi-Chen Sep 2, 2026
41b94db
clean up
Yunzhi-Chen Sep 2, 2026
d195c93
Merge remote-tracking branch 'origin/main' into yc/24ATB
Yunzhi-Chen Sep 2, 2026
f5a0631
Fix gas H frame stuffs
Yunzhi-Chen Sep 2, 2026
5a6b7ed
update
Yunzhi-Chen Sep 3, 2026
6cec19d
Update atb_plotting.py
Yunzhi-Chen Sep 5, 2026
1454d62
Recovers atb_plotting using An's code
Yunzhi-Chen Sep 5, 2026
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
26 changes: 24 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,37 @@ gen_database_updated_test.csv
*.lst
gens_fixme.csv
ATB/inputs/
atb/output/
atb/inputs/
# Raw ATB figures remain local. The smoothing comparisons are intentionally
# versioned so reviewers can see the effect without rerunning the workflow.
atb/figures/*
!atb/figures/smoothing_comparison/
atb/figures/smoothing_comparison/*
!atb/figures/smoothing_comparison/*.png
# Keep the local ATB comparison utility, but never version generated plots or
# legacy tabular reports.
atb/comparison/*
!atb/comparison/README.md
!atb/comparison/compare_atb_outputs.py
atb/_dev/
# Raw ATB downloads; reproduced by scripts/scrape_atb_inputs.py from the URLs
# pinned in atb/config.yaml, so they are never committed (see the File Size
# Guidelines in the top-level README).
atb/scraped_input/*
!atb/scraped_input/README.md
# Unpublished ATB 2025 manual inputs; keep local, never commit
atb/manual_input/battery_costs_2025.csv
atb/manual_input/csp_cost_ratios_2025.csv
# Legacy CF source; final historical CF multipliers now live in historical/.
atb/manual_input/historic_capacity_factors.csv
/NEMS_database_processing/Outputs/
/AEO_Updates/outputs/
/AEO_Updates/output/AEO_HIGHMACRO_2021_electricity_consumption.csv
/AEO_Updates/output/AEO_HIGHOGS_2021_ng_prices.csv
/AEO_Updates/output/AEO_LOWMACRO_2021_electricity_consumption.csv
/AEO_Updates/output/AEO_REF2021_2021_electricity_consumption.csv
/AEO_Updates/output/AEO_REF2021_2021_ng_prices.csv
/ATB/figures/

# pyc files
*.pyc
*__pycache__
Expand Down
400 changes: 392 additions & 8 deletions atb/README.md

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions atb/comparison/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Local ATB output comparison

The comparison utility is versioned. Generated/ReEDS validation plots remain
local and ignored, while before/after smoothing plots are versioned for review.

For validation plus before/after smoothing figures, run formatting and
comparison together from `atb/`:

```bash
python scripts/run_pipeline.py --only format compare
```

When the full pipeline runs formatting and comparison together, it captures
fully processed files just before smoothing in a temporary directory. The
comparison script validates those files against the matching source files in
the ReEDS repository configured in `../config.yaml`, then the temporary files
are deleted automatically. Thus smoothing differences do not obscure scraper
and formatting validation. The script normalizes legacy wind filenames and
column names, then checks:

- missing files and columns;
- duplicate keys;
- rows present on only one side;
- changed values using configurable numeric tolerances.

Only plots are written, under `comparison/plots/`:

- `comparison_overview.png` summarizes file-level validation status;
- one time-series plot is written for each generated/ReEDS file pair.

Detailed comparison statuses and reverse-coverage gaps are printed to the
terminal instead of being written as CSV reports. In these local plots, solid
lines are the unsmoothed generated baseline and dashed lines are ReEDS.

Running `python comparison/compare_atb_outputs.py` by itself compares the final
files already in `output/` with ReEDS. It cannot regenerate before/after plots
because the temporary pre-smoothing data is intentionally not retained.

The full pipeline also compares the temporary unsmoothed data with the final
smoothed outputs. Those plots are written to
`smoothing_comparison/` and are versioned so branch users can review
the smoothing effect without retaining duplicate CSV outputs. Final processed
values are lines, while solid dots identify input data values. Manual history
and directly observed real history receive dots; broadcast history and filled
real-history years do not. Future dots show the raw ATB values, while the line
shows the final raw or smoothed trajectory. A selected manual or broadcast
history uses one color for its entire historical curve. Real history uses green
for observations and orange for years filled from that same real series; an
internal gap is linearly interpolated. Gray and gold distinguish raw and
smoothed ATB projections. A dotted vertical line marks the configured
projection start year; line styles distinguish technology series. Each interval
uses the source color of its starting year, so a new source color never extends
backward into the preceding year.
Loading