From 75e8a154e91598d3b032dff89f38f9bfad83fe2e Mon Sep 17 00:00:00 2001
From: maartenbrinkerink <65602545+maartenbrinkerink@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:48:57 -0500
Subject: [PATCH] OL updates

---
 config/config.yaml                            |  13 +-
 resources/data/operational_life.csv           |  24 +--
 resources/data/powerplant_build_rates.csv     | 190 +++++++++++-------
 .../scripts/osemosys_global/reserves/main.py  |   3 +-
 4 files changed, 133 insertions(+), 97 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index adf79cea..84d3ac1a 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -15,8 +15,9 @@ dayparts:
  # D4: [19, 25]
 seasons:
   #season : [month 1, month 2, ...] (all inclusive)
-  S1: [1, 2, 3, 4, 5, 6]
-  S2: [7, 8, 9, 10, 11, 12]
+ # S1: [1, 2, 3, 4, 5, 6]
+  #S2: [7, 8, 9, 10, 11, 12]
+  S1: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 
 timeshift: 0 # value between -11 and 12
   
@@ -39,7 +40,6 @@ crossborderTrade: True
 emission_penalty: 
 # - [EMISSION, COUNTRY, START_YEAR, END_YEAR, VALUE]
 # where VALUE is in M$/MT CO2
-# - ["CO2", "IND", 2020, 2050, 2.1]
 
 # Investment Parameters 
 no_invest_technologies: 
@@ -49,8 +49,6 @@ no_invest_technologies:
   - "OTH"
   - "WAS"
   - "COG" 
-#  - "GEO"
-#  - "BIO"
   - "PET"
 
 # Result Parameters 
@@ -66,7 +64,6 @@ user_defined_capacity:
   #              build_rate_per_year, 
   #              capex_cost, 
   #              efficiency]
-#  PWRCOAINDWE01: [8, 2000, 2025, 5, 1100, 35]
   # Units are in GW (capacity/build_rate_per_year), m$/GW (capex_cost), 
   # % (efficiency).
 
@@ -86,7 +83,7 @@ user_defined_capacity_transmission:
   trn4: [TRNLAOXXTHANO, 0, 2020, 2025, 3, 391, 13.7, 4, 97.3]
   trn5: [TRNLAOXXVNMNO, 0, 2020, 2025, 3, 412, 14.4, 4, 97]
   trn6: [TRNKHMXXVNMSO, 0, 2020, 2025, 3, 261, 9.1, 4, 98.6]
-#  trn7: [TRNKHMXXLAOXX, 0, 2020, 2025, 3, 477, 16.7, 4, 96.1]
+#  trn7: [TRNKHMXXLAOXX, 0, 2020, 2025, 3, 477, 16.7, 4, 96.1] #already existing in GTD
   trn8: [TRNKHMXXTHACE, 0, 2020, 2025, 3, 426, 14.9, 4, 96.8]
   trn9: [TRNMYSPEMYSSK, 0, 2020, 2025, 3, 586, 20.5, 4, 95.3]
   trn10: [TRNMYSSHMYSSK, 0, 2020, 2025, 3, 489, 17.1, 4, 95.9]
@@ -97,7 +94,7 @@ user_defined_capacity_transmission:
   trn15: [TRNBRNXXMYSSH, 0, 2020, 2025, 3, 231, 8.1, 4, 98.8]
   trn16: [TRNMMRXXTHANO, 0, 2020, 2025, 3, 387, 13.5, 4, 97.4]
   trn17: [TRNIDNKAMYSSH, 0, 2020, 2025, 3, 471, 16.5, 4, 96.1]
-#  trn18: [TRNLAOXXMMRXX, 0, 2020, 2025, 3, 463, 16.2, 4, 96.3]
+#  trn18: [TRNLAOXXMMRXX, 0, 2020, 2025, 3, 463, 16.2, 4, 96.3] #already existing in GTD
   trn19: [TRNIDNJWIDNKA, 0, 2020, 2025, 3, 683, 23.9, 4, 94.1]
   trn20: [TRNSGPXXVNMSO, 0, 2020, 2025, 3, 953, 33.4, 4, 92.6]
   trn21: [TRNKHMXXSGPXX, 0, 2020, 2025, 3, 990, 34.7, 4, 92.2]
diff --git a/resources/data/operational_life.csv b/resources/data/operational_life.csv
index 078e992c..5b3fc422 100644
--- a/resources/data/operational_life.csv
+++ b/resources/data/operational_life.csv
@@ -1,9 +1,9 @@
 tech,years
 Bio,30
-Coa,30
+Coa,50
 Cog,30
-Gas-CCGT,30
-Gas-OCGT,30
+Gas-CCGT,50
+Gas-OCGT,50
 Geo,30
 Hyd,100
 Nuc,60
@@ -17,10 +17,10 @@ Win,30
 Csp,30
 Wof,30
 BIO,30
-COA,30
-COG,30
-OCG,30
-CCG,30
+COA,50
+COG,50
+OCG,50
+CCG,50
 GEO,30
 HYD,100
 URN,60
@@ -35,17 +35,17 @@ CSP,30
 WOF,30
 HET,30
 oil,30
-gas,30
+gas,50
 waste_heat,30
 biomass,30
-coal,30
-gas_or_oil,30
+coal,50
+gas_or_oil,50
 wind-onshore,30
 sun,30
 waste,30
 wind-offshore,30
-coal+ccs,30
-CCS,30
+coal+ccs,50
+CCS,50
 TRN,60
 SDS,30
 LDS,60
diff --git a/resources/data/powerplant_build_rates.csv b/resources/data/powerplant_build_rates.csv
index efcdd7a9..d20d9cf8 100644
--- a/resources/data/powerplant_build_rates.csv
+++ b/resources/data/powerplant_build_rates.csv
@@ -28,16 +28,16 @@ CCG,PHL,ABS,0,2021,2024
 CCG,SGP,ABS,0,2021,2024
 CCG,THA,ABS,0,2021,2024
 CCG,VNM,ABS,0,2021,2024
-CCG,BRN,ABS,5,2025,2050
-CCG,IDN,ABS,5,2025,2050
-CCG,KHM,ABS,5,2025,2050
-CCG,LAO,ABS,5,2025,2050
-CCG,MMR,ABS,5,2025,2050
-CCG,MYS,ABS,5,2025,2050
-CCG,PHL,ABS,5,2025,2050
-CCG,SGP,ABS,5,2025,2050
-CCG,THA,ABS,5,2025,2050
-CCG,VNM,ABS,5,2025,2050
+CCG,BRN,ABS,20,2025,2050
+CCG,IDN,ABS,20,2025,2050
+CCG,KHM,ABS,20,2025,2050
+CCG,LAO,ABS,20,2025,2050
+CCG,MMR,ABS,20,2025,2050
+CCG,MYS,ABS,20,2025,2050
+CCG,PHL,ABS,20,2025,2050
+CCG,SGP,ABS,20,2025,2050
+CCG,THA,ABS,20,2025,2050
+CCG,VNM,ABS,20,2025,2050
 CCS,BRN,ABS,0,2021,2039
 CCS,IDN,ABS,0,2021,2039
 CCS,KHM,ABS,0,2021,2039
@@ -48,16 +48,16 @@ CCS,PHL,ABS,0,2021,2039
 CCS,SGP,ABS,0,2021,2039
 CCS,THA,ABS,0,2021,2039
 CCS,VNM,ABS,0,2021,2039
-CCS,BRN,ABS,5,2040,2050
-CCS,IDN,ABS,5,2040,2050
-CCS,KHM,ABS,5,2040,2050
-CCS,LAO,ABS,5,2040,2050
-CCS,MMR,ABS,5,2040,2050
-CCS,MYS,ABS,5,2040,2050
-CCS,PHL,ABS,5,2040,2050
-CCS,SGP,ABS,5,2040,2050
-CCS,THA,ABS,5,2040,2050
-CCS,VNM,ABS,5,2040,2050
+CCS,BRN,ABS,10,2040,2050
+CCS,IDN,ABS,10,2040,2050
+CCS,KHM,ABS,10,2040,2050
+CCS,LAO,ABS,10,2040,2050
+CCS,MMR,ABS,10,2040,2050
+CCS,MYS,ABS,10,2040,2050
+CCS,PHL,ABS,10,2040,2050
+CCS,SGP,ABS,10,2040,2050
+CCS,THA,ABS,10,2040,2050
+CCS,VNM,ABS,10,2040,2050
 COA,BRN,ABS,0,2021,2024
 COA,IDN,ABS,0,2021,2026
 COA,KHM,ABS,0,2021,2024
@@ -68,15 +68,15 @@ COA,PHL,ABS,0,2021,2024
 COA,SGP,ABS,0,2021,2050
 COA,THA,ABS,0,2021,2024
 COA,VNM,ABS,0,2021,2024
-COA,BRN,ABS,5,2025,2050
-COA,KHM,ABS,5,2025,2050
-COA,LAO,ABS,5,2025,2050
-COA,MMR,ABS,5,2025,2050
-COA,MYS,ABS,5,2025,2050
-COA,PHL,ABS,5,2025,2050
-COA,THA,ABS,5,2025,2050
-COA,VNM,ABS,5,2025,2050
-COA,IDN,ABS,5,2027,2050
+COA,BRN,ABS,20,2025,2050
+COA,KHM,ABS,20,2025,2050
+COA,LAO,ABS,20,2025,2050
+COA,MMR,ABS,20,2025,2050
+COA,MYS,ABS,20,2025,2050
+COA,PHL,ABS,20,2025,2050
+COA,THA,ABS,20,2025,2050
+COA,VNM,ABS,20,2025,2050
+COA,IDN,ABS,20,2027,2050
 GEO,BRN,ABS,0,2021,2024
 GEO,IDN,ABS,0,2021,2024
 GEO,KHM,ABS,0,2021,2024
@@ -107,16 +107,56 @@ HYD,PHL,ABS,0,2021,2024
 HYD,SGP,ABS,0,2021,2024
 HYD,THA,ABS,0,2021,2024
 HYD,VNM,ABS,0,2021,2024
-HYD,BRN,ABS,5,2025,2050
-HYD,IDN,ABS,5,2025,2050
-HYD,KHM,ABS,5,2025,2050
-HYD,LAO,ABS,5,2025,2050
-HYD,MMR,ABS,5,2025,2050
-HYD,MYS,ABS,5,2025,2050
-HYD,PHL,ABS,5,2025,2050
-HYD,SGP,ABS,5,2025,2050
-HYD,THA,ABS,5,2025,2050
-HYD,VNM,ABS,5,2025,2050
+HYD,BRN,ABS,10,2025,2050
+HYD,IDN,ABS,10,2025,2050
+HYD,KHM,ABS,10,2025,2050
+HYD,LAO,ABS,10,2025,2050
+HYD,MMR,ABS,10,2025,2050
+HYD,MYS,ABS,10,2025,2050
+HYD,PHL,ABS,10,2025,2050
+HYD,SGP,ABS,10,2025,2050
+HYD,THA,ABS,10,2025,2050
+HYD,VNM,ABS,10,2025,2050
+OCG,BRN,ABS,0,2021,2024
+OCG,IDN,ABS,0,2021,2024
+OCG,KHM,ABS,0,2021,2024
+OCG,LAO,ABS,0,2021,2024
+OCG,MMR,ABS,0,2021,2024
+OCG,MYS,ABS,0,2021,2024
+OCG,PHL,ABS,0,2021,2024
+OCG,SGP,ABS,0,2021,2024
+OCG,THA,ABS,0,2021,2024
+OCG,VNM,ABS,0,2021,2024
+OCG,BRN,ABS,20,2025,2050
+OCG,IDN,ABS,20,2025,2050
+OCG,KHM,ABS,20,2025,2050
+OCG,LAO,ABS,20,2025,2050
+OCG,MMR,ABS,20,2025,2050
+OCG,MYS,ABS,20,2025,2050
+OCG,PHL,ABS,20,2025,2050
+OCG,SGP,ABS,20,2025,2050
+OCG,THA,ABS,20,2025,2050
+OCG,VNM,ABS,20,2025,2050
+OIL,BRN,ABS,0,2021,2024
+OIL,IDN,ABS,0,2021,2024
+OIL,KHM,ABS,0,2021,2024
+OIL,LAO,ABS,0,2021,2024
+OIL,MMR,ABS,0,2021,2024
+OIL,MYS,ABS,0,2021,2024
+OIL,PHL,ABS,0,2021,2024
+OIL,SGP,ABS,0,2021,2024
+OIL,THA,ABS,0,2021,2024
+OIL,VNM,ABS,0,2021,2024
+OIL,BRN,ABS,20,2025,2050
+OIL,IDN,ABS,20,2025,2050
+OIL,KHM,ABS,20,2025,2050
+OIL,LAO,ABS,20,2025,2050
+OIL,MMR,ABS,20,2025,2050
+OIL,MYS,ABS,20,2025,2050
+OIL,PHL,ABS,20,2025,2050
+OIL,SGP,ABS,20,2025,2050
+OIL,THA,ABS,20,2025,2050
+OIL,VNM,ABS,20,2025,2050
 SPV,BRN,ABS,0,2021,2024
 SPV,IDN,ABS,0,2021,2024
 SPV,KHM,ABS,0,2021,2024
@@ -127,16 +167,16 @@ SPV,PHL,ABS,0,2021,2024
 SPV,SGP,ABS,0,2021,2024
 SPV,THA,ABS,0,2021,2024
 SPV,VNM,ABS,0,2021,2024
-SPV,BRN,ABS,5,2025,2050
-SPV,IDN,ABS,10,2025,2050
-SPV,KHM,ABS,5,2025,2050
-SPV,LAO,ABS,5,2025,2050
-SPV,MMR,ABS,5,2025,2050
-SPV,MYS,ABS,10,2025,2050
-SPV,PHL,ABS,10,2025,2050
-SPV,SGP,ABS,5,2025,2050
-SPV,THA,ABS,10,2025,2050
-SPV,VNM,ABS,10,2025,2050
+SPV,BRN,ABS,10,2025,2050
+SPV,IDN,ABS,20,2025,2050
+SPV,KHM,ABS,10,2025,2050
+SPV,LAO,ABS,10,2025,2050
+SPV,MMR,ABS,10,2025,2050
+SPV,MYS,ABS,20,2025,2050
+SPV,PHL,ABS,20,2025,2050
+SPV,SGP,ABS,10,2025,2050
+SPV,THA,ABS,20,2025,2050
+SPV,VNM,ABS,20,2025,2050
 URN,BRN,ABS,0,2021,2050
 URN,IDN,ABS,0,2021,2038
 URN,KHM,ABS,0,2021,2050
@@ -147,12 +187,12 @@ URN,PHL,ABS,0,2021,2038
 URN,SGP,ABS,0,2021,2038
 URN,THA,ABS,0,2021,2038
 URN,VNM,ABS,0,2021,2038
-URN,IDN,ABS,5,2039,2050
-URN,MYS,ABS,5,2039,2050
-URN,PHL,ABS,5,2039,2050
-URN,SGP,ABS,5,2039,2050
-URN,THA,ABS,5,2039,2050
-URN,VNM,ABS,5,2039,2050
+URN,IDN,ABS,10,2039,2050
+URN,MYS,ABS,10,2039,2050
+URN,PHL,ABS,10,2039,2050
+URN,SGP,ABS,10,2039,2050
+URN,THA,ABS,10,2039,2050
+URN,VNM,ABS,10,2039,2050
 WOF,BRN,ABS,0,2021,2024
 WOF,IDN,ABS,0,2021,2024
 WOF,KHM,ABS,0,2021,2024
@@ -163,16 +203,16 @@ WOF,PHL,ABS,0,2021,2024
 WOF,SGP,ABS,0,2021,2024
 WOF,THA,ABS,0,2021,2024
 WOF,VNM,ABS,0,2021,2024
-WOF,BRN,ABS,5,2025,2050
-WOF,IDN,ABS,10,2025,2050
-WOF,KHM,ABS,5,2025,2050
-WOF,LAO,ABS,5,2025,2050
-WOF,MMR,ABS,5,2025,2050
-WOF,MYS,ABS,10,2025,2050
-WOF,PHL,ABS,10,2025,2050
-WOF,SGP,ABS,5,2025,2050
-WOF,THA,ABS,10,2025,2050
-WOF,VNM,ABS,10,2025,2050
+WOF,BRN,ABS,10,2025,2050
+WOF,IDN,ABS,20,2025,2050
+WOF,KHM,ABS,10,2025,2050
+WOF,LAO,ABS,10,2025,2050
+WOF,MMR,ABS,10,2025,2050
+WOF,MYS,ABS,20,2025,2050
+WOF,PHL,ABS,20,2025,2050
+WOF,SGP,ABS,10,2025,2050
+WOF,THA,ABS,20,2025,2050
+WOF,VNM,ABS,20,2025,2050
 WON,BRN,ABS,0,2021,2024
 WON,IDN,ABS,0,2021,2024
 WON,KHM,ABS,0,2021,2024
@@ -183,13 +223,13 @@ WON,PHL,ABS,0,2021,2024
 WON,SGP,ABS,0,2021,2024
 WON,THA,ABS,0,2021,2024
 WON,VNM,ABS,0,2021,2024
-WON,BRN,ABS,5,2025,2050
-WON,IDN,ABS,10,2025,2050
-WON,KHM,ABS,5,2025,2050
-WON,LAO,ABS,5,2025,2050
-WON,MMR,ABS,5,2025,2050
-WON,MYS,ABS,10,2025,2050
-WON,PHL,ABS,10,2025,2050
-WON,SGP,ABS,5,2025,2050
-WON,THA,ABS,10,2025,2050
-WON,VNM,ABS,10,2025,2050
+WON,BRN,ABS,10,2025,2050
+WON,IDN,ABS,20,2025,2050
+WON,KHM,ABS,10,2025,2050
+WON,LAO,ABS,10,2025,2050
+WON,MMR,ABS,10,2025,2050
+WON,MYS,ABS,20,2025,2050
+WON,PHL,ABS,20,2025,2050
+WON,SGP,ABS,10,2025,2050
+WON,THA,ABS,20,2025,2050
+WON,VNM,ABS,20,2025,2050
diff --git a/workflow/scripts/osemosys_global/reserves/main.py b/workflow/scripts/osemosys_global/reserves/main.py
index aaa8d46e..fcad148c 100644
--- a/workflow/scripts/osemosys_global/reserves/main.py
+++ b/workflow/scripts/osemosys_global/reserves/main.py
@@ -60,8 +60,7 @@ def main(tech_set_base: pd.DataFrame,
         start_year = 2021
         end_year = 2050
         region_name = 'GLOBAL'
-        margins = {'RM1': [10, 2025, 2029],
-                   'RM2': [15, 2030, 2050]}
+        margins = {'RM1': [15, 2025, 2050]}
         
         margins_technologies = {
             'BIO' : 90,