minor changes

Author: SinaHKazemi

examples/House/config.json

@@ -178,9 +178,6 @@
         "Vehicles_Propulsion": {
             "carrier_color": "tomato1"
         },
-        "Heat": {
-            "carrier_color": "firebrick2"
-        },
         "Electricity": {
             "carrier_color": "orange"
         }
@@ -189,18 +186,10 @@
         "Import_Electricity": {
             "carrier_in": "Dummy",
             "carrier_out": "Electricity",
-            "operational_cost_energy": 0.30,
+            "operational_cost_energy": 0.50,
             "process_color": "lightcyan",
             "process_order": 1
         },
-        "Demand_Heat": {
-            "carrier_in": "Heat",
-            "carrier_out": "Dummy",            
-            "min_energy_out": 3000,
-            "output_profile": "./time_series/Household_Heat_Demand.txt",
-            "process_color": "plum2",
-            "process_order": 300
-        },
         "Demand_Electricity": {
             "carrier_in": "Electricity",
             "carrier_out": "Dummy",
@@ -214,7 +203,7 @@
             "carrier_out": "Electricity",
             "lifetime": 20,
             "operational_cost_power": 15,
-            "capital_cost_power": 1500,
+            "capital_cost_power": 1200,
             "availability_profile": "./time_series/PV_availability_rescaled.txt",
             "process_color": "darkgoldenrod1",
             "process_order": 406
@@ -224,29 +213,19 @@
             "carrier_out": "Electricity",
             "lifetime": 25,
             "operational_cost_power": 20,
-            "capital_cost_power": 4000,
+            "capital_cost_power": 3500,
             "availability_profile": "./time_series/Onshore_Wind_Availability_rescaled.txt",
             "process_color": "royalblue1",
             "process_order": 409
         },
-        "Heat_Pump": {
-            "carrier_in": "Electricity",
-            "carrier_out": "Heat",
-            "efficiency": 3.7,
-            "lifetime": 17,
-            "operational_cost_power": 20,
-            "capital_cost_power": 2000,
-            "process_color": "tomato2",
-            "process_order": 603
-        },
         "Battery": {
             "_comment": "energy storage capacity of the battery is equal to the capacity of the conversion process(max power in and out) divided by c_rate",
             "carrier_in": "Electricity",
             "carrier_out": "Electricity",
             "lifetime": 15,
-            "capital_cost_power": 1500,
+            "capital_cost_power": 2000,
             "is_storage": true,
-            "c_rate": 0.5,
+            "c_rate": 0.3,
             "process_color": "green2",
             "process_order": 1001
         }

src/core/model.jl

@@ -21,7 +21,7 @@ function build_model(input::Input, model::Union{JuMP.Model,Nothing}=nothing)
     if model === nothing
         # Gurobi
         model = JuMP.Model(Gurobi.Optimizer)
-        set_attribute(model, "Crossover", 0)
+        # set_attribute(model, "Crossover", 0)
         set_attribute(model, "Method", 2)
 
         # HiGHS

src/core/visualization.jl

@@ -42,14 +42,14 @@ module  Visualization
         columns = Vector{Int}()
         values = Vector{Float64}()
         colors = Vector{String}()
-        stacks = Vector{String}()
+        stacks = Vector{Int}()
 
         for p in processes
             for y in input.years
                 if (p,y) in keys(output[var_name])
                     push!(columns,Int(y))
                     push!(values, output[var_name][p,y])
-                    push!(stacks, string(p))
+                    push!(stacks, findfirst(==(p), processes))
                     push!(colors, input.parameters["process_color"][p])
                 end
             end
@@ -68,15 +68,14 @@ module  Visualization
             ax,
             columns,
             values,
-            stack = UInt64.(hash.(stacks)),
+            stack = stacks,
             color = colors
         )
 
         # Legend
-        uniqueidx(v) = unique(i -> v[i], eachindex(v))
-        indices = uniqueidx(stacks)
-        labels = stacks[indices]
-        elements = [PolyElement(polycolor =colors[i]) for i in indices]
+        indices = unique(stacks)
+        labels = [string(processes[i]) for i in reverse(indices)]
+        elements = [PolyElement(polycolor =input.parameters["process_color"][processes[i]]) for i in reverse(indices)]
         title = "Processes"
 
         Legend(fig[1,2], elements, labels, title)

test.jl

@@ -21,19 +21,36 @@
 # model = read_from_file("model.mps")
 # set_optimizer(model, Gurobi.Optimizer)
 # optimize!(model)
+# PP_Wind = first(filter(p -> p.name == "PP_Wind", input.processes))
+# println(sum(get(output["new_capacity"],(Battery,y),0) for y in input.years))
 
 # println("Conversion complete: '$input_file' -> '$output_file'")
 
+# (model,vars,constraints) = CESM.Model.build_model(input)
+# Battery = first(filter(p -> p.name == "Battery", input.processes))
+# @constraint(model, sum(vars["new_capacity"][Battery,y] for y in input.years if Int(y)<=2050) >= 2, base_name="battery_increase")
+# CESM.Model.optimize_model(model)
+# output = CESM.Model.get_output(input, vars)
+
+
+
+using JuMP
 
 include("./src/core/CESM.jl")
 using .CESM
 # input = CESM.Parser.parse_input("./examples/House/config.json");
-# output = CESM.Model.run_model(input)
-# using Serialization
-# serialize("output.jls", output)
-# serialize("input.jls", input)
-output = deserialize("output.jls")
-input = deserialize("input.jls")
+# input = CESM.Parser.parse_input("./examples/Germany/GETM.json");
+# output = CESM.Model.run_optimization(input)
+using Serialization
+# serialize("output_Germany.jls", output)
+# serialize("input_Germany.jls", input)
+# output = deserialize("output_Germany.jls")
+# input = deserialize("input_Germany.jls")
+
+# serialize("output_House.jls", output)
+# serialize("input_House.jls", input)
+output = deserialize("output_House.jls")
+input = deserialize("input_House.jls")
 
 
 # CESM.Visualization.plot_P_Y(input,output,"new_capacity", carrier_out=CESM.Components.Carrier("Industrial_Heat_LT"))
@@ -45,6 +62,8 @@ CESM.Visualization.plot_P_Y_T(input,output,"energy_out_time", 2030, carrier_out=
 # CESM.Visualization.plot_scalar(input,output,["total_cost", "operational_cost", "capital_cost"])
 # CESM.Visualization.plot_sankey(input,output,2050)
 
+
+
 # using CairoMakie
 # using WGLMakie
 # WGLMakie.activate!()