Merge branch 'lanl-ansi:master' into master

Author: hskkanth

CHANGELOG.md

@@ -3,6 +3,10 @@
 ## Staged
 - nothing
 
+## v0.10.2 
+- bug fix in Steady State transfer cost model 
+- fix for power expression and power variable writing
+
 ## v0.10.1
 - use JuMP v1.23.2 to fix a bug in NLExpression's get value. 
 

Project.toml

@@ -2,7 +2,7 @@ name = "GasModels"
 uuid = "5e113713-6c35-5477-b766-e1109486666f"
 authors = ["Russell Bent <[email protected]>", "Kaarthik Sundar <[email protected]>", "David Fobes <[email protected]>"]
 repo = "https://github.com/lanl-ansi/GasModels.jl.git"
-version = "0.10.1"
+version = "0.10.2"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -23,7 +23,7 @@ HiGHS = "~0.3, ~1"
 InfrastructureModels = "~0.6, ~0.7"
 Ipopt = "~0.8, ~0.9, ~1"
 JSON = "~0.18, ~0.19, ~0.20, ~0.21"
-JuMP = "1.23.2"
+JuMP = "~1.0, 1"
 Juniper = ">= 0.4"
 Memento = "~1.0, ~1.1, ~1.2, ~1.3, ~1.4"
 PolyhedralRelaxations = "~0.3"

src/core/objective.jl

@@ -111,7 +111,7 @@ function objective_min_economic_costs(gm::AbstractGasModel, nws = [nw_id_default
     )
     transfer_prices = Dict(
         n => Dict(
-            i => get(ref(gm, n, :transfer, i), "bid_price", 1.0) for i in transfer_set[n]
+            i => ref(gm, n, :transfer, i)["withdrawal_min"] >= 0.0 ?  get(ref(gm, n, :transfer, i), "bid_price", 1.0) : (-1) * get(ref(gm, n, :transfer, i), "offer_price", 1.0) for i in transfer_set[n]
         ) for n in nws
     )
 

src/core/variable.jl

@@ -298,7 +298,8 @@ function variable_load_mass_flow(gm::AbstractGasModel, nw::Int=nw_id_default; bo
     fl = var(gm, nw)[:fl] = JuMP.@variable(gm.model,
         [i in ids(gm,nw,:dispatchable_delivery)],
         base_name="$(nw)_fl",
-        start=comp_start_value(ref(gm, nw, :delivery), i, "fl_start", 0.0)
+        start=comp_start_value(ref(gm, nw, :delivery), i, "fl_start", 
+        ref(gm,nw,:delivery,i)["withdrawal_max"])
     )
 
     if bounded
@@ -325,7 +326,10 @@ function variable_transfer_mass_flow(gm::AbstractGasModel, nw::Int=nw_id_default
     ft = var(gm, nw)[:ft] = JuMP.@variable(gm.model,
         [i in ids(gm,nw,:dispatchable_transfer)],
         base_name="$(nw)_ft",
-        start=comp_start_value(ref(gm, nw, :transfer), i, "ft_start", 0.0)
+        start= ref(gm, nw, :transfer, i)["withdrawal_min"] < 0.0 ?
+            ref(gm, nw, :transfer, i)["withdrawal_min"] :
+            ref(gm, nw, :transfer, i)["withdrawal_max"]
+        # comp_start_value(ref(gm, nw, :transfer), i, "ft_start", rand())
     )
 
     if bounded
@@ -352,7 +356,9 @@ function variable_production_mass_flow(gm::AbstractGasModel, nw::Int=nw_id_defau
     fg = var(gm, nw)[:fg] = JuMP.@variable(gm.model,
         [i in ids(gm,nw,:dispatchable_receipt)],
         base_name="$(nw)_fg",
-        start=comp_start_value(ref(gm, nw, :receipt), i, "fg_start", 0.0)
+        start=comp_start_value(ref(gm, nw, :receipt), i, "fg_start", 
+        ref(gm,nw,:receipt,i)["injection_max"]
+        )
     )
 
     if bounded