Skip to content

Commit

Permalink
Merge pull request #14 from NREL/ABM
Browse files Browse the repository at this point in the history 
Abm
  • Loading branch information
@shirubana
shirubana authored Aug 13, 2021
2 parents b6033f5 + 67577d3 commit a3cdd06
Show file tree
Hide file tree
Showing 16 changed files with 93,787 additions and 12,746 deletions.
52 changes: 52 additions & 0 deletions PV_ICE/baselines/ABM/abm_input_new_installs_cumulative.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
Year,Cumulative_New_Installs_[MW]
2000,38
2001,76
2002,114
2003,152
2004,190
2005,228
2006,266
2007,405
2008,656
2009,1034
2010,1773
2011,3443
2012,6378
2013,10524
2014,15956
2015,22481
2016,26090
2017,30297
2018,35202
2019,40921
2020,40921
2021,47713.886
2022,55634.39108
2023,64869.69999
2024,75638.07019
2025,88193.98985
2026,102834.1922
2027,119904.6681
2028,139808.843
2029,163017.1109
2030,190077.9513
2031,221630.8912
2032,231604.2813
2033,242026.474
2034,252917.6653
2035,264298.9602
2036,276192.4135
2037,288621.0721
2038,301609.0203
2039,315181.4262
2040,329364.5904
2041,344185.997
2042,359674.3668
2043,375859.7133
2044,392773.4004
2045,410448.2034
2046,428918.3726
2047,448219.6994
2048,468389.5858
2049,489467.1172
2050,511493.1375
280 changes: 280 additions & 0 deletions PV_ICE/baselines/ABM/abm_outputs_mass_cumulative.csv
View file

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions PV_ICE/baselines/SolarFutures_2021/baseline_modules_US_Reeds.csv
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repowering,mod_Repairing
year,MW,%,years,years,%,years,%,%,%,%,%
2010,1200.65135,14.7,25,30,0.3,22.7,98,0,0,0,0
2011,2534.300109,15.1,25,30,0.3,23,98,0,0,0,0
2012,2534.300109,15.4,25,30,0.3,23.5,98,0,0,0,0
2013,5123.033732,16,28,33,0.3,24.2,98,0,0,0,0
2014,5123.033732,16.3,28,33,0.3,26,98,0,0,0,0
2015,9477.53731,17,28,33,0.3,28.7,98,0,0,0,0
2016,9477.53731,17.5,28,33,0.3,28.7,98,0,0,0,0
2017,9156.783125,17.7,28,33,0.3,29.5,98,0,0,0,0
2018,9156.783125,18.4,28,33,0.3,31,98,0,0,0,0
2019,16904.81495,19.2,28,33,0.3,32.4,98,0,0,0,0
2020,16904.81495,20.25258849,33,38,0.5,35,98,0,0,0,0
2021,4479.833668,20.8948648,33,38,0.5,35,98,0,0,0,0
2022,4479.833668,21.36288232,33,38,0.5,35,98,0,0,0,0
2023,13634.58969,21.73311205,33,38,0.5,35,98,0,0,0,0
2024,13634.58969,22.0403697,33,38,0.5,35,98,0,0,0,0
2025,28006.32474,22.30353889,33,38,0.5,35,98,0,0,0,0
2026,28006.32474,22.53404502,33,38,0.5,35,98,0,0,0,0
2027,26628.14038,22.73934244,40,44,0.5,35,98,0,0,0,0
2028,26628.14038,22.92457161,40,44,0.5,35,98,0,0,0,0
2029,44459.75121,23.09343124,40,44,0.5,35,98,0,0,0,0
2030,44459.75121,23.24867384,40,44,0.5,35,98,0,0,0,0
2031,12957.18735,23.39240459,40,44,0.5,35,98,0,0,0,0
2032,12957.18735,23.52627057,40,44,0.5,35,98,0,0,0,0
2033,11610.68853,23.6515853,40,44,0.5,35,98,0,0,0,0
2034,11610.68853,23.76941358,40,44,0.5,35,98,0,0,0,0
2035,12365.75409,23.88063087,40,44,0.5,35,98,0,0,0,0
2036,12365.75409,23.98596588,40,44,0.5,35,98,0,0,0,0
2037,21040.88463,24.08603183,40,44,0.5,35,98,0,0,0,0
2038,21040.88463,24.18134974,40,44,0.5,35,98,0,0,0,0
2039,20625.09401,24.27236612,40,44,0.5,35,98,0,0,0,0
2040,20625.09401,24.35946665,40,44,0.5,35,98,0,0,0,0
2041,18778.53432,24.44298673,40,44,0.5,35,98,0,0,0,0
2042,18778.53432,24.52322,40,44,0.5,35,98,0,0,0,0
2043,34424.36131,24.60042496,40,44,0.5,35,98,0,0,0,0
2044,34424.36131,24.67483041,40,44,0.5,35,98,0,0,0,0
2045,26837.67265,24.74663989,40,44,0.5,35,98,0,0,0,0
2046,26837.67265,24.81603524,40,44,0.5,35,98,0,0,0,0
2047,42306.23615,24.88317962,40,44,0.5,35,98,0,0,0,0
2048,42306.23615,24.94822001,40,44,0.5,35,98,0,0,0,0
2049,29545.32688,25.01128927,40,44,0.5,35,98,0,0,0,0
2050,29545.32688,25.07250791,40,44,0.5,35,98,0,0,0,0
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repair,mod_MerchantTail,mod_Reuse
year,MW,%,years,years,%,years,%,%,%,%,%,%
2010,1200.65135,14.7,25,30,0.3,22.7,98,0,0,0,0,0
2011,2534.300109,15.1,25,30,0.3,23,98,0,0,0,0,0
2012,2534.300109,15.4,25,30,0.3,23.5,98,0,0,0,0,0
2013,5123.033732,16,28,33,0.3,24.2,98,0,0,0,0,0
2014,5123.033732,16.3,28,33,0.3,26,98,0,0,0,0,0
2015,9477.53731,17,28,33,0.3,28.7,98,0,0,0,0,0
2016,9477.53731,17.5,28,33,0.3,28.7,98,0,0,0,0,0
2017,9156.783125,17.7,28,33,0.3,29.5,98,0,0,0,0,0
2018,9156.783125,18.4,28,33,0.3,31,98,0,0,0,0,0
2019,16904.81495,19.2,28,33,0.3,32.4,98,0,0,0,0,0
2020,16904.81495,20.25258849,33,38,0.5,35,98,0,0,0,0,0
2021,4479.833668,20.8948648,33,38,0.5,35,98,0,0,0,0,0
2022,4479.833668,21.36288232,33,38,0.5,35,98,0,0,0,0,0
2023,13634.58969,21.73311205,33,38,0.5,35,98,0,0,0,0,0
2024,13634.58969,22.0403697,33,38,0.5,35,98,0,0,0,0,0
2025,28006.32474,22.30353889,33,38,0.5,35,98,0,0,0,0,0
2026,28006.32474,22.53404502,33,38,0.5,35,98,0,0,0,0,0
2027,26628.14038,22.73934244,40,44,0.5,35,98,0,0,0,0,0
2028,26628.14038,22.92457161,40,44,0.5,35,98,0,0,0,0,0
2029,44459.75121,23.09343124,40,44,0.5,35,98,0,0,0,0,0
2030,44459.75121,23.24867384,40,44,0.5,35,98,0,0,0,0,0
2031,12957.18735,23.39240459,40,44,0.5,35,98,0,0,0,0,0
2032,12957.18735,23.52627057,40,44,0.5,35,98,0,0,0,0,0
2033,11610.68853,23.6515853,40,44,0.5,35,98,0,0,0,0,0
2034,11610.68853,23.76941358,40,44,0.5,35,98,0,0,0,0,0
2035,12365.75409,23.88063087,40,44,0.5,35,98,0,0,0,0,0
2036,12365.75409,23.98596588,40,44,0.5,35,98,0,0,0,0,0
2037,21040.88463,24.08603183,40,44,0.5,35,98,0,0,0,0,0
2038,21040.88463,24.18134974,40,44,0.5,35,98,0,0,0,0,0
2039,20625.09401,24.27236612,40,44,0.5,35,98,0,0,0,0,0
2040,20625.09401,24.35946665,40,44,0.5,35,98,0,0,0,0,0
2041,18778.53432,24.44298673,40,44,0.5,35,98,0,0,0,0,0
2042,18778.53432,24.52322,40,44,0.5,35,98,0,0,0,0,0
2043,34424.36131,24.60042496,40,44,0.5,35,98,0,0,0,0,0
2044,34424.36131,24.67483041,40,44,0.5,35,98,0,0,0,0,0
2045,26837.67265,24.74663989,40,44,0.5,35,98,0,0,0,0,0
2046,26837.67265,24.81603524,40,44,0.5,35,98,0,0,0,0,0
2047,42306.23615,24.88317962,40,44,0.5,35,98,0,0,0,0,0
2048,42306.23615,24.94822001,40,44,0.5,35,98,0,0,0,0,0
2049,29545.32688,25.01128927,40,44,0.5,35,98,0,0,0,0,0
2050,29545.32688,25.07250791,40,44,0.5,35,98,0,0,0,0,0
70 changes: 35 additions & 35 deletions PV_ICE/baselines/SolarFutures_2021/baseline_modules_US_Reeds_EF.csv
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repowering,mod_Repairing
year,MW,%,years,years,%,years,%,%,%,%,%
2018,9156.783125,18.4,28,33,0.3,31,98,0,0,0,0
2019,16904.81495,19.2,28,33,0.3,32.4,98,0,0,0,0
2020,16904.81495,20.25258849,33,38,0.5,35,98,0,0,0,0
2021,4479.833668,20.8948648,33,38,0.5,35,98,0,0,0,0
2022,4479.833668,21.36288232,33,38,0.5,35,98,0,0,0,0
2023,13634.58969,21.73311205,33,38,0.5,35,98,0,0,0,0
2024,13634.58969,22.0403697,33,38,0.5,35,98,0,0,0,0
2025,28006.32474,22.30353889,33,38,0.5,35,98,0,0,0,0
2026,28006.32474,22.53404502,33,38,0.5,35,98,0,0,0,0
2027,26628.14038,22.73934244,40,44,0.5,35,98,0,0,0,0
2028,26628.14038,22.92457161,40,44,0.5,35,98,0,0,0,0
2029,44459.75121,23.09343124,40,44,0.5,35,98,0,0,0,0
2030,44459.75121,23.24867384,40,44,0.5,35,98,0,0,0,0
2031,12957.18735,23.39240459,40,44,0.5,35,98,0,0,0,0
2032,12957.18735,23.52627057,40,44,0.5,35,98,0,0,0,0
2033,11610.68853,23.6515853,40,44,0.5,35,98,0,0,0,0
2034,11610.68853,23.76941358,40,44,0.5,35,98,0,0,0,0
2035,12365.75409,23.88063087,40,44,0.5,35,98,0,0,0,0
2036,12365.75409,23.98596588,40,44,0.5,35,98,0,0,0,0
2037,21040.88463,24.08603183,40,44,0.5,35,98,0,0,0,0
2038,21040.88463,24.18134974,40,44,0.5,35,98,0,0,0,0
2039,20625.09401,24.27236612,40,44,0.5,35,98,0,0,0,0
2040,20625.09401,24.35946665,40,44,0.5,35,98,0,0,0,0
2041,18778.53432,24.44298673,40,44,0.5,35,98,0,0,0,0
2042,18778.53432,24.52322,40,44,0.5,35,98,0,0,0,0
2043,34424.36131,24.60042496,40,44,0.5,35,98,0,0,0,0
2044,34424.36131,24.67483041,40,44,0.5,35,98,0,0,0,0
2045,26837.67265,24.74663989,40,44,0.5,35,98,0,0,0,0
2046,26837.67265,24.81603524,40,44,0.5,35,98,0,0,0,0
2047,42306.23615,24.88317962,40,44,0.5,35,98,0,0,0,0
2048,42306.23615,24.94822001,40,44,0.5,35,98,0,0,0,0
2049,29545.32688,25.01128927,40,44,0.5,35,98,0,0,0,0
2050,29545.32688,25.07250791,40,44,0.5,35,98,0,0,0,0
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repair,mod_MerchantTail,mod_Reuse
year,MW,%,years,years,%,years,%,%,%,%,%,%
2018,9156.783125,18.4,28,33,0.3,31,98,0,0,0,0,0
2019,16904.81495,19.2,28,33,0.3,32.4,98,0,0,0,0,0
2020,16904.81495,20.25258849,33,38,0.5,35,98,0,0,0,0,0
2021,4479.833668,20.8948648,33,38,0.5,35,98,0,0,0,0,0
2022,4479.833668,21.36288232,33,38,0.5,35,98,0,0,0,0,0
2023,13634.58969,21.73311205,33,38,0.5,35,98,0,0,0,0,0
2024,13634.58969,22.0403697,33,38,0.5,35,98,0,0,0,0,0
2025,28006.32474,22.30353889,33,38,0.5,35,98,0,0,0,0,0
2026,28006.32474,22.53404502,33,38,0.5,35,98,0,0,0,0,0
2027,26628.14038,22.73934244,40,44,0.5,35,98,0,0,0,0,0
2028,26628.14038,22.92457161,40,44,0.5,35,98,0,0,0,0,0
2029,44459.75121,23.09343124,40,44,0.5,35,98,0,0,0,0,0
2030,44459.75121,23.24867384,40,44,0.5,35,98,0,0,0,0,0
2031,12957.18735,23.39240459,40,44,0.5,35,98,0,0,0,0,0
2032,12957.18735,23.52627057,40,44,0.5,35,98,0,0,0,0,0
2033,11610.68853,23.6515853,40,44,0.5,35,98,0,0,0,0,0
2034,11610.68853,23.76941358,40,44,0.5,35,98,0,0,0,0,0
2035,12365.75409,23.88063087,40,44,0.5,35,98,0,0,0,0,0
2036,12365.75409,23.98596588,40,44,0.5,35,98,0,0,0,0,0
2037,21040.88463,24.08603183,40,44,0.5,35,98,0,0,0,0,0
2038,21040.88463,24.18134974,40,44,0.5,35,98,0,0,0,0,0
2039,20625.09401,24.27236612,40,44,0.5,35,98,0,0,0,0,0
2040,20625.09401,24.35946665,40,44,0.5,35,98,0,0,0,0,0
2041,18778.53432,24.44298673,40,44,0.5,35,98,0,0,0,0,0
2042,18778.53432,24.52322,40,44,0.5,35,98,0,0,0,0,0
2043,34424.36131,24.60042496,40,44,0.5,35,98,0,0,0,0,0
2044,34424.36131,24.67483041,40,44,0.5,35,98,0,0,0,0,0
2045,26837.67265,24.74663989,40,44,0.5,35,98,0,0,0,0,0
2046,26837.67265,24.81603524,40,44,0.5,35,98,0,0,0,0,0
2047,42306.23615,24.88317962,40,44,0.5,35,98,0,0,0,0,0
2048,42306.23615,24.94822001,40,44,0.5,35,98,0,0,0,0,0
2049,29545.32688,25.01128927,40,44,0.5,35,98,0,0,0,0,0
2050,29545.32688,25.07250791,40,44,0.5,35,98,0,0,0,0,0
86 changes: 43 additions & 43 deletions PV_ICE/baselines/SolarFutures_2021/baseline_modules_World_Bogdanov.csv
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repowering,mod_Repairing
year,MW,%,years,years,%,years,%,%,%,%,%
2010,1000000,14.7,25,30,0.3,22.7,98,0,0,0,0
2011,1000000,15.1,25,30,0.3,23,98,0,0,0,0
2012,1000000,15.4,25,30,0.3,23.5,98,0,0,0,0
2013,1000000,16,28,33,0.3,24.2,98,0,0,0,0
2014,1000000,16.3,28,33,0.3,26,98,0,0,0,0
2015,1000000,17,28,33,0.3,28.7,98,0,0,0,0
2016,1000000,17.5,28,33,0.3,28.7,98,0,0,0,0
2017,1000000,17.7,28,33,0.3,29.5,98,0,0,0,0
2018,1000000,18.4,28,33,0.3,31,98,0,0,0,0
2019,1000000,19.2,28,33,0.3,32.4,98,0,0,0,0
2020,1000000,20.25258849,33,38,0.5,35,98,0,0,0,0
2021,1000000,20.8948648,33,38,0.5,35,98,0,0,0,0
2022,1000000,21.36288232,33,38,0.5,35,98,0,0,0,0
2023,1000000,21.73311205,33,38,0.5,35,98,0,0,0,0
2024,1000000,22.0403697,33,38,0.5,35,98,0,0,0,0
2025,1000000,22.30353889,33,38,0.5,35,98,0,0,0,0
2026,1000000,22.53404502,33,38,0.5,35,98,0,0,0,0
2027,1000000,22.73934244,40,44,0.5,35,98,0,0,0,0
2028,1000000,22.92457161,40,44,0.5,35,98,0,0,0,0
2029,1000000,23.09343124,40,44,0.5,35,98,0,0,0,0
2030,1000000,23.24867384,40,44,0.5,35,98,0,0,0,0
2031,1000000,23.39240459,40,44,0.5,35,98,0,0,0,0
2032,1000000,23.52627057,40,44,0.5,35,98,0,0,0,0
2033,1000000,23.6515853,40,44,0.5,35,98,0,0,0,0
2034,1000000,23.76941358,40,44,0.5,35,98,0,0,0,0
2035,1000000,23.88063087,40,44,0.5,35,98,0,0,0,0
2036,1000000,23.98596588,40,44,0.5,35,98,0,0,0,0
2037,1000000,24.08603183,40,44,0.5,35,98,0,0,0,0
2038,1000000,24.18134974,40,44,0.5,35,98,0,0,0,0
2039,1000000,24.27236612,40,44,0.5,35,98,0,0,0,0
2040,1000000,24.35946665,40,44,0.5,35,98,0,0,0,0
2041,1000000,24.44298673,40,44,0.5,35,98,0,0,0,0
2042,1000000,24.52322,40,44,0.5,35,98,0,0,0,0
2043,1000000,24.60042496,40,44,0.5,35,98,0,0,0,0
2044,1000000,24.67483041,40,44,0.5,35,98,0,0,0,0
2045,1000000,24.74663989,40,44,0.5,35,98,0,0,0,0
2046,1000000,24.81603524,40,44,0.5,35,98,0,0,0,0
2047,1000000,24.88317962,40,44,0.5,35,98,0,0,0,0
2048,1000000,24.94822001,40,44,0.5,35,98,0,0,0,0
2049,1000000,25.01128927,40,44,0.5,35,98,0,0,0,0
2050,1000000,25.07250791,40,44,0.5,35,98,0,0,0,0
year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_EOL_collection_eff,mod_EOL_collected_recycled,mod_Repair,mod_MerchantTail,mod_Reuse
year,MW,%,years,years,%,years,%,%,%,%,%,%
2010,1000000,14.7,25,30,0.3,22.7,98,0,0,0,0,0
2011,1000000,15.1,25,30,0.3,23,98,0,0,0,0,0
2012,1000000,15.4,25,30,0.3,23.5,98,0,0,0,0,0
2013,1000000,16,28,33,0.3,24.2,98,0,0,0,0,0
2014,1000000,16.3,28,33,0.3,26,98,0,0,0,0,0
2015,1000000,17,28,33,0.3,28.7,98,0,0,0,0,0
2016,1000000,17.5,28,33,0.3,28.7,98,0,0,0,0,0
2017,1000000,17.7,28,33,0.3,29.5,98,0,0,0,0,0
2018,1000000,18.4,28,33,0.3,31,98,0,0,0,0,0
2019,1000000,19.2,28,33,0.3,32.4,98,0,0,0,0,0
2020,1000000,20.25258849,33,38,0.5,35,98,0,0,0,0,0
2021,1000000,20.8948648,33,38,0.5,35,98,0,0,0,0,0
2022,1000000,21.36288232,33,38,0.5,35,98,0,0,0,0,0
2023,1000000,21.73311205,33,38,0.5,35,98,0,0,0,0,0
2024,1000000,22.0403697,33,38,0.5,35,98,0,0,0,0,0
2025,1000000,22.30353889,33,38,0.5,35,98,0,0,0,0,0
2026,1000000,22.53404502,33,38,0.5,35,98,0,0,0,0,0
2027,1000000,22.73934244,40,44,0.5,35,98,0,0,0,0,0
2028,1000000,22.92457161,40,44,0.5,35,98,0,0,0,0,0
2029,1000000,23.09343124,40,44,0.5,35,98,0,0,0,0,0
2030,1000000,23.24867384,40,44,0.5,35,98,0,0,0,0,0
2031,1000000,23.39240459,40,44,0.5,35,98,0,0,0,0,0
2032,1000000,23.52627057,40,44,0.5,35,98,0,0,0,0,0
2033,1000000,23.6515853,40,44,0.5,35,98,0,0,0,0,0
2034,1000000,23.76941358,40,44,0.5,35,98,0,0,0,0,0
2035,1000000,23.88063087,40,44,0.5,35,98,0,0,0,0,0
2036,1000000,23.98596588,40,44,0.5,35,98,0,0,0,0,0
2037,1000000,24.08603183,40,44,0.5,35,98,0,0,0,0,0
2038,1000000,24.18134974,40,44,0.5,35,98,0,0,0,0,0
2039,1000000,24.27236612,40,44,0.5,35,98,0,0,0,0,0
2040,1000000,24.35946665,40,44,0.5,35,98,0,0,0,0,0
2041,1000000,24.44298673,40,44,0.5,35,98,0,0,0,0,0
2042,1000000,24.52322,40,44,0.5,35,98,0,0,0,0,0
2043,1000000,24.60042496,40,44,0.5,35,98,0,0,0,0,0
2044,1000000,24.67483041,40,44,0.5,35,98,0,0,0,0,0
2045,1000000,24.74663989,40,44,0.5,35,98,0,0,0,0,0
2046,1000000,24.81603524,40,44,0.5,35,98,0,0,0,0,0
2047,1000000,24.88317962,40,44,0.5,35,98,0,0,0,0,0
2048,1000000,24.94822001,40,44,0.5,35,98,0,0,0,0,0
2049,1000000,25.01128927,40,44,0.5,35,98,0,0,0,0,0
2050,1000000,25.07250791,40,44,0.5,35,98,0,0,0,0,0
15 changes: 14 additions & 1 deletion PV_ICE/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,8 @@ def calculateMassFlow(self, weibullInputParams = None,
df['Cumulative_Area_disposedby_Failure'] = 0
df['Cumulative_Area_disposedby_ProjectLifetime'] = 0
df['Cumulative_Area_disposed'] = 0
df['Repaired_[W]'] = 0
df['Repaired_Area'] = 0
df['Cumulative_Active_Area'] = 0
df['Installed_Capacity_[W]'] = 0
for generation, row in df.iterrows():
Expand Down Expand Up @@ -410,7 +412,8 @@ def calculateMassFlow(self, weibullInputParams = None,
activeareacount = []
areadisposed_failure = []
areadisposed_projectlifetime = []

arearepaired = []
arearepaired_powergen = []
areapowergen = []
active=-1
disposed_projectlifetime=0
Expand All @@ -421,10 +424,16 @@ def calculateMassFlow(self, weibullInputParams = None,
areadisposed_failure.append(0)
areadisposed_projectlifetime.append(0)
areapowergen.append(0)
arearepaired.append(0)
arearepaired_powergen.append(0)
else:
active += 1
activeareaprev = activearea
activearea = activearea*(1-cdf[age]*(1-df.iloc[age]['mod_Repair']*0.01))
arearepaired_failure = activearea*cdf[age]*df.iloc[age]['mod_Repair']*0.01
arearepaired.append(arearepaired_failure)
arearepaired_powergen.append(arearepaired_failure*row['mod_eff']*0.01*row['irradiance_stc']*(1-row['mod_degradation']*0.01)**active)

areadisposed_failure.append(activeareaprev-activearea)
if age == int(row['mod_lifetime']+generation):
activearea_temp = activearea
Expand Down Expand Up @@ -461,6 +470,8 @@ def calculateMassFlow(self, weibullInputParams = None,
df['Cumulative_Area_disposed'] += areadisposed_projectlifetime


df['Repaired_[W]'] += arearepaired_powergen
df['Repaired_Area'] += arearepaired
df['Cumulative_Active_Area'] += activeareacount
df['Installed_Capacity_[W]'] += areapowergen
Generation_Disposed_byYear.append([x + y for x, y in zip(areadisposed_failure, areadisposed_projectlifetime)])
Expand Down Expand Up @@ -516,6 +527,8 @@ def calculateMassFlow(self, weibullInputParams = None,
# Cleanup of internal renaming and internal use columns
df.drop(['new_Installed_Capacity_[W]', 't50', 't90'], axis = 1, inplace=True)

df['ModuleTotal_MFG']=df['Area']*100/df['mod_MFG_eff']

self.scenario[scen].data = df

# collection losses here
Expand Down
Loading

0 comments on commit a3cdd06

Please sign in to comment.