Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into GenX_retrofit_MIT
Browse files Browse the repository at this point in the history
  • Loading branch information
lbonaldo committed Mar 8, 2024
2 parents 036ac38 + 4c5e6d2 commit 10d0b75
Show file tree
Hide file tree
Showing 952 changed files with 80,895 additions and 323,013 deletions.
24 changes: 3 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,8 @@ test/Logs
~$*

# Never include output folders
**/Results*/
**/TDR_Results/

# Example systems which may be or have been under development
Example_Systems/NYISO*
Example_Systems/RealSystemExample/PG_Test_2030_p1/
Example_Systems/RealSystemExample/Inputs/
Example_Systems/SmallNewEngland/ThreeZones_full*
Example_Systems/SmallNewEngland/Test_Up_Time/
Example_Systems/SmallNewEngland/Test_Down_Time/
2050/

Example_Systems/SmallNewEngland/ThreeZones_full.zip
Example_Systems/SmallNewEngland/ThreeZones_full/*

Example_Systems/SmallNewEngland/ThreeZones_MultiStage/Inputs/*
test_get_retirement_period.jl
**/results*/
**/TDR_results/

# Test files
test/TDR/TDR_Results_test
test/MethodofMorris/morris.csv
!test/VREStor/Results_true/
!test/ThreeZones/Results_true/
test/TDR/TDR_results_test
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Maintenance formulation for thermal-commit plants (#556).
- Add new tests for GenX: three-zone, multi-stage, electrolyzer, VRE+storage,
piecewise_fuel+CO2, and TDR (#563 and #578).
- Added a DC OPF method (#543) to calculate power flows across all lines
- Added write_operating_reserve_price_revenue.jl to compute annual operating reserve and regulation revenue.
Added the operating reserve and regulation revenue to net revenue (PR # 611)
- Add functions to compute conflicting constraints when model is infeasible if supported by the solver (#624).
- New settings parameter, VirtualChargeDischargeCost to test script and VREStor example case. The PR 608 attempts to
introduce this parameter as cost of virtual charging and discharging to avoid unusual results (#608).
- New settings parameter, StorageVirtualDischarge, to turn storage virtual charging and discharging off if desired by the user (#638).


### Fixed
Expand Down Expand Up @@ -71,6 +73,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
The new files are: `Thermal.csv`, `Hydro.csv`, `Vre.csv`, `Storage.csv`, `Flex_demand.csv`, `Must_run.csv`,
`Electrolyzer.csv`, and `Vre_stor.csv`. The examples have been updated, and new tests have been added to
check the new data format (#612).
- The settings parameter `Reserves` has been renamed to `OperationalReserves`, `Reserves.csv` to
`Operational_reserves.csv`, and the `.jl` files contain the word `reserves` have been renamed to
`operational_reserves` (#641).
- New folder structure for a GenX case. The input files are now organized in the following folders: `settings`,
`policies`, `resources` and `system`. The examples and tests have been updated to reflect this change.

### Deprecated
- The above `load` keys, which generally refer to electrical demand, are being deprecated.
Expand Down
Loading

0 comments on commit 10d0b75

Please sign in to comment.