Skip to content

Commit 35c8f44

Browse files
Merge pull request #260 from NatLabRockies/km/docs-nlr
Update github links to github.com/NatLabRockies
2 parents f2777e5 + 0ed1219 commit 35c8f44

File tree

11 files changed

+26
-26
lines changed

11 files changed

+26
-26
lines changed

.github/workflows/build-docs-external.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Set variables for public github repo
4242
run: |
43-
echo "BASE_URL=https://github.com/NREL/ReEDS-2.0" >> $GITHUB_ENV
43+
echo "BASE_URL=https://github.com/NatLabRockies/ReEDS-2.0" >> $GITHUB_ENV
4444
cd ${GITHUB_WORKSPACE}/docs/source/documentation_tools/
4545
sh generate_sources_md_file.sh
4646
cd ${GITHUB_WORKSPACE}

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was created based on https://github.com/NREL/reVXOrdinances/blob/main/.pylintrc,
1+
# This file was created based on https://github.com/NatLabRockies/reVXOrdinances/blob/main/.pylintrc,
22
# and then modified for the use with ReEDS-2.0
33
[MAIN]
44

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33

44

55
[![CI](https://github.nrel.gov/ReEDS/ReEDS-2.0/actions/workflows/python-app.yaml/badge.svg)](https://github.nrel.gov/ReEDS/ReEDS-2.0/actions/workflows/python-app.yaml)
6-
[![Documentation](https://img.shields.io/badge/Documentation-view%20online-0a7f5e?logo=readthedocs&logoColor=white&labelColor=555)](https://nrel.github.io/ReEDS-2.0)
6+
[![Documentation](https://img.shields.io/badge/Documentation-view%20online-0a7f5e?logo=readthedocs&logoColor=white&labelColor=555)](https://natlabrockies.github.io/ReEDS-2.0)
77
![Static Badge](https://img.shields.io/badge/python-3.11-blue)
8-
![GitHub License](https://img.shields.io/github/license/NREL/ReEDS-2.0)
8+
![GitHub License](https://img.shields.io/github/license/natlabrockies/ReEDS-2.0)
99
[![DOI](https://zenodo.org/badge/189060033.svg)](https://doi.org/10.5281/zenodo.16943302)
1010

1111
</br>
1212
</br>
1313

1414
This GitHub repository contains the source code for NLR's ReEDS model.
1515
The ReEDS model source code is available at no cost from the National Laboratory of the Rockies.
16-
The ReEDS model can be downloaded or cloned from [https://github.com/NREL/ReEDS-2.0](https://github.com/NREL/ReEDS-2.0).
16+
The ReEDS model can be downloaded or cloned from [https://github.com/NatLabRockies/ReEDS-2.0](https://github.com/NatLabRockies/ReEDS-2.0).
1717

18-
**For more information about the model, see the [open source ReEDS-2.0 Documentation](https://nrel.github.io/ReEDS-2.0).**
18+
**For more information about the model, see the [open source ReEDS-2.0 Documentation](https://NatLabRockies.github.io/ReEDS-2.0).**
1919

2020
ReEDS training videos are available on the [NLR Learning YouTube channel](https://youtube.com/playlist?list=PLmIn8Hncs7bG558qNlmz2QbKhsv7QCKiC&si=NgGBaL_MxNcYiIEX).
2121

@@ -27,7 +27,7 @@ ReEDS training videos are available on the [NLR Learning YouTube channel](https:
2727

2828
[ReEDS](https://www.nrel.gov/analysis/reeds/) is a capacity planning and dispatch model for the U.S. electricity system.
2929

30-
As NLR's flagship long-term power sector model, ReEDS has served as the primary analytic tool for [many studies](https://nrel.github.io/ReEDS-2.0/publications.html) of electricity sector research questions.
30+
As NLR's flagship long-term power sector model, ReEDS has served as the primary analytic tool for [many studies](https://natlabrockies.github.io/ReEDS-2.0/publications.html) of electricity sector research questions.
3131
Example model results are available in the [Scenario Viewer](https://scenarioviewer.nrel.gov/).
3232

3333

@@ -50,7 +50,7 @@ A step-by-step guide for getting started with ReEDS is available [here](https://
5050
2. Other commercial solvers have also been succussfully applied to ReEDS, but setup details and some solver tuning are specific to the CPLEX solver.
5151
3. Install Julia: <https://julialang.org/downloads/>
5252
4. Open a command-line interface and set up your environments:
53-
1. Clone the ReEDS repository: `git clone git@github.com:NREL/ReEDS-2.0.git` or `git clone https://github.com/NREL/ReEDS-2.0.git`
53+
1. Clone the ReEDS repository: `git clone git@github.com:NatLabRockies/ReEDS-2.0.git` or `git clone https://github.com/NatLabRockies/ReEDS-2.0.git`
5454
2. Navigate to the cloned repository
5555
3. Create the `reeds2` [conda environment](https://docs.conda.io/projects/conda/en/stable/user-guide/tasks/manage-environments.html): `conda env create -f environment.yml`
5656
1. Linux and Mac users can use the environment.yml directly. Windows users need to comment out the `- julia=1.8` line from the environment.yml file before creating the enviroment and use the version of Julia installed above.
@@ -67,4 +67,4 @@ A step-by-step guide for getting started with ReEDS is available [here](https://
6767

6868
## Contact Us
6969

70-
If you have comments and/or questions, you can contact the ReEDS team at [ReEDS.Inquiries@nrel.gov](mailto:ReEDS.Inquiries@nrel.gov) or post a question on the [discussion pages](https://github.com/NREL/ReEDS-2.0/discussions).
70+
If you have comments and/or questions, you can contact the ReEDS team at [ReEDS.Inquiries@nrel.gov](mailto:ReEDS.Inquiries@nrel.gov) or post a question on the [discussion pages](https://github.com/NatLabRockies/ReEDS-2.0/discussions).

docs/source/model_documentation.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ We are especially grateful to Walter Short who first envisioned and developed th
99
Finally, we are grateful to all those who helped sponsor ReEDS model development and analysis, particularly supporters from the U.S. Department of Energy (DOE) but also others who have funded our work over the years.
1010

1111
```{admonition} Suggested Citation
12-
National Laboratory of the Rockies. ({{ cite_date_last_updated }}). *Model documentation — ReEDS 2.0*. https://nrel.github.io/ReEDS-2.0/model_documentation.html
12+
National Laboratory of the Rockies. ({{ cite_date_last_updated }}). *Model documentation — ReEDS 2.0*. https://natlabrockies.github.io/ReEDS-2.0/model_documentation.html
1313
1414
```
1515

@@ -157,7 +157,7 @@ This documentation describes the structure and key data elements of the [Regiona
157157
In this introduction, we provide a high-level overview of ReEDS objectives, capabilities, and applications.
158158
We also provide a short discussion of important caveats that apply to any ReEDS analysis.
159159

160-
The ReEDS model code and input data can be accessed at <https://github.com/NREL/ReEDS-2.0>.
160+
The ReEDS model code and input data can be accessed at <https://github.com/NatLabRockies/ReEDS-2.0>.
161161

162162

163163
### Overview
@@ -216,7 +216,7 @@ This means that ReEDS investments are not guaranteed to be aligned with cost inp
216216

217217
- **Resolution:** Although ReEDS has high spatial, temporal, and process resolution for models of its class and scope, it cannot generally represent individual units and transmission lines, and it does not have the temporal resolution to characterize detailed operating behaviors, such as ramp rates and minimum plant runtime.
218218
By default, operations are modeled for a selection of representative and outlying periods (days or weeks), rather than full years, to achieve a tractable model size.
219-
The linkage with [PRAS](https://github.com/NREL/PRAS), which includes chronological hourly modeling for multiple years, helps ensure the ReEDS electricity system portfolios meet specified resource adequacy levels.
219+
The linkage with [PRAS](https://github.com/NatLabRockies/PRAS), which includes chronological hourly modeling for multiple years, helps ensure the ReEDS electricity system portfolios meet specified resource adequacy levels.
220220

221221
- **Foresight and behavior:** ReEDS solve years are evaluated sequentially and myopically.
222222
The model has limited foresight and its decision making does not account for anticipated changes to markets and policies.
@@ -269,7 +269,7 @@ ReEDS is run sequentially for a series of modeled years, typically through 2050.
269269
The increments between solve years are user defined, but most studies use 2-year, 3-year, or 5-year increments.
270270
Increments can also vary between different solve years; e.g., annual increments can be used in the near term followed by multiyear increments in the latter years.
271271
{numref}`figure-reeds-pras` illustrates the model's sequential structure.
272-
For a given solve year *t*, ReEDS iterates with the [PRAS](https://github.com/NREL/PRAS) model to dynamically update stress periods and check for reliability (see more in the [Resource Adequacy](#resource-adequacy) section).
272+
For a given solve year *t*, ReEDS iterates with the [PRAS](https://github.com/NatLabRockies/PRAS) model to dynamically update stress periods and check for reliability (see more in the [Resource Adequacy](#resource-adequacy) section).
273273
Once the system design is found to be resource adequate, ReEDS advances to the next model solve year ($t + \Delta t$).
274274

275275
```{figure} figs/docs/reeds-pras.png
@@ -1962,7 +1962,7 @@ Existing HVDC and B2B connection capacities are taken from project websites and
19621962
#### New transmission capacity
19631963

19641964
The cost of new interzonal transmission capacity between each pair of model zones is calculated in the reV model using the base costs shown in {numref}`figure-transmission-cost-input-data`.
1965-
For each pair of zones, a [least-cost path](https://github.com/NREL/reVX/tree/main/reVX/least_cost_xmission) between the two zone "centers" (the same "centers" described in the [Network reinforcement](#network-reinforcement) section) is determined.
1965+
For each pair of zones, a [least-cost path](https://github.com/NatLabRockies/reVX/tree/main/reVX/least_cost_xmission) between the two zone "centers" (the same "centers" described in the [Network reinforcement](#network-reinforcement) section) is determined.
19661966
(Example paths from Maine to each of the other ReEDS zones are shown in {numref}`figure-lcp-p134`.)
19671967
The integrated \$/mile cost along the least-cost path determines the \$/MW cost for expanding the interface capacity between the linked zones;
19681968
the length of the least-cost path determines the distance (used in the calculation of transmission losses within the model,
@@ -3403,7 +3403,7 @@ section of the <a href="user_guide.html">User Guide</a>.
34033403

34043404
The ReEDS reduced-form dispatch aims to represent enough operational detail for realistic capacity expansion decisions,
34053405
but the model cannot explicitly represent detailed power system operations.
3406-
To enable more detailed study of system operations, NLR has developed a translation framework [R2X](https://github.com/NREL/R2X) to implement a ReEDS capacity
3406+
To enable more detailed study of system operations, NLR has developed a translation framework [R2X](https://github.com/NatLabRockies/R2X) to implement a ReEDS capacity
34073407
expansion solution for any solve year in production cost models (PCMs).
34083408
R2X supports translations to two PCMs: Sienna and PLEXOS.
34093409

@@ -3424,7 +3424,7 @@ To maintain consistency, the linkage preserves the spatial resolution of ReEDS (
34243424
The PCM translation uses ReEDS transmission interface capacity, whereas reactance and resistance are derived from ReEDS transmission assumptions to represent the aggregated transmission system.
34253425
For generating capacity, ReEDS aggregate capacity is converted to individual units in the PCM using characteristic unit sizes for each technology.
34263426
Where possible and reasonable, ReEDS cost and performance parameters are used.
3427-
If a parameter is missing or inconsistently used in ReEDS because of structural differences between the models, the default translation uses average values across the [WECC](https://github.com/NREL/R2X/blob/main/src/r2x/defaults/pcm_defaults.json) for the equivalent technologies in ReEDS.[^ref63]
3427+
If a parameter is missing or inconsistently used in ReEDS because of structural differences between the models, the default translation uses average values across the [WECC](https://github.com/NatLabRockies/R2X/blob/main/src/r2x/defaults/pcm_defaults.json) for the equivalent technologies in ReEDS.[^ref63]
34283428

34293429
[^ref63]: Minimum load is an example of one such parameter.
34303430
The aggregate representation of minimum load in ReEDS at the technology-zone level does not effectively reflect unit-level operating constraints used in PLEXOS, so PLEXOS uses native assumptions for minimum load.

docs/source/postprocessing_tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ This script reruns a completed ReEDS case as a dispatch simulation at higher tim
9292
The operational constraints in `c_supplymodel.gms` are used directly, but the investment and capacity variables are fixed to their previously optimized values; only the operational variables are re-optimized.
9393
365 representative 1-day periods at 1-hour resolution are used by default, but these settings can be changed using the `-s/--switch_mods` switch.
9494

95-
This approach is distinct from the [R2X](https://github.com/NREL/R2X) tool, which formats the results of a ReEDS case as inputs to a separate production cost modeling tool such as [Sienna](https://github.com/NREL-Sienna) or [PLEXOS](https://www.energyexemplar.com/plexos).
95+
This approach is distinct from the [R2X](https://github.com/NatLabRockies/R2X) tool, which formats the results of a ReEDS case as inputs to a separate production cost modeling tool such as [Sienna](https://github.com/NREL-Sienna) or [PLEXOS](https://www.energyexemplar.com/plexos).
9696
Those tools provide more advanced and realistic features like unit commitment and rolling forecast horizons;
9797
by contrast, `run_pcm.py` simply reuses the existing ReEDS formulation at higher time resolution,
9898
and is subject to all the normal caveats and limitations of ReEDS (linear variables, pipe-and-bubble transmission flow, etc.).

docs/source/references.bib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21633,7 +21633,7 @@ @misc{nrelReEDSModelDocumentation2025
2163321633
author = {{NREL}},
2163421634
year = 2025,
2163521635
month = nov,
21636-
url = {https://nrel.github.io/ReEDS-2.0/model_documentation.html}
21636+
url = {https://natlabrockies.github.io/ReEDS-2.0/model_documentation.html}
2163721637
}
2163821638

2163921639
@misc{nrelRegionalEnergyDeployment2020,
@@ -28591,7 +28591,7 @@ @inproceedings{weissEmpiricalApproachCalculate2013
2859128591

2859228592
@misc{WelcomeReEDSsDocumentation,
2859328593
title = {Welcome to {{ReEDS}}'s Documentation! --- {{ReEDS}} Documentation},
28594-
url = {https://nrel.github.io/ReEDS-2.0/index.html},
28594+
url = {https://natlabrockies.github.io/ReEDS-2.0/index.html},
2859528595
urldate = {2025-05-14}
2859628596
}
2859728597

docs/source/setup.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Getting Started
2-
The ReEDS model source code is available at no cost from the National Laboratory of the Rockies (NLR). The ReEDS model can be downloaded or cloned from [https://github.com/NREL/ReEDS-2.0](https://github.com/NREL/ReEDS-2.0).
2+
The ReEDS model source code is available at no cost from the National Laboratory of the Rockies (NLR). The ReEDS model can be downloaded or cloned from [https://github.com/NatLabRockies/ReEDS-2.0](https://github.com/NatLabRockies/ReEDS-2.0).
33

44
New users may also wish to start with some ReEDS training videos which are available on the [NLR YouTube channel](https://youtu.be/aGj3Jnspk9M?si=iqCRNn5MbGZc8ZIO).
55

@@ -153,7 +153,7 @@ Screenshot of a test of GAMS from the terminal window
153153
```
154154

155155
### Repository Setup
156-
The ReEDS source code is hosted on GitHub: [https://github.com/NREL/ReEDS-2.0](https://github.com/NREL/ReEDS-2.0)
156+
The ReEDS source code is hosted on GitHub: [https://github.com/NatLabRockies/ReEDS-2.0](https://github.com/NatLabRockies/ReEDS-2.0)
157157

158158
1. Install Git Large File Storage, instructions can be found here: [Installing Git Large File Storage](https://docs.github.com/en/repositories/working-with-files/managing-large-files/installing-git-large-file-storage)
159159

@@ -199,7 +199,7 @@ If that doesn't resolve the issue, the following may help:
199199
6. Enter the julia package manager by pressing `]`, then run the following commands:
200200
* `add Random123`
201201
* `registry add https://github.com/JuliaRegistries/General.git`
202-
* `registry add https://github.com/NREL/JuliaRegistires.git`
202+
* `registry add https://github.com/NatLabRockies/JuliaRegistries.git`
203203
* `instantiate`
204204

205205
7. Leave the package manager by pressing backspace or Ctrl+C

docs/source/user_guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ These files are stored in `inputs/load/{switch_name}_load_hourly.h5`.
8787

8888
| Switch Name | Description of Profile | Origin | Weather year included |
8989
| ------------- | ------------- | ------------- | ------------- |
90-
| historic | Detrended historic demand from 2007-2013 and 2016-2023. This is multiplied by annual growth factors from AEO to forecast load growth. | Produced by the ReEDS team from a compilation of data sources. More detail can be found in the [hourlize readme](https://github.com/NREL/ReEDS-2.0/tree/main/hourlize/plexos_to_reeds#readme). | 2007-2013 & 2016-2023 |
90+
| historic | Detrended historic demand from 2007-2013 and 2016-2023. This is multiplied by annual growth factors from AEO to forecast load growth. | Produced by the ReEDS team from a compilation of data sources. More detail can be found in the [hourlize readme](https://github.com/NatLabRockies/ReEDS-2.0/tree/main/hourlize). | 2007-2013 & 2016-2023 |
9191
| Clean2035_LTS | Net-zero emissions, economy wide, by 2050 based on the White House's Long Term Strategy as shown here: <https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf> | Developed for the 100% Clean Electricity by 2035 study: <https://www.nrel.gov/docs/fy22osti/81644.pdf> | 2007-2013 |
9292
| Clean2035 | Accelerated Demand Electrification (ADE) profile. This profile was custom made for the 100% Clean Electricity by 2035 study. More information about how it was formed can be found in <https://www.nrel.gov/docs/fy22osti/81644.pdf> Appendix C. | Developed for the 100% Clean Electricity by 2035 study: <https://www.nrel.gov/docs/fy22osti/81644.pdf> | 2007-2013 |
9393
| Clean2035clip1pct | Same as Clean2035 but clips off the top 1% of load hours. | Developed for the 100% Clean Electricity by 2035 study: <https://www.nrel.gov/docs/fy22osti/81644.pdf> | 2007-2013 |

instantiate.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ENV["JULIA_PKG_SERVER_REGISTRY_PREFERENCE"] = "eager"
33
import Pkg
44
Pkg.Registry.update()
55
Pkg.Registry.add("General")
6-
Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/NREL/JuliaRegistry.git"))
6+
Pkg.Registry.add(Pkg.RegistrySpec(url="https://github.com/NatLabRockies/JuliaRegistry.git"))
77
Pkg.instantiate()
88

99
Pkg.add("Random123")

postprocessing/tableau/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Before running this script for the first time, you'll need to install the Tablea
1111
`pip install tableauhyperapi`
1212

1313

14-
Note that if you're pulling ReEDS-to-PLEXOS results into Tableau, you'll also need to have the [h5plexos](https://github.com/NREL/h5plexos) package installed.
14+
Note that if you're pulling ReEDS-to-PLEXOS results into Tableau, you'll also need to have the [h5plexos](https://github.com/NatLabRockies/h5plexos) package installed.
1515

1616
### Example call:
1717

0 commit comments

Comments
 (0)