User extension API revision, adding to GOC3 model

src/mpopf.jl

@@ -234,8 +234,11 @@ function build_mpopf(data, Nbus, N, form, user_callback; backend = nothing, T =
         vars, cons = add_piecewise_cons(core, data, N, vars, cons, storage_complementarity_constraint)
     end
 
-    vars, cons = user_callback(core, vars, cons)
-    model = ExaModel(core; kwargs...)
+    vars2, cons2 = user_callback(core, vars, cons)
+    model =ExaModel(core; kwargs...)
+
+    vars = (;vars..., vars2)
+    cons = (;cons..., cons2)
     return model, vars, cons
 end
 
@@ -251,8 +254,11 @@ function build_mpopf(data, Nbus, N, discharge_func::Function, form, user_callbac
         vars, cons = add_smooth_cons(core, data, N, vars, cons, discharge_func)
     end
 
-    vars, cons = user_callback(core, vars, cons)
-    model = ExaModel(core; kwargs...)
+    vars2, cons2 = user_callback(core, vars, cons)
+    model =ExaModel(core; kwargs...)
+
+    vars = (;vars..., vars2)
+    cons = (;cons..., cons2)
     return model, vars, cons
 end
 

src/opf.jl

@@ -1,5 +1,5 @@
 function dummy_extension(core, vars, cons)
-    return vars, cons
+    return (;), (;)
 end
 
 function build_polar_opf(data, user_callback; backend = nothing, T=Float64, kwargs...)
@@ -87,9 +87,12 @@ function build_polar_opf(data, user_callback; backend = nothing, T=Float64, kwar
         c_to_thermal_limit = c_to_thermal_limit
     )
 
-    vars, cons = user_callback(core, vars, cons)
+    vars2, cons2 = user_callback(core, vars, cons)
     model =ExaModel(core; kwargs...)
 
+    vars = (;vars..., vars2...)
+    cons = (;cons..., cons2...)
+
     return model, vars, cons
 end
 
@@ -182,8 +185,11 @@ function build_rect_opf(data, user_callback; backend = nothing, T=Float64, kwarg
         c_voltage_magnitude = c_voltage_magnitude
     )
 
-    vars, cons = user_callback(core, vars, cons)
-    model = ExaModel(core; kwargs...)
+    vars2, cons2 = user_callback(core, vars, cons)
+    model =ExaModel(core; kwargs...)
+
+    vars = (;vars..., vars2)
+    cons = (;cons..., cons2)
 
     return model, vars, cons
 end

test/runtests.jl

@@ -83,8 +83,8 @@ function add_electrolyzers(core, vars, cons)
     length(elec_data)), -elec_scale),
     ucon = fill!(similar(elec_data, Float64,
     length(elec_data)), elec_scale))
-    vars = (;vars..., p_elec=p_elec)
-    cons = (;cons..., c_elec_ramp=c_elec_ramp)
+    vars = (p_elec=p_elec)
+    cons = (c_elec_ramp=c_elec_ramp)
     return vars, cons
 end