Merge branch 'coeff_change'

Author: SinaHKazemi

.gitignore

@@ -32,4 +32,13 @@ todo.md
 *.lp
 
 # serialization files
-*.jls
+*.jls
+
+# log files
+logs/
+
+# result files
+results/
+
+# figures
+figures/

Project.toml

@@ -5,30 +5,36 @@ authors = ["Sina Hajikazemi <sina.hkazemi@gmail.com>"]
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 Dualization = "191a621a-6537-11e9-281d-650236a99e60"
 GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
 HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
+LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
 PrettyPrinting = "54e16d92-306c-5ea0-a30b-337be88ac337"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 SankeyMakie = "1323c716-dab9-4207-0457-9cc5295a221b"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+cuOpt = "29a73d17-8276-40b7-9ffb-d89e58023643"
 
 [compat]
 CSV = "0.10.15"
+CairoMakie = "0.13.10"
 Dualization = "0.7.1"
 GLMakie = "0.11.11"
 Gurobi = "1.6.3"
 HiGHS = "1.13.0"
 Ipopt = "1.11.0"
 JSON = "0.21.4"
 JuMP = "1.24.0"
+LoggingExtras = "1.2.0"
 PrettyPrinting = "0.4.2"
 Revise = "3.8.0"
 SankeyMakie = "0.1.1"
 StatsPlots = "0.15.7"
 Test = "1.11.0"
+cuOpt = "0.1.1"

examples/Germany/GETM.json examples/Germany/config.jsonexamples/Germany/GETM.json renamed to examples/Germany/config.json

@@ -177,7 +177,7 @@
             "sets": ["P"]
         }
     },
-    "timesteps" : "./time_series/8_weeks_Manual.txt",
+    "timesteps" : "./time_series/4_thin_weeks.txt",
     "years" : [2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050, 2055, 2060],
     "carriers": {
         "Dummy": {},
@@ -534,7 +534,7 @@
                 {"x": 2060, "y": 0}
             ],
             "operational_cost_power": 15,
-            "availability_profile": "./time_series/PV_availability.txt",
+            "availability_profile": "./time_series/PV_Availability.txt",
             "process_color": "gold3",
             "process_order": 405
         },
@@ -556,7 +556,7 @@
                 {"x": 2050, "y": 483},
                 {"x": 2060, "y": 483}
             ],
-            "availability_profile": "./time_series/PV_availability_rescaled.txt",
+            "availability_profile": "./time_series/PV_Availability_rescaled.txt",
             "process_color": "darkgoldenrod1",
             "process_order": 406
         },

examples/House/config.json

@@ -38,9 +38,11 @@ using JuMP
 
 include("./src/core/CESM.jl")
 using .CESM
-# input = CESM.Parser.parse_input("./examples/House/config.json");
+input = CESM.Parser.parse_input("./examples/House/House_PV_Wind_1_week.json");
+# input = CESM.Parser.parse_input("./examples/House/House.json");
+# input = CESM.Parser.parse_input("./examples/House_PV_Battery/config.json");
 # input = CESM.Parser.parse_input("./examples/Germany/GETM.json");
-# output = CESM.Model.run_optimization(input)
+@time output = CESM.Model.run_optimization(input)
 using Serialization
 # serialize("output_Germany.jls", output)
 # serialize("input_Germany.jls", input)
@@ -49,16 +51,16 @@ using Serialization
 
 # serialize("output_House.jls", output)
 # serialize("input_House.jls", input)
-output = deserialize("output_House.jls")
-input = deserialize("input_House.jls")
+# 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"))
-# CESM.Visualization.plot_P_Y(input,output,"new_capacity", carrier_out="Electricity")
-# CESM.Visualization.plot_P_Y(input,output,"active_capacity", carrier_out="Electricity")
+CESM.Visualization.plot_P_Y(input,output,"active_capacity", carrier_out="Electricity")
+# CESM.Visualization.plot_P_Y(input,output,"active_capacity", carrier_out="Battery")
 # CESM.Visualization.plot_P_Y(input,output,"total_energy_out", carrier_out="Electricity")
 # CESM.Visualization.plot_Y(input,output,"annual_emission")
-CESM.Visualization.plot_P_Y_T(input,output,"energy_out_time", 2030, carrier_out= "Electricity")
+# CESM.Visualization.plot_P_Y_T(input,output,"energy_out_time", 2030, carrier_out= "Electricity")
 # CESM.Visualization.plot_scalar(input,output,["total_cost", "operational_cost", "capital_cost"])
 # CESM.Visualization.plot_sankey(input,output,2050)