Skip to content

Commit 7ec37b8

Browse files
committed
NodeDemand
1 parent 7901c1a commit 7ec37b8

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Node,Name,Max_Demand
2-
1,Nordics,1
3-
2,Eastern,1
4-
3,Western,1
5-
4,Central,1
6-
5,Mediterranian,1
2+
1,Nordics,77242.18980648856
3+
2,Eastern,48988.979278891115
4+
3,Western,226705.8821384105
5+
4,Central,157951.81425229515
6+
5,Mediterranian,152415.00077221723

src/Data_generation/data_generation.jl

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ end
125125
- `t`: number of technologies used in the model
126126
"""
127127

128-
function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_input, Dataset, folder, subfolder, instance, T, t)
128+
function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_input, Dataset, folder, subfolder, instance, T, t, Fmin)
129129

130130
# create path for the instance
131131
structure_path = joinpath(folder,subfolder)
@@ -452,8 +452,7 @@ function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_
452452
# hydro.csv file
453453
node = [1:n;]
454454
HydroRoR = permutedims(hydroRoRCap)
455-
Fmin = 0.05
456-
Fmin_mat = fill(0.05, n)
455+
Fmin_mat = fill(Fmin, n)
457456
hyd_in_avg = []
458457
for i in 1:n
459458
hyd_in_avg = vcat(hyd_in_avg, mean(hyd_in[:,i]))
@@ -518,10 +517,18 @@ function create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_
518517
rename!(N_m, ["Demand", "Avail_Sol", "Avail_Wind_On" ,"Avail_Wind_Off", "Hyd_In" ,"HydRoR_In"])
519518
CSV.write(joinpath(nodes_path, "$i.csv"), N_m)
520519
end
521-
520+
521+
x = 1
522522
# create file for node_specs
523+
NodeDemand = []
524+
for i = 1:n
525+
Max_Node_Demand = maximum(Demand[x:T*i], dims=1)
526+
x = x+T
527+
NodeDemand = append!(NodeDemand, Max_Node_Demand)
528+
end
529+
523530
NodeNr = [1:n;]
524-
Max_Demand = repeat(1:1; outer=[length(Regionlist)])
531+
Max_Demand = NodeDemand
525532
nodes_specs = DataFrame(hcat(NodeNr, Regionlist, Max_Demand), :auto)
526533
rename!(nodes_specs, ["Node", "Name", "Max_Demand" ])
527534
CSV.write(joinpath(instance_path, "nodes_specs.csv"), nodes_specs)

src/Data_generation/run_data_generation.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ Regions = ["Nordics", "Eastern", "Western", "Central", "Mediterranian"]
2424
T = 8760
2525
# number of technologies
2626
t = 8 # 8 since hydro is not included here
27+
## Value of Fmin
28+
Fmin = 0.05
2729

2830
Dataset = get_countries(Regions)
2931

30-
create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_input, Dataset, folder, subfolder, instance, T, t)
32+
create_data_sets(inputdata, sspscenario_input, sspyear_input, era_year_input, Dataset, folder, subfolder, instance, T, t, Fmin)
3133

3234

3335

0 commit comments

Comments
 (0)