fix storage varible name and constraint_storage_state parameter lookup

dsehloff · Sep 17, 2019 · d5e36ba · d5e36ba
1 parent 0385442
commit d5e36ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/core/constraint_template.jl b/src/core/constraint_template.jl
@@ -745,10 +745,10 @@ end
 function constraint_storage_state(pm::AbstractPowerModel, i::Int, nw_1::Int, nw_2::Int)
     storage = ref(pm, nw_2, :storage, i)
 
-    if haskey(pm.data, "time_elapsed")
-        time_elapsed = pm.data["time_elapsed"]
+    if haskey(ref(pm, nw_2), :time_elapsed)
+        time_elapsed = ref(pm, nw_2, :time_elapsed)
     else
-        Memento.warn(_LOGGER, "network data should specify time_elapsed, using 1.0 as a default")
+        Memento.warn(_LOGGER, "network $(nw_2) should specify time_elapsed, using 1.0 as a default")
         time_elapsed = 1.0
     end
 

diff --git a/src/core/variable.jl b/src/core/variable.jl
@@ -610,11 +610,11 @@ end
 ""
 function variable_storage_complementary_indicator(pm::AbstractPowerModel; nw::Int=pm.cnw)
     var(pm, nw)[:sc_on] = JuMP.@variable(pm.model,
-        [i in ids(pm, nw, :storage)], base_name="$(nw)_sc", Bin,
+        [i in ids(pm, nw, :storage)], base_name="$(nw)_sc_on", Bin,
         start = comp_start_value(ref(pm, nw, :storage, i), "sc_on_start", 0)
     )
     var(pm, nw)[:sd_on] = JuMP.@variable(pm.model,
-        [i in ids(pm, nw, :storage)], base_name="$(nw)_sd", Bin,
+        [i in ids(pm, nw, :storage)], base_name="$(nw)_sd_on", Bin,
         start = comp_start_value(ref(pm, nw, :storage, i), "sd_on_start", 0)
     )
 end