Skip to content

Commit

Permalink
Merge branch 'main' into jd/hvdc_model
Browse files Browse the repository at this point in the history
  • Loading branch information
jd-lara authored Sep 6, 2023
2 parents 0f7539d + 4fc6be7 commit 728dcb6
Show file tree
Hide file tree
Showing 90 changed files with 2,368 additions and 5,377 deletions.
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PowerSimulations"
uuid = "e690365d-45e2-57bb-ac84-44ba829e73c4"
authors = ["Jose Daniel Lara", "Clayton Barrows", "Daniel Thom", "Dheepak Krishnamurthy", "Sourabh Dalvi"]
version = "0.21.0"
version = "0.23.0"

[deps]
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
Expand Down Expand Up @@ -42,8 +42,8 @@ JSON3 = "1"
JuMP = "1"
MathOptInterface = "1"
PowerModels = "~0.19"
PowerNetworkMatrices = "^0.7"
PowerSystems = "2"
PowerNetworkMatrices = "^0.8"
PowerSystems = "^2.6"
PrettyTables = "^1.3, 2"
ProgressMeter = "^1.5"
TimeSeries = "~0.23"
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ For example, an annual production cost modeling simulation can be created by for

```julia
julia> ]
(v1.8) pkg> add PowerSystems
(v1.8) pkg> add PowerSimulations
(v1.9) pkg> add PowerSystems
(v1.9) pkg> add PowerSimulations
```

## Usage
Expand All @@ -54,5 +54,4 @@ Contributions to the development and enhancement of PowerSimulations is welcome.

## License

PowerSimulations is released under a BSD [license](https://github.com/NREL-Sienna/PowerSimulations.jl/blob/main/LICENSE). PowerSimulations has been developed as part of the Scalable Integrated Infrastructure Planning (SIIP)
initiative at the U.S. Department of Energy's National Renewable Energy Laboratory ([NREL](https://www.nrel.gov/))
PowerSimulations is released under a BSD [license](https://github.com/NREL-Sienna/PowerSimulations.jl/blob/main/LICENSE). PowerSimulations has been developed as part of the Scalable Integrated Infrastructure Planning (SIIP) initiative at the U.S. Department of Energy's National Renewable Energy Laboratory ([NREL](https://www.nrel.gov/))
1 change: 1 addition & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8"
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
InfrastructureSystems = "2cd47ed4-ca9b-11e9-27f2-ab636a7671f1"
Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316"
PowerSimulations = "e690365d-45e2-57bb-ac84-44ba829e73c4"
Expand Down
4 changes: 1 addition & 3 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ pages = OrderedDict(
"modeler_guide/modeling_faq.md",
],
"Model Developer Guide" => Any[
"Adding Formulations" => "model_developer_guide/adding_new_device_formulation.md"
"Adding Problems" => "model_developer_guide/adding_new_problem_model.md"
"Operation Problem Structure" => "model_developer_guide/structure_of_operation_problem.md"
"Troubleshooting" => "model_developer_guide/troubleshooting.md"
],
"Code Base Developer Guide" => Any[
Expand All @@ -34,7 +33,6 @@ pages = OrderedDict(
"Formulation Library" => Any[
"General" => "formulation_library/General.md",
"Thermal Generation" => "formulation_library/ThermalGen.md",
"Hydro Generation" => "formulation_library/HydroGen.md",
"Renewable Generation" => "formulation_library/RenewableGen.md",
"Load" => "formulation_library/Load.md",
"Network" => "formulation_library/Network.md",
Expand Down
47 changes: 6 additions & 41 deletions docs/src/api/PowerSimulations.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ Refer to the [Formulations Page](@ref formulation_library) for each Abstract Dev

Refer to the [Problem Templates Page](@ref op_problem_template) for available `ProblemTemplate`s.

### Problem Templates

Refer to the [Problem Templates Page](https://nrel-siip.github.io/PowerSimulations.jl/latest/modeler_guide/problem_templates/) for available `ProblemTemplate`s.

```@raw html
 
 
Expand Down Expand Up @@ -98,14 +102,12 @@ execute!(::Simulation)
# Variables

For a list of variables for each device refer to its Formulations page.

### Common Variables

```@docs
ActivePowerVariable
ReactivePowerVariable
PieceWiseLinearCostVariable
```

### Thermal Unit Variables
Expand All @@ -128,25 +130,6 @@ PowerAboveMinimumVariable
ReservationVariable
```

### Hydro Variables

```@docs
WaterSpillageVariable
EnergyVariableUp
EnergyVariableDown
EnergyOutput
```

### Common for Hydro and Storage Variables

```@docs
ActivePowerOutVariable
ActivePowerInVariable
EnergyVariable
EnergyShortageVariable
EnergySurplusVariable
```

### Branches and Network Variables

```@docs
Expand Down Expand Up @@ -196,7 +179,6 @@ PieceWiseLinearCostConstraint
### Network Constraints

```@docs
ActiveConstraint
AreaDispatchBalanceConstraint
AreaParticipationAssignmentConstraint
BalanceAuxConstraint
Expand Down Expand Up @@ -232,7 +214,6 @@ ReservePowerConstraint
ActiveRangeICConstraint
CommitmentConstraint
DurationConstraint
MustRunConstraint
RampConstraint
RampLimitConstraint
StartupInitialConditionConstraint
Expand All @@ -246,18 +227,6 @@ EqualityConstraint
```

### Hydro and Storage Constraints

```@docs
EnergyBalanceConstraint
EnergyBudgetConstraint
EnergyCapacityConstraint
EnergyCapacityDownConstraint
EnergyCapacityUpConstraint
EnergyTargetConstraint
RangeLimitConstraint
```

### Branches Constraints

```@docs
Expand Down Expand Up @@ -289,19 +258,15 @@ FeedforwardEnergyTargetConstraint

# Parameters

### Time Series Parameters
## Time Series Parameters

```@docs
ActivePowerTimeSeriesParameter
ReactivePowerTimeSeriesParameter
RequirementTimeSeriesParameter
EnergyTargetTimeSeriesParameter
EnergyBudgetTimeSeriesParameter
InflowTimeSeriesParameter
OutflowTimeSeriesParameter
```

### Variable Value Parameters
## Variable Value Parameters

```@docs
UpperBoundValueParameter
Expand Down
Loading

0 comments on commit 728dcb6

Please sign in to comment.