OAR fix and build rate updates

Author: maartenbrinkerink

resources/data/powerplant_build_rates.csv

@@ -9,15 +9,24 @@ BIO,PHL,ABS,0,2023,2024
 BIO,SGP,ABS,0,2023,2024
 BIO,THA,ABS,0,2023,2024
 BIO,VNM,ABS,0,2023,2024
-BIO,IDN,ABS,5,2025,2050
-BIO,KHM,ABS,1,2025,2050
-BIO,LAO,ABS,1,2025,2050
-BIO,MMR,ABS,1,2025,2050
-BIO,MYS,ABS,5,2025,2050
-BIO,PHL,ABS,0,2025,2050
-BIO,SGP,ABS,0,2025,2050
-BIO,THA,ABS,1,2025,2050
-BIO,VNM,ABS,5,2025,2050
+BIO,IDN,ABS,0.5,2025,2030
+BIO,KHM,ABS,0.5,2025,2030
+BIO,LAO,ABS,0.5,2025,2030
+BIO,MMR,ABS,0.5,2025,2030
+BIO,MYS,ABS,0.5,2025,2030
+BIO,PHL,ABS,0.5,2025,2030
+BIO,SGP,ABS,0.5,2025,2030
+BIO,THA,ABS,0.5,2025,2030
+BIO,VNM,ABS,0.5,2025,2030
+BIO,IDN,ABS,1,2031,2050
+BIO,KHM,ABS,1,2031,2050
+BIO,LAO,ABS,1,2031,2050
+BIO,MMR,ABS,1,2031,2050
+BIO,MYS,ABS,1,2031,2050
+BIO,PHL,ABS,1,2031,2050
+BIO,SGP,ABS,1,2031,2050
+BIO,THA,ABS,1,2031,2050
+BIO,VNM,ABS,2,2031,2050
 CCG,BRN,ABS,0,2023,2024
 CCG,IDN,ABS,0,2023,2024
 CCG,KHM,ABS,0,2023,2024
@@ -28,16 +37,16 @@ CCG,PHL,ABS,0,2023,2024
 CCG,SGP,ABS,0,2023,2024
 CCG,THA,ABS,0,2023,2024
 CCG,VNM,ABS,0,2023,2024
-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
+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
 CCS,BRN,ABS,0,2023,2039
 CCS,IDN,ABS,0,2023,2039
 CCS,KHM,ABS,0,2023,2039
@@ -48,16 +57,16 @@ CCS,PHL,ABS,0,2023,2039
 CCS,SGP,ABS,0,2023,2039
 CCS,THA,ABS,0,2023,2039
 CCS,VNM,ABS,0,2023,2039
-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
+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
 COA,BRN,ABS,0,2023,2024
 COA,IDN,ABS,0,2023,2026
 COA,KHM,ABS,0,2023,2024
@@ -68,15 +77,15 @@ COA,PHL,ABS,0,2023,2024
 COA,SGP,ABS,0,2023,2050
 COA,THA,ABS,0,2023,2024
 COA,VNM,ABS,0,2023,2024
-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
+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,2025,2050
 GEO,BRN,ABS,0,2023,2024
 GEO,IDN,ABS,0,2023,2024
 GEO,KHM,ABS,0,2023,2024
@@ -88,12 +97,13 @@ GEO,SGP,ABS,0,2023,2024
 GEO,THA,ABS,0,2023,2024
 GEO,VNM,ABS,0,2023,2024
 GEO,BRN,ABS,0,2025,2050
-GEO,IDN,ABS,5,2025,2050
+GEO,IDN,ABS,0.5,2025,2050
 GEO,KHM,ABS,0,2025,2050
 GEO,LAO,ABS,0,2025,2050
 GEO,MMR,ABS,0,2025,2050
 GEO,MYS,ABS,0,2025,2050
-GEO,PHL,ABS,5,2025,2050
+GEO,PHL,ABS,0.5,2025,2030
+GEO,PHL,ABS,1,2031,2050
 GEO,SGP,ABS,0,2025,2050
 GEO,THA,ABS,0,2025,2050
 GEO,VNM,ABS,0,2025,2050
@@ -107,16 +117,26 @@ HYD,PHL,ABS,0,2023,2024
 HYD,SGP,ABS,0,2023,2024
 HYD,THA,ABS,0,2023,2024
 HYD,VNM,ABS,0,2023,2024
-HYD,BRN,ABS,0,2025,2050
-HYD,IDN,ABS,3,2025,2050
-HYD,KHM,ABS,3,2025,2050
-HYD,LAO,ABS,3,2025,2050
-HYD,MMR,ABS,5,2025,2050
-HYD,MYS,ABS,3,2025,2050
-HYD,PHL,ABS,3,2025,2050
-HYD,SGP,ABS,0,2025,2050
-HYD,THA,ABS,3,2025,2050
-HYD,VNM,ABS,3,2025,2050
+HYD,BRN,PCT,1,2025,2030
+HYD,IDN,PCT,1,2025,2030
+HYD,KHM,PCT,1,2025,2030
+HYD,LAO,PCT,1,2025,2030
+HYD,MMR,PCT,1,2025,2030
+HYD,MYS,PCT,1,2025,2030
+HYD,PHL,PCT,1,2025,2030
+HYD,SGP,PCT,1,2025,2030
+HYD,THA,PCT,1,2025,2030
+HYD,VNM,PCT,1,2025,2030
+HYD,BRN,PCT,3,2031,2050
+HYD,IDN,PCT,3,2031,2050
+HYD,KHM,PCT,3,2031,2050
+HYD,LAO,PCT,3,2031,2050
+HYD,MMR,PCT,3,2031,2050
+HYD,MYS,PCT,3,2031,2050
+HYD,PHL,PCT,3,2031,2050
+HYD,SGP,PCT,3,2031,2050
+HYD,THA,PCT,3,2031,2050
+HYD,VNM,PCT,3,2031,2050
 OCG,BRN,ABS,0,2023,2024
 OCG,IDN,ABS,0,2023,2024
 OCG,KHM,ABS,0,2023,2024
@@ -127,16 +147,16 @@ OCG,PHL,ABS,0,2023,2024
 OCG,SGP,ABS,0,2023,2024
 OCG,THA,ABS,0,2023,2024
 OCG,VNM,ABS,0,2023,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
+OCG,BRN,ABS,5,2025,2050
+OCG,IDN,ABS,5,2025,2050
+OCG,KHM,ABS,5,2025,2050
+OCG,LAO,ABS,5,2025,2050
+OCG,MMR,ABS,5,2025,2050
+OCG,MYS,ABS,5,2025,2050
+OCG,PHL,ABS,5,2025,2050
+OCG,SGP,ABS,5,2025,2050
+OCG,THA,ABS,5,2025,2050
+OCG,VNM,ABS,5,2025,2050
 OIL,BRN,ABS,0,2023,2024
 OIL,IDN,ABS,0,2023,2024
 OIL,KHM,ABS,0,2023,2024
@@ -147,16 +167,16 @@ OIL,PHL,ABS,0,2023,2024
 OIL,SGP,ABS,0,2023,2024
 OIL,THA,ABS,0,2023,2024
 OIL,VNM,ABS,0,2023,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
+OIL,BRN,ABS,5,2025,2050
+OIL,IDN,ABS,5,2025,2050
+OIL,KHM,ABS,5,2025,2050
+OIL,LAO,ABS,5,2025,2050
+OIL,MMR,ABS,5,2025,2050
+OIL,MYS,ABS,5,2025,2050
+OIL,PHL,ABS,5,2025,2050
+OIL,SGP,ABS,5,2025,2050
+OIL,THA,ABS,5,2025,2050
+OIL,VNM,ABS,5,2025,2050
 SPV,BRN,ABS,0,2023,2024
 SPV,IDN,ABS,0,2023,2024
 SPV,KHM,ABS,0,2023,2024
@@ -167,32 +187,41 @@ SPV,PHL,ABS,0,2023,2024
 SPV,SGP,ABS,0,2023,2024
 SPV,THA,ABS,0,2023,2024
 SPV,VNM,ABS,0,2023,2024
-SPV,BRN,PCT,10,2025,2050
-SPV,IDN,PCT,10,2025,2050
-SPV,KHM,PCT,10,2025,2050
-SPV,LAO,PCT,10,2025,2050
-SPV,MMR,PCT,10,2025,2050
-SPV,MYS,PCT,10,2025,2050
-SPV,PHL,PCT,10,2025,2050
+SPV,BRN,PCT,1,2025,2030
+SPV,IDN,PCT,1,2025,2030
+SPV,KHM,PCT,1,2025,2030
+SPV,LAO,PCT,1,2025,2030
+SPV,MMR,PCT,1,2025,2030
+SPV,MYS,PCT,1,2025,2030
+SPV,PHL,PCT,1,2025,2030
 SPV,SGP,ABS,1,2025,2050
-SPV,THA,PCT,10,2025,2050
-SPV,VNM,PCT,10,2025,2050
+SPV,THA,PCT,1,2025,2030
+SPV,VNM,PCT,1,2025,2030
+SPV,BRN,PCT,3,2031,2050
+SPV,IDN,PCT,3,2031,2050
+SPV,KHM,PCT,3,2031,2050
+SPV,LAO,PCT,3,2031,2050
+SPV,MMR,PCT,3,2031,2050
+SPV,MYS,PCT,3,2031,2050
+SPV,PHL,PCT,3,2031,2050
+SPV,THA,PCT,3,2031,2050
+SPV,VNM,PCT,3,2031,2050
 URN,BRN,ABS,0,2023,2050
-URN,IDN,ABS,0,2023,2038
+URN,IDN,ABS,0,2023,2035
 URN,KHM,ABS,0,2023,2050
 URN,LAO,ABS,0,2023,2050
 URN,MMR,ABS,0,2023,2050
-URN,MYS,ABS,0,2023,2038
-URN,PHL,ABS,0,2023,2038
-URN,SGP,ABS,0,2023,2038
-URN,THA,ABS,0,2023,2038
-URN,VNM,ABS,0,2023,2038
-URN,IDN,ABS,2,2033,2050
-URN,MYS,ABS,2,2033,2050
-URN,PHL,ABS,2,2033,2050
-URN,SGP,ABS,2,2033,2050
-URN,THA,ABS,2,2033,2050
-URN,VNM,ABS,2,2033,2050
+URN,MYS,ABS,0,2023,2035
+URN,PHL,ABS,0,2023,2035
+URN,SGP,ABS,0,2023,2033
+URN,THA,ABS,0,2023,2035
+URN,VNM,ABS,0,2023,2035
+URN,IDN,ABS,2,2036,2050
+URN,MYS,ABS,2,2036,2050
+URN,PHL,ABS,2,2036,2050
+URN,SGP,ABS,2,2034,2050
+URN,THA,ABS,2,2036,2050
+URN,VNM,ABS,2,2036,2050
 WOF,BRN,ABS,0,2023,2024
 WOF,IDN,ABS,0,2023,2024
 WOF,KHM,ABS,0,2023,2024
@@ -203,16 +232,25 @@ WOF,PHL,ABS,0,2023,2024
 WOF,SGP,ABS,0,2023,2024
 WOF,THA,ABS,0,2023,2024
 WOF,VNM,ABS,0,2023,2024
-WOF,BRN,PCT,10,2025,2050
-WOF,IDN,PCT,10,2025,2050
-WOF,KHM,PCT,10,2025,2050
+WOF,BRN,PCT,1,2025,2030
+WOF,IDN,PCT,1,2025,2030
+WOF,KHM,PCT,1,2025,2030
 WOF,LAO,ABS,0,2025,2050
-WOF,MMR,PCT,10,2025,2050
-WOF,MYS,PCT,10,2025,2050
-WOF,PHL,PCT,10,2025,2050
-WOF,SGP,PCT,10,2025,2050
-WOF,THA,PCT,10,2025,2050
-WOF,VNM,PCT,10,2025,2050
+WOF,MMR,PCT,1,2025,2030
+WOF,MYS,PCT,1,2025,2030
+WOF,PHL,PCT,1,2025,2030
+WOF,SGP,PCT,1,2025,2030
+WOF,THA,PCT,1,2025,2030
+WOF,VNM,PCT,1,2025,2030
+WOF,BRN,PCT,3,2031,2050
+WOF,IDN,PCT,3,2031,2050
+WOF,KHM,PCT,3,2031,2050
+WOF,MMR,PCT,3,2031,2050
+WOF,MYS,PCT,3,2031,2050
+WOF,PHL,PCT,3,2031,2050
+WOF,SGP,PCT,3,2031,2050
+WOF,THA,PCT,3,2031,2050
+WOF,VNM,PCT,3,2031,2050
 WON,BRN,ABS,0,2023,2024
 WON,IDN,ABS,0,2023,2024
 WON,KHM,ABS,0,2023,2024
@@ -223,13 +261,23 @@ WON,PHL,ABS,0,2023,2024
 WON,SGP,ABS,0,2023,2024
 WON,THA,ABS,0,2023,2024
 WON,VNM,ABS,0,2023,2024
-WON,BRN,PCT,10,2025,2050
-WON,IDN,PCT,10,2025,2050
-WON,KHM,PCT,10,2025,2050
-WON,LAO,PCT,10,2025,2050
-WON,MMR,PCT,10,2025,2050
-WON,MYS,PCT,10,2025,2050
-WON,PHL,PCT,10,2025,2050
-WON,SGP,PCT,10,2025,2050
-WON,THA,PCT,10,2025,2050
-WON,VNM,PCT,10,2025,2050
+WON,BRN,PCT,1,2025,2030
+WON,IDN,PCT,1,2025,2030
+WON,KHM,PCT,1,2025,2030
+WON,LAO,PCT,1,2025,2030
+WON,MMR,PCT,1,2025,2030
+WON,MYS,PCT,1,2025,2030
+WON,PHL,PCT,1,2025,2030
+WON,SGP,PCT,1,2025,2030
+WON,THA,PCT,1,2025,2030
+WON,VNM,PCT,1,2025,2030
+WON,BRN,PCT,3,2031,2050
+WON,IDN,PCT,3,2031,2050
+WON,KHM,PCT,3,2031,2050
+WON,LAO,PCT,3,2031,2050
+WON,MMR,PCT,3,2031,2050
+WON,MYS,PCT,3,2031,2050
+WON,PHL,PCT,3,2031,2050
+WON,SGP,PCT,3,2031,2050
+WON,THA,PCT,3,2031,2050
+WON,VNM,PCT,3,2031,2050

workflow/scripts/osemosys_global/powerplant/activity.py

@@ -267,6 +267,9 @@ def activity_master_end(df_pwr_oar_final, df_oar_upstream, df_oar_int,
 
     df_iar_final = apply_dtypes(df_iar_final, "InputActivityRatio")
 
+    df_oar_final = df_oar_final.loc[~((df_oar_final['TECHNOLOGY'].str.startswith('PWR')) & 
+                                      (df_oar_final['FUEL'].str.endswith('INT')))]
+    
     return df_oar_final, df_iar_final
 
 def capact(df_oar_final):