Wmax/Wmin

Author: JuliusBeranek

examples/structures/5_regions/hydro_capacity.csv

@@ -1,6 +1,6 @@
 node,hydro_tech,hcap_min,hcap_max,wcap_min,wcap_max
 1.0,1.0,45543.38197389718,45835.16276609281,1.5618e7,5.4729e7
-2.0,1.0,267.9701403994462,377.8545119268383,1.616151e6,3.081398e6
-3.0,1.0,8008.5895885413165,12401.41625291198,1.807e6,4.008e6
-4.0,1.0,10235.9857149834,14358.1893092965,631295.0,6.053548e6
-5.0,1.0,25685.795825138965,34928.484054091874,8.526148e6,2.0199805e7
+2.0,1.0,267.9701403994462,377.8545119268383,104358.79057591622,198973.3438045375
+3.0,1.0,8008.5895885413165,12401.41625291198,743050.9510481522,1.6481174387387903e6
+4.0,1.0,10235.9857149834,14358.1893092965,206402.1388953085,1.9792098069926375e6
+5.0,1.0,25685.795825138965,34928.484054091874,5.401580949773639e6,1.2797207118283931e7

src/Data_generation/data_generation.jl

@@ -363,6 +363,8 @@ function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_
         Hydro_summed = combine(groupby(List_full, :x1), names(List_full, Not(:x1)) .=> sum, renamecols=false)
         reservoir = Hydro_summed[!,:x4]./(Hydro_summed[!,:x2] .+ Hydro_summed[!,:x3] .+ Hydro_summed[!,:x4])
         reservoir_table = hcat(Regions, reservoir)        
+        ## Percentage between PHS and reservoir for later calculation of Wmin and Wmax
+        reservoir_PHS = Hydro_summed[!,:x4]./(Hydro_summed[!,:x2] .+ Hydro_summed[!,:x4])
     end   
 
     reservoirp =  permutedims(reservoir_table[:,2])
@@ -439,8 +441,9 @@ function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_
     NodeNr = [1:n;]
     H_min = permutedims(hydroCap)      # existing reservoir capacity per node (percentage)
     HR_max = permutedims(hydroRoRCap)        # RoR counterpart of existing capacity 
-    W_max = Wmax_summed[:,2]
-    W_min = Wmin_summed[:,2]
+    ## ENTSO-E data includes both PHS and reservoir, so we need the reservoir percentage to calculate acutal Wmin and Wmax for reservoir only
+    W_max = Wmax_summed[:,2].*reservoir_PHS
+    W_min = Wmin_summed[:,2].*reservoir_PHS
     hydro_tech = repeat(1:1, inner=n)
     Hydro_cap = DataFrame(hcat(NodeNr, hydro_tech, H_min, H_max, W_min, W_max), :auto)
     rename!(Hydro_cap, ["node", "hydro_tech", "hcap_min", "hcap_max", "wcap_min" ,"wcap_max"])