From 5d294f6c7eeb46d2c48edc9002da07a4905121e0 Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Tue, 17 Feb 2026 09:47:18 -0700 Subject: [PATCH 1/3] Update lab name, links, license, and emails. Change author order --- PRAS.jl/LICENSE.md | 2 +- PRAS.jl/Project.toml | 8 ++++---- PRASCapacityCredits.jl/LICENSE.md | 2 +- PRASCapacityCredits.jl/Project.toml | 2 +- PRASCore.jl/LICENSE.md | 2 +- PRASCore.jl/Project.toml | 8 ++++---- PRASFiles.jl/LICENSE.md | 2 +- PRASFiles.jl/Project.toml | 8 ++++---- README.md | 20 ++++++++++---------- docs/README.md | 2 +- docs/make.jl | 4 ++-- docs/src/PRAS/acknowledgements.md | 4 ++-- docs/src/changelog.md | 6 +++--- docs/src/index.md | 2 +- docs/src/quickstart.md | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/PRAS.jl/LICENSE.md b/PRAS.jl/LICENSE.md index 29b607f4..731d6e2d 100644 --- a/PRAS.jl/LICENSE.md +++ b/PRAS.jl/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Alliance for Sustainable Energy, LLC +Copyright (c) 2020 Alliance for Energy Innovation, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/PRAS.jl/Project.toml b/PRAS.jl/Project.toml index 7d37933b..54eaf0a7 100644 --- a/PRAS.jl/Project.toml +++ b/PRAS.jl/Project.toml @@ -1,10 +1,10 @@ name = "PRAS" uuid = "05348d26-1c52-11e9-35e3-9d51842d34b9" authors = [ - "Gord Stephen ", - "Surya Chandan Dhulipala ", - "Srihari Sundar ", - "Julian Florez ", + "Srihari Sundar ", + "Julian Florez ", + "Gord Stephen " ] version = "0.8.0" diff --git a/PRASCapacityCredits.jl/LICENSE.md b/PRASCapacityCredits.jl/LICENSE.md index 29b607f4..b57d97ea 100644 --- a/PRASCapacityCredits.jl/LICENSE.md +++ b/PRASCapacityCredits.jl/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Alliance for Sustainable Energy, LLC +Copyright (c) 2026 Alliance for Energy Innovation, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/PRASCapacityCredits.jl/Project.toml b/PRASCapacityCredits.jl/Project.toml index 4e8da397..c1de0454 100644 --- a/PRASCapacityCredits.jl/Project.toml +++ b/PRASCapacityCredits.jl/Project.toml @@ -1,6 +1,6 @@ name = "PRASCapacityCredits" uuid = "2e1a2ed5-e89d-4cd3-bc86-c0e88a73d3a3" -authors = ["Gord Stephen "] +authors = ["Gord Stephen "] version = "0.8.0" [deps] diff --git a/PRASCore.jl/LICENSE.md b/PRASCore.jl/LICENSE.md index 29b607f4..b57d97ea 100644 --- a/PRASCore.jl/LICENSE.md +++ b/PRASCore.jl/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Alliance for Sustainable Energy, LLC +Copyright (c) 2026 Alliance for Energy Innovation, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/PRASCore.jl/Project.toml b/PRASCore.jl/Project.toml index 7edaec3f..0bcf4300 100644 --- a/PRASCore.jl/Project.toml +++ b/PRASCore.jl/Project.toml @@ -1,10 +1,10 @@ name = "PRASCore" uuid = "c5c32b99-e7c3-4530-a685-6f76e19f7fe2" authors = [ - "Gord Stephen ", - "Surya Chandan Dhulipala ", - "Srihari Sundar ", - "Julian Florez ", + "Srihari Sundar ", + "Julian Florez ", + "Gord Stephen " ] version = "0.8.1" diff --git a/PRASFiles.jl/LICENSE.md b/PRASFiles.jl/LICENSE.md index 29b607f4..731d6e2d 100644 --- a/PRASFiles.jl/LICENSE.md +++ b/PRASFiles.jl/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Alliance for Sustainable Energy, LLC +Copyright (c) 2020 Alliance for Energy Innovation, LLC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/PRASFiles.jl/Project.toml b/PRASFiles.jl/Project.toml index ef960920..ba238a50 100644 --- a/PRASFiles.jl/Project.toml +++ b/PRASFiles.jl/Project.toml @@ -1,10 +1,10 @@ name = "PRASFiles" uuid = "a2806276-6d43-4ef5-91c0-491704cd7cf1" authors = [ - "Gord Stephen ", - "Surya Chandan Dhulipala ", - "Srihari Sundar ", - "Julian Florez ", + "Srihari Sundar ", + "Julian Florez " ] version = "0.8.0" diff --git a/README.md b/README.md index 14508eba..411f6d93 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ # Probabilistic Resource Adequacy Suite -[![PRAS.jl Tests](https://github.com/NREL/PRAS/actions/workflows/PRAS.jl.yml/badge.svg?branch=main)](https://github.com/NREL/PRAS/actions/workflows/PRAS.jl.yml) -[![PRASCore.jl Tests](https://github.com/NREL/PRAS/actions/workflows/PRASCore.jl.yml/badge.svg?branch=main)](https://github.com/NREL/PRAS/actions/workflows/PRASCore.jl.yml) -[![PRASFiles.jl Tests](https://github.com/NREL/PRAS/actions/workflows/PRASFiles.jl.yml/badge.svg?branch=main)](https://github.com/NREL/PRAS/actions/workflows/PRASFiles.jl.yml) -[![PRASCapacityCredits.jl Tests](https://github.com/NREL/PRAS/actions/workflows/PRASCapacityCredits.jl.yml/badge.svg?branch=main)](https://github.com/NREL/PRAS/actions/workflows/PRASCapacityCredits.jl.yml) +[![PRAS.jl Tests](https://github.com/NatLabRockies/PRAS/actions/workflows/PRAS.jl.yml/badge.svg?branch=main)](https://github.com/NatLabRockies/PRAS/actions/workflows/PRAS.jl.yml) +[![PRASCore.jl Tests](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASCore.jl.yml/badge.svg?branch=main)](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASCore.jl.yml) +[![PRASFiles.jl Tests](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASFiles.jl.yml/badge.svg?branch=main)](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASFiles.jl.yml) +[![PRASCapacityCredits.jl Tests](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASCapacityCredits.jl.yml/badge.svg?branch=main)](https://github.com/NatLabRockies/PRAS/actions/workflows/PRASCapacityCredits.jl.yml) -[![codecov](https://codecov.io/gh/NREL/PRAS/branch/main/graph/badge.svg?token=WiP3quRaIA)](https://codecov.io/gh/NREL/PRAS) -[![docsstable](https://img.shields.io/badge/docs-stable-blue.svg)](https://nrel.github.io/PRAS/) -[![docsdev](https://img.shields.io/badge/docs-dev-blue.svg)](https://nrel.github.io/PRAS/dev) +[![codecov](https://codecov.io/gh/NatLabRockies/PRAS/branch/main/graph/badge.svg?token=WiP3quRaIA)](https://codecov.io/gh/NatLabRockies/PRAS) +[![docsstable](https://img.shields.io/badge/docs-stable-blue.svg)](https://NatLabRockies.github.io/PRAS/) +[![docsdev](https://img.shields.io/badge/docs-dev-blue.svg)](https://NatLabRockies.github.io/PRAS/dev) [![DOI](https://img.shields.io/badge/DOI-10.11578/dc.20190814.1-blue.svg)](https://www.osti.gov/biblio/1557438) The Probabilistic Resource Adequacy Suite (PRAS) is a collection of tools for bulk power system resource adequacy analysis and capacity credit calculation. Latest -documentation is available [here](https://nrel.github.io/PRAS/). +documentation is available [here](https://NatLabRockies.github.io/PRAS/). The citable documentation report for v0.6 is available -[here](https://www.nrel.gov/docs/fy21osti/79698.pdf). +[here](https://www.nlr.gov/docs/fy21osti/79698.pdf). # Installation @@ -61,5 +61,5 @@ println("Total system $(EUE(shortfall))") # Total system EUE = 0.00000 MWh/8784h ``` -The [Getting Started](https://nrel.github.io/PRAS/dev/quickstart/) page provides more information +The [Getting Started](https://natlabrockies.github.io/PRAS/dev/quickstart/) page provides more information on using PRAS. diff --git a/docs/README.md b/docs/README.md index dcc358d2..70fe86b3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,5 +8,5 @@ These are some steps to follow when making changes to documentation. ```bash julia --project=. -e "using Pkg; Pkg.add(\"LiveServer\"); include(\"serve.jl\")" --threads auto ``` -5. Once you push to origin (github.com/NREL/PRAS) and create a pull request, the documentation will be built and served at https://nrel.github.io/PRAS/previews/PR{#}. Once the changes are merged to `main`, the documentation will be available at https://nrel.github.io/PRAS/dev. On tagging a PRAS version for release, the documentation will be available at https://nrel.github.io/PRAS/stable and https://nrel.github.io/PRAS/vX.Y.Z (where X.Y.Z is the version number). +5. Once you push to origin (github.com/NatLabRockies/PRAS) and create a pull request, the documentation will be built and served at https://NatLabRockies.github.io/PRAS/previews/PR{#}. Once the changes are merged to `main`, the documentation will be available at https://NatLabRockies.github.io/PRAS/dev. On tagging a PRAS version for release, the documentation will be available at https://NatLabRockies.github.io/PRAS/stable and https://NatLabRockies.github.io/PRAS/vX.Y.Z (where X.Y.Z is the version number). 6. More instructions on version tagging and release can be found in the [Documenter.jl](https://documenter.juliadocs.org/stable/man/hosting/#Documentation-Versions) instructions. \ No newline at end of file diff --git a/docs/make.jl b/docs/make.jl index 85beb1c9..b05cd341 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -24,7 +24,7 @@ makedocs( sitename = "PRAS", format = Documenter.HTML( prettyurls = true, - canonical = "https://nrel.github.io/PRAS/stable" + canonical = "https://natlabrockies.github.io/PRAS/stable" ), modules = [PRASCore, PRASFiles, PRASCapacityCredits], pages = [ @@ -58,6 +58,6 @@ makedocs( ) deploydocs( - repo = "github.com/NREL/PRAS.git", + repo = "github.com/NatLabRockies/PRAS.git", push_preview = true, ) \ No newline at end of file diff --git a/docs/src/PRAS/acknowledgements.md b/docs/src/PRAS/acknowledgements.md index 684e25f8..583e07b1 100644 --- a/docs/src/PRAS/acknowledgements.md +++ b/docs/src/PRAS/acknowledgements.md @@ -1,8 +1,8 @@ # Acknowledgments -Special thanks to NREL's Trieu Mai, Paul Denholm, and Greg Brinkman for their +Special thanks to NatLabRockies's Trieu Mai, Paul Denholm, and Greg Brinkman for their support and feedback in preparing this work, and to Sarah Awara and Sinnott -Murphy (NREL), as well as Armando Figueroa Acevedo (Black & Veatch), for +Murphy (NatLabRockies), as well as Armando Figueroa Acevedo (Black & Veatch), for reviewing drafts of this report. Additional thanks go to Jaquelin Cochran, Bethany Frew, Wesley Cole, and Aaron Bloom for their broad historical support in the development of the PRAS model. diff --git a/docs/src/changelog.md b/docs/src/changelog.md index 9282e19f..b6b49f03 100644 --- a/docs/src/changelog.md +++ b/docs/src/changelog.md @@ -25,10 +25,10 @@ - Enforced interface-level limits and forced outages for storage and generator-storage. - Removed unused test files and updated the README with a code coverage badge. -This version is availabe at the NREL Julia registries or through source code available -in the [`master`](https://github.com/NREL/PRAS/tree/master) branch of the PRAS github +This version is availabe at the NatLabRockies Julia registries or through source code available +in the [`master`](https://github.com/NatLabRockies/PRAS/tree/master) branch of the PRAS github repository. Documentation for this version is available [here] -(https://docs.nrel.gov/docs/fy21osti/79698.pdf). +(https://docs.NatLabRockies.gov/docs/fy21osti/79698.pdf). ## [0.5], 2020 - November diff --git a/docs/src/index.md b/docs/src/index.md index b2b8eeec..f9e86ce9 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -11,7 +11,7 @@ The Probabilistic Resource Adequacy Suite (PRAS) provides an open-source, resear bulk power system. It allows the user to simulate power system operations under a wide range of operating conditions in order to study the risk of failing to meet demand (due to a lack of supply or deliverability), and identify the time periods and regions in which that risk occurs. It offers high-performance sequential Monte Carlo methods supporting multi-region composite reliability assessment, including simulation of energy-limited resources such as storage. PRAS is developed and maintained at the US -[National Renewable Energy Laboratory](https://www.nrel.gov/) (NREL). +[National Laboratory of the Rockies](https://www.nlr.gov/) (NLR). To get started on using PRAS, see the [installation](@ref Installation) and [quick start](@ref quickstart) pages. diff --git a/docs/src/quickstart.md b/docs/src/quickstart.md index 5ef5dea2..b4ec4c72 100644 --- a/docs/src/quickstart.md +++ b/docs/src/quickstart.md @@ -4,7 +4,7 @@ Once you have PRAS [installed](@ref Installation), this page provides a brief ov ## Parallel Processing -PRAS uses multi-threading, so be sure to set the environment variable controlling the number of threads available to Julia (36 in this Bash example, which is a good choice for NREL Eagle nodes - on a laptop you would probably only want 4 or so) before running scripts or launching the REPL: +PRAS uses multi-threading, so be sure to set the environment variable controlling the number of threads available to Julia (36 in this Bash example, which is a good choice for NatLabRockies Eagle nodes - on a laptop you would probably only want 4 or so) before running scripts or launching the REPL: ```sh export JULIA_NUM_THREADS=36 From 173671e6aae5004e2e660e7a9ed9171f56eaa276 Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Tue, 17 Feb 2026 16:20:38 -0700 Subject: [PATCH 2/3] Address PR comments --- docs/src/PRAS/acknowledgements.md | 4 ++-- docs/src/changelog.md | 2 +- docs/src/quickstart.md | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/src/PRAS/acknowledgements.md b/docs/src/PRAS/acknowledgements.md index 583e07b1..2d168304 100644 --- a/docs/src/PRAS/acknowledgements.md +++ b/docs/src/PRAS/acknowledgements.md @@ -1,8 +1,8 @@ # Acknowledgments -Special thanks to NatLabRockies's Trieu Mai, Paul Denholm, and Greg Brinkman for their +Special thanks to National Laboratory of the Rockies's (NLR) Trieu Mai, Paul Denholm, and Greg Brinkman for their support and feedback in preparing this work, and to Sarah Awara and Sinnott -Murphy (NatLabRockies), as well as Armando Figueroa Acevedo (Black & Veatch), for +Murphy (NLR), as well as Armando Figueroa Acevedo (PJM Interconnection LLC), for reviewing drafts of this report. Additional thanks go to Jaquelin Cochran, Bethany Frew, Wesley Cole, and Aaron Bloom for their broad historical support in the development of the PRAS model. diff --git a/docs/src/changelog.md b/docs/src/changelog.md index b6b49f03..d6d7ed37 100644 --- a/docs/src/changelog.md +++ b/docs/src/changelog.md @@ -28,7 +28,7 @@ This version is availabe at the NatLabRockies Julia registries or through source code available in the [`master`](https://github.com/NatLabRockies/PRAS/tree/master) branch of the PRAS github repository. Documentation for this version is available [here] -(https://docs.NatLabRockies.gov/docs/fy21osti/79698.pdf). +(https://docs.nlr.gov/docs/fy21osti/79698.pdf). ## [0.5], 2020 - November diff --git a/docs/src/quickstart.md b/docs/src/quickstart.md index b4ec4c72..794249e5 100644 --- a/docs/src/quickstart.md +++ b/docs/src/quickstart.md @@ -4,10 +4,12 @@ Once you have PRAS [installed](@ref Installation), this page provides a brief ov ## Parallel Processing -PRAS uses multi-threading, so be sure to set the environment variable controlling the number of threads available to Julia (36 in this Bash example, which is a good choice for NatLabRockies Eagle nodes - on a laptop you would probably only want 4 or so) before running scripts or launching the REPL: +PRAS uses multi-threading, so be sure to set the environment variable controlling the number of threads available to Julia (104 in this Bash example, which is a good choice for NLR's Kestrel nodes, or on a laptop you would probably only want 8, or "auto" to let Julia figure out the default number of threads to use) before running scripts or launching the REPL: ```sh -export JULIA_NUM_THREADS=36 +export JULIA_NUM_THREADS=102 +# Delete the previous line and uncomment the following line for automatically using available threads +# export JULIA_NUM_THREADS="auto" ``` ## Power System Data From e4bff521bece7126f241e81634ad7cda4dac260c Mon Sep 17 00:00:00 2001 From: Srihari Sundar Date: Tue, 17 Feb 2026 16:32:47 -0700 Subject: [PATCH 3/3] Remove orgs in acknowledgement --- docs/src/PRAS/acknowledgements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/PRAS/acknowledgements.md b/docs/src/PRAS/acknowledgements.md index 2d168304..8d31247e 100644 --- a/docs/src/PRAS/acknowledgements.md +++ b/docs/src/PRAS/acknowledgements.md @@ -1,8 +1,8 @@ # Acknowledgments -Special thanks to National Laboratory of the Rockies's (NLR) Trieu Mai, Paul Denholm, and Greg Brinkman for their +Special thanks to Trieu Mai, Paul Denholm, and Greg Brinkman for their support and feedback in preparing this work, and to Sarah Awara and Sinnott -Murphy (NLR), as well as Armando Figueroa Acevedo (PJM Interconnection LLC), for +Murphy, as well as Armando Figueroa Acevedo, for reviewing drafts of this report. Additional thanks go to Jaquelin Cochran, Bethany Frew, Wesley Cole, and Aaron Bloom for their broad historical support in the development of the PRAS model.