Skip to content

Commit

Permalink
Changes Maarten
Browse files Browse the repository at this point in the history
  • Loading branch information
@maartenbrinkerink
maartenbrinkerink committed Jan 17, 2025
1 parent 91d72fa commit 7429ff5
Show file tree
Hide file tree
Showing 8 changed files with 618 additions and 1,504 deletions.
4 changes: 2 additions & 2 deletions config/config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ user_defined_capacity_transmission:
trn25: [TRNAGOXXZMBXX, 0, 2030, 2030, 2040, 2.0, 724, 25.3, 4, 92.4] # Angola–Zambia Interconnector, COD 2030 assumed
trn26: [TRNBWAXXZAFXX, 0, 2030, 2030, 2050, 0, 310, 10.9, 4, 98.1] # Botswana–South Africa (BOSA) Interconnector, MW not avaliable, COD 2030 assumed

trn27: [TRNCODXXZMBXX, 0.827, 2030, 2030, 2050, 0.07, 745, 26.1, 4, 92.1] # Kalumbila–Kolwezi 330 kV Interconnector Project (KKIP), COD 2030 assumed
trn27: [TRNCODXXZMBXX, 0, 2030, 2030, 2050, 0.07, 745, 26.1, 4, 92.1] # Kalumbila–Kolwezi 330 kV Interconnector Project (KKIP), COD 2030 assumed
trn28: [TRNMOZXXMWIXX, 0, 2030, 2030, 2050, 0.120, 616, 21.6, 4, 94] # Mozambique–Malawi (MOMA), COD 2030 assumed
trn29: [TRNMWIXXTZAXX, 0, 2030, 2030, 2050, 0.05, 535, 18.7, 4, 95.2] # Tanzania-Malawi Transmission Interconnector, COD 2030 assumed
trn30: [TRNMOZXXZMBXX, 0, 2030, 2030, 2050, 0.9, 596, 20.9, 4, 94.3] # Mozambique–Zambia Interconnector, COD 2030 assumed
Expand Down Expand Up @@ -199,7 +199,7 @@ storage_parameters:
# Units are in m$/GW (capex_cost, annual_fixed_O&M_cost), $/MWh (variable_O&M_cost),
# % (roundtrip_efficiency), hours (duration = storage capacity (GWh)/Power rating (GW)).
SDS: [1938, 44.25, 0.002, 85, 4]
LDS: [1938, 44.25, 0.002, 85, 4]

nodes_to_add:
#- "AAAXX" where AAA is a 3-letter country code,
# specified in the "geographic scope"
Expand Down
30 changes: 0 additions & 30 deletions resources/data/custom_nodes/RE_potentials.csv
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1 @@
FUEL_TYPE,CUSTOM_NODE,CAPACITY
GEO,BTNXX,0
HYD,BTNXX,25.95
SPV,BTNXX,1.81
WOF,BTNXX,0
WON,BTNXX,61.97
GEO,INDEA,0
HYD,INDEA,19.79
SPV,INDEA,496.03
WOF,INDEA,75.58
WON,INDEA,712.69
GEO,INDNE,0
HYD,INDNE,198.8
SPV,INDNE,100
WOF,INDNE,517.08
WON,INDNE,100
GEO,INDNO,0
HYD,INDNO,158.05
SPV,INDNO,1316.4
WOF,INDNO,0
WON,INDNO,1855.77
GEO,INDSO,0
HYD,INDSO,23.04
SPV,INDSO,789.14
WOF,INDSO,150.42
WON,INDSO,1265.96
GEO,INDWE,0
HYD,INDWE,24.52
SPV,INDWE,1272.78
WOF,INDWE,235.47
WON,INDWE,2021.74
182 changes: 1 addition & 181 deletions resources/data/custom_nodes/specified_annual_demand.csv
View file
Original file line number Diff line number Diff line change
@@ -1,184 +1,4 @@
CUSTOM_NODE,YEAR,VALUE
BTNXX,2021,9.5
BTNXX,2022,11.03
BTNXX,2023,12.58
BTNXX,2024,14.11
BTNXX,2025,15.66
BTNXX,2026,17.32
BTNXX,2027,18.97
BTNXX,2028,20.62
BTNXX,2029,22.27
BTNXX,2030,23.95
BTNXX,2031,25.73
BTNXX,2032,27.51
BTNXX,2033,29.28
BTNXX,2034,31.09
BTNXX,2035,32.86
BTNXX,2036,34.84
BTNXX,2037,36.82
BTNXX,2038,38.8
BTNXX,2039,40.78
BTNXX,2040,42.75
BTNXX,2041,44.93
BTNXX,2042,47.11
BTNXX,2043,49.29
BTNXX,2044,51.47
BTNXX,2045,53.64
BTNXX,2046,56
BTNXX,2047,58.35
BTNXX,2048,60.7
BTNXX,2049,63.06
BTNXX,2050,65.41
INDEA,2021,594.14
INDEA,2022,655.71
INDEA,2023,717.27
INDEA,2024,772.87
INDEA,2025,954.61
INDEA,2026,981.6
INDEA,2027,1012.38
INDEA,2028,1043.24
INDEA,2029,1074.44
INDEA,2030,1105.41
INDEA,2031,1174.28
INDEA,2032,1243.48
INDEA,2033,1314.83
INDEA,2034,1381.43
INDEA,2035,1450.11
INDEA,2036,1531.14
INDEA,2037,1612.66
INDEA,2038,1693.49
INDEA,2039,1771
INDEA,2040,1847.47
INDEA,2041,1935.51
INDEA,2042,2025.21
INDEA,2043,2114.95
INDEA,2044,2202.04
INDEA,2045,2289.82
INDEA,2046,2400.84
INDEA,2047,2502.17
INDEA,2048,2603.44
INDEA,2049,2704.7
INDEA,2050,2805.83
INDNE,2021,124.44
INDNE,2022,134.82
INDNE,2023,145.19
INDNE,2024,157.09
INDNE,2025,195.14
INDNE,2026,201.8
INDNE,2027,208.75
INDNE,2028,215.73
INDNE,2029,222.8
INDNE,2030,229.94
INDNE,2031,244.87
INDNE,2032,259.92
INDNE,2033,274.7
INDNE,2034,289.36
INDNE,2035,304.15
INDNE,2036,320.97
INDNE,2037,337.64
INDNE,2038,354.26
INDNE,2039,371.19
INDNE,2040,387.65
INDNE,2041,406.42
INDNE,2042,424.77
INDNE,2043,443.96
INDNE,2044,463.54
INDNE,2045,482.69
INDNE,2046,505.85
INDNE,2047,527.41
INDNE,2048,548.93
INDNE,2049,570.39
INDNE,2050,591.82
INDNO,2021,1201.31
INDNO,2022,1345.82
INDNO,2023,1490.33
INDNO,2024,1607.32
INDNO,2025,1983.05
INDNO,2026,2046.01
INDNO,2027,2110.99
INDNO,2028,2175.99
INDNO,2029,2240.57
INDNO,2030,2304.75
INDNO,2031,2445.12
INDNO,2032,2584.15
INDNO,2033,2722.59
INDNO,2034,2862.69
INDNO,2035,3002.82
INDNO,2036,3167.14
INDNO,2037,3331.72
INDNO,2038,3495.6
INDNO,2039,3661.16
INDNO,2040,3825.7
INDNO,2041,4014.42
INDNO,2042,4200.14
INDNO,2043,4384.46
INDNO,2044,4564.84
INDNO,2045,4744.94
INDNO,2046,4968.31
INDNO,2047,5176.61
INDNO,2048,5384.83
INDNO,2049,5593.11
INDNO,2050,5801.69
INDSO,2021,1420.31
INDSO,2022,1548.89
INDSO,2023,1677.48
INDSO,2024,1819.57
INDSO,2025,2261.9
INDSO,2026,2350.89
INDSO,2027,2430.09
INDSO,2028,2508.94
INDSO,2029,2588.21
INDSO,2030,2668.04
INDSO,2031,2837.62
INDSO,2032,3009.7
INDSO,2033,3181.67
INDSO,2034,3352.73
INDSO,2035,3524.68
INDSO,2036,3722.05
INDSO,2037,3918.08
INDSO,2038,4114.15
INDSO,2039,4310.15
INDSO,2040,4504.27
INDSO,2041,4726.24
INDSO,2042,4948.9
INDSO,2043,5170.39
INDSO,2044,5393.21
INDSO,2045,5615.87
INDSO,2046,5881.34
INDSO,2047,6132.32
INDSO,2048,6383.02
INDSO,2049,6633.32
INDSO,2050,6883.89
INDWE,2021,1270.15
INDWE,2022,1349.85
INDWE,2023,1429.56
INDWE,2024,1546.72
INDWE,2025,1924.8
INDWE,2026,1984.31
INDWE,2027,2047.52
INDWE,2028,2110.93
INDWE,2029,2173.93
INDWE,2030,2236.94
INDWE,2031,2377.13
INDWE,2032,2515.72
INDWE,2033,2653.12
INDWE,2034,2794.64
INDWE,2035,2933.03
INDWE,2036,3097.73
INDWE,2037,3263.16
INDWE,2038,3429.97
INDWE,2039,3598.18
INDWE,2040,3770.82
INDWE,2041,3967.13
INDWE,2042,4164.53
INDWE,2043,4363.59
INDWE,2044,4567.55
INDWE,2045,4771.66
INDWE,2046,4944.69
INDWE,2047,5158.53
INDWE,2048,5372.85
INDWE,2049,5587.59
INDWE,2050,5801.92
AGOXX,2021,52.12
AGOXX,2022,61.95
AGOXX,2023,66.69
Expand Down Expand Up @@ -538,4 +358,4 @@ ZWEXX,2046,349.8278259
ZWEXX,2047,372.2686263
ZWEXX,2048,396.149345
ZWEXX,2049,421.5623764
ZWEXX,2050,448.6061379
ZWEXX,2050,448.6061379
70 changes: 0 additions & 70 deletions resources/data/fuel_limits.csv
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1 @@
FUEL,COUNTRY,VALUE,YEAR
GAS,IDN,453,2021
GAS,IDN,933,2035
GAS,IDN,933,2050
COA,IDN,3300,2021
COA,IDN,3300,2050
OIL,IDN,0,2021
OIL,IDN,0,2050
GAS,VNM,89,2021
GAS,VNM,178,2035
GAS,VNM,178,2050
COA,VNM,510,2021
COA,VNM,510,2050
OIL,VNM,0,2021
OIL,VNM,0,2050
GAS,MYS,667,2021
GAS,MYS,1335,2035
GAS,MYS,1335,2050
COA,MYS,0,2021
COA,MYS,0,2050
OIL,MYS,0,2021
OIL,MYS,0,2050
GAS,PHL,35,2021
GAS,PHL,71,2035
GAS,PHL,71,2050
COA,PHL,129,2021
COA,PHL,129,2050
OIL,PHL,0,2021
OIL,PHL,0,2050
GAS,LAO,0,2021
GAS,LAO,0,2035
GAS,LAO,0,2050
COA,LAO,236,2021
COA,LAO,236,2050
OIL,LAO,0,2021
OIL,LAO,0,2050
GAS,THA,339,2021
GAS,THA,678,2035
GAS,THA,678,2050
COA,THA,140,2021
COA,THA,140,2050
OIL,THA,0,2021
OIL,THA,0,2050
GAS,KHM,0,2021
GAS,KHM,0,2035
GAS,KHM,0,2050
COA,KHM,0,2021
COA,KHM,0,2050
OIL,KHM,0,2021
OIL,KHM,0,2050
GAS,SGP,0,2021
GAS,SGP,0,2035
GAS,SGP,0,2050
COA,SGP,0,2021
COA,SGP,0,2050
OIL,SGP,0,2021
OIL,SGP,0,2050
GAS,BRN,108,2021
GAS,BRN,216,2035
GAS,BRN,216,2050
COA,BRN,0,2021
COA,BRN,0,2050
OIL,BRN,0,2021
OIL,BRN,0,2050
GAS,MMR,157,2021
GAS,MMR,315,2035
GAS,MMR,315,2050
COA,MMR,0,2021
COA,MMR,0,2050
OIL,MMR,0,2021
OIL,MMR,0,2050
72 changes: 0 additions & 72 deletions resources/data/fuel_prices.csv
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1 @@
FUEL,COUNTRY,UNIT,ENERGY_CONTENT,2020,2025,2030,2040,2050
BIO,BRN,$/GJ,1,8,8,8,8,8
BIO,IDN,$/GJ,1,8,8,8,8,8
BIO,LAO,$/GJ,1,8,8,8,8,8
BIO,MMR,$/GJ,1,8,8,8,8,8
BIO,MYS,$/GJ,1,8,8,8,8,8
BIO,PHL,$/GJ,1,8,8,8,8,8
BIO,THA,$/GJ,1,8,8,8,8,8
BIO,VNM,$/GJ,1,8,8,8,8,8
COA,BRN,$/mt,29.31,61,130,130,130,130
COA,IDN,$/mt,29.31,61,70,70,70,70
COA,LAO,$/mt,29.31,61,100,100,100,100
COA,MMR,$/mt,29.31,61,130,130,130,130
COA,MYS,$/mt,29.31,61,130,130,130,130
COA,PHL,$/mmbtu,29.31,61,130,130,130,130
COA,THA,$/mt,29.31,61,100,100,100,100
COA,VNM,$/mt,29.31,61,100,100,100,100
COG,BRN,$/mmbtu,1.06,6,12,12,12,12
COG,IDN,$/mmbtu,1.06,6,12,12,12,12
COG,LAO,$/mmbtu,1.06,6,12,12,12,12
COG,MMR,$/mmbtu,1.06,6,12,12,12,12
COG,MYS,$/mmbtu,1.06,6,12,12,12,12
COG,PHL,$/mmbtu,1.06,6,12,12,12,12
COG,THA,$/mmbtu,1.06,6,12,12,12,12
COG,VNM,$/mmbtu,1.06,6,12,12,12,12
GAS,BRN,$/mmbtu,1.06,6,9,9,9,9
GAS,IDN,$/mmbtu,1.06,6,12,12,12,12
GAS,LAO,$/mmbtu,1.06,6,15,15,15,15
GAS,MMR,$/mmbtu,1.06,6,9,9,9,9
GAS,MYS,$/mmbtu,1.06,6,9,9,9,9
GAS,PHL,$/mmbtu,1.06,6,9,9,9,9
GAS,THA,$/mmbtu,1.06,6,9,9,9,9
GAS,VNM,$/mmbtu,1.06,6,9,9,9,9
OIL,BRN,$/bbl,6.12,90,90,90,90,90
OIL,IDN,$/bbl,6.12,90,90,90,90,90
OIL,LAO,$/bbl,6.12,90,90,90,90,90
OIL,MMR,$/bbl,6.12,90,90,90,90,90
OIL,MYS,$/bbl,6.12,90,90,90,90,90
OIL,PHL,$/bbl,6.12,90,90,90,90,90
OIL,THA,$/bbl,6.12,90,90,90,90,90
OIL,VNM,$/bbl,6.12,90,90,90,90,90
OTH,BRN,$/bbl,6.12,90,90,90,90,90
OTH,IDN,$/bbl,6.12,90,90,90,90,90
OTH,LAO,$/bbl,6.12,90,90,90,90,90
OTH,MMR,$/bbl,6.12,90,90,90,90,90
OTH,MYS,$/bbl,6.12,90,90,90,90,90
OTH,PHL,$/bbl,6.12,90,90,90,90,90
OTH,THA,$/bbl,6.12,90,90,90,90,90
OTH,VNM,$/bbl,6.12,90,90,90,90,90
PET,BRN,$/bbl,6.12,90,90,90,90,90
PET,IDN,$/bbl,6.12,90,90,90,90,90
PET,LAO,$/bbl,6.12,90,90,90,90,90
PET,MMR,$/bbl,6.12,90,90,90,90,90
PET,MYS,$/bbl,6.12,90,90,90,90,90
PET,PHL,$/bbl,6.12,90,90,90,90,90
PET,THA,$/bbl,6.12,90,90,90,90,90
PET,VNM,$/bbl,6.12,90,90,90,90,90
URN,BRN,$/GJ,1,999,999,999,999,999
URN,IDN,$/GJ,1,999,999,999,999,999
URN,LAO,$/GJ,1,999,999,999,999,999
URN,MMR,$/GJ,1,999,999,999,999,999
URN,MYS,$/GJ,1,999,999,999,999,999
URN,PHL,$/GJ,1,999,999,999,999,999
URN,THA,$/GJ,1,999,999,999,999,999
URN,VNM,$/GJ,1,999,999,999,999,999
WAS,BRN,$/GJ,1,8,8,8,8,8
WAS,IDN,$/GJ,1,8,8,8,8,8
WAS,LAO,$/GJ,1,8,8,8,8,8
WAS,MMR,$/GJ,1,8,8,8,8,8
WAS,MYS,$/GJ,1,8,8,8,8,8
WAS,PHL,$/GJ,1,8,8,8,8,8
WAS,THA,$/GJ,1,8,8,8,8,8
WAS,VNM,$/GJ,1,8,8,8,8,8
Loading

0 comments on commit 7429ff5

Please sign in to comment.