Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/pr_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirming, is this meant to be committed or just for debugging?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I want to keep it because if it fails in one OS throws all the CI out

matrix:
julia-version: ['1']
julia-arch: [x64]
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ JuMP = "^1.28"
LinearAlgebra = "1"
Logging = "1"
MathOptInterface = "1"
PowerFlows = "^0.18"
PowerFlows = "^0.19"
PowerModels = "^0.21.5"
PowerNetworkMatrices = "^0.21"
PowerNetworkMatrices = "^0.22"
PowerSystems = "^5.10"
PrettyTables = "2.4, 3.1"
ProgressMeter = "^1.5"
Expand Down
3 changes: 0 additions & 3 deletions src/PowerSimulations.jl
Original file line number Diff line number Diff line change
Expand Up @@ -687,10 +687,8 @@ include("devices_models/devices/TwoTerminalDC_branches.jl")
include("devices_models/devices/HVDCsystems.jl")
include("devices_models/devices/source.jl")
include("devices_models/devices/reactivepower_device.jl")
#include("devices_models/devices/regulation_device.jl")

# Services Models
#include("services_models/agc.jl")
include("services_models/reserves.jl")
include("services_models/reserve_group.jl")
include("services_models/transmission_interface.jl")
Expand All @@ -716,7 +714,6 @@ include("devices_models/device_constructors/renewablegeneration_constructor.jl")
include("devices_models/device_constructors/load_constructor.jl")
include("devices_models/device_constructors/source_constructor.jl")
include("devices_models/device_constructors/reactivepowerdevice_constructor.jl")
#include("devices_models/device_constructors/regulationdevice_constructor.jl")

# Network constructors
include("network_models/network_constructor.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/core/device_model.jl
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function _set_model!(
dict::Dict,
model::DeviceModel{D, B},
) where {D <: PSY.Device, B <: AbstractDeviceFormulation}
key = Symbol(D)
key = Symbol(IS.strip_module_name(D))
if haskey(dict, key)
@warn "Overwriting $(D) existing model"
end
Expand Down
375 changes: 189 additions & 186 deletions src/core/network_model.jl

Large diffs are not rendered by default.

142 changes: 0 additions & 142 deletions src/devices_models/device_constructors/regulationdevice_constructor.jl

This file was deleted.

6 changes: 3 additions & 3 deletions src/devices_models/devices/common/add_to_expression.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2075,9 +2075,9 @@ function _reduced_entry_in_interface(
branch_names = PSY.get_name.(reduction_entry)
throw(
ArgumentError(
"An interface is specified with only part of a double-circuit that has been reduced.
"An interface is specified with only part of a double-circuit that has been reduced.
Branches: $(branch_names[in_interface]) are in the interface and branches: $(branch_names[.!in_interface]) are not.
Modify the data to include all of or none of the parallel segements.",
Modify the data to include all of or none of the parallel segments.",
),
Comment on lines +2078 to 2081
)
end
Expand Down Expand Up @@ -2197,7 +2197,7 @@ function add_to_expression!(
) where {U <: VariableType, V <: PSY.Reserve, W <: AbstractReservesFormulation}
contributing_devices_map = get_contributing_devices_map(model)
for (device_type, devices) in contributing_devices_map
device_model = get(devices_template, Symbol(device_type), nothing)
device_model = get(devices_template, nameof(device_type), nothing)
isnothing(device_model) && continue
Comment on lines 2199 to 2201
expression_type = get_expression_type_for_reserve(U(), device_type, V)
add_to_expression!(container, expression_type, U, devices, model)
Expand Down
Loading
Loading