diff --git a/PV_ICE/baselines/TEST_baseline_material_energy_glass.csv b/PV_ICE/baselines/TEST_baseline_material_energy_glass.csv deleted file mode 100644 index 7cf8a36..0000000 --- a/PV_ICE/baselines/TEST_baseline_material_energy_glass.csv +++ /dev/null @@ -1,58 +0,0 @@ -year,e_mat_extraction,e_mat_MFG,e_mat_MFG_fuelfraction,e_mat_MFGScrap_LQ,e_mat_MFGScrap_HQ,e_mat_Landfill,e_mat_Landfill_fuelfraction,e_mat_EoL_ReMFG_clean,e_mat_Recycled_LQ,e_mat_Recycled_HQ,e_mat_Recycled_HQ_fuelfraction -year,kWh/kg,kWh/kg,%,kWh/kg,kWh/kg,kWh/kg,%,kWh/kg,kWh/kg,kWh/kg,% -1995,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -1996,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -1997,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -1998,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -1999,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2000,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2001,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2002,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2003,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2004,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2005,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2006,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2007,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2008,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2009,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2010,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2011,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2012,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2013,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2014,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2015,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2016,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2017,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2018,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2019,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2020,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2021,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2022,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2023,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2024,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2025,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2026,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2027,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2028,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2029,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2030,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2031,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2032,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2033,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2034,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2035,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2036,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2037,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2038,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2039,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2040,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2041,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2042,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2043,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2044,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2045,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2046,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2047,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2048,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2049,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 -2050,0.0062,3.513,86.79874429,1.4,1.4,0.09,78,0.61,1.4,1.4,50 diff --git a/PV_ICE/baselines/TEST_baseline_material_mass_glass.csv b/PV_ICE/baselines/TEST_baseline_material_mass_glass.csv deleted file mode 100644 index 271af5f..0000000 --- a/PV_ICE/baselines/TEST_baseline_material_mass_glass.csv +++ /dev/null @@ -1,58 +0,0 @@ -year,mat_virgin_eff,mat_massperm2,mat_MFG_eff,mat_MFG_scrap_Recycled,mat_MFG_scrap_Recycling_eff,mat_MFG_scrap_Recycled_into_HQ,mat_MFG_scrap_Recycled_into_HQ_Reused4MFG,mat_PG3_ReMFG_target,mat_ReMFG_yield,mat_PG4_Recycling_target,mat_Recycling_yield,mat_EOL_Recycled_into_HQ,mat_EOL_RecycledHQ_Reused4MFG -year,%,g,%,%,%,%,%,%,%,%,%,%,% -1995,60,12500,100,0,100,0,0,0,0,0,100,0,0 -1996,60,12500,100,0,100,0,0,0,0,0,100,0,0 -1997,60,12500,100,0,100,0,0,0,0,0,100,0,0 -1998,60,12500,100,0,100,0,0,0,0,0,100,0,0 -1999,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2000,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2001,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2002,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2003,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2004,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2005,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2006,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2007,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2008,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2009,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2010,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2011,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2012,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2013,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2014,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2015,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2016,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2017,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2018,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2019,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2020,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2021,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2022,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2023,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2024,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2025,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2026,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2027,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2028,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2029,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2030,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2031,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2032,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2033,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2034,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2035,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2036,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2037,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2038,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2039,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2040,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2041,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2042,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2043,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2044,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2045,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2046,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2047,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2048,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2049,60,12500,100,0,100,0,0,0,0,0,100,0,0 -2050,60,12500,100,0,100,0,0,0,0,0,100,0,0 diff --git a/PV_ICE/baselines/TEST_baseline_modules_energy.csv b/PV_ICE/baselines/TEST_baseline_modules_energy.csv deleted file mode 100644 index 488167f..0000000 --- a/PV_ICE/baselines/TEST_baseline_modules_energy.csv +++ /dev/null @@ -1,58 +0,0 @@ -year,e_mod_MFG,e_mod_Install,e_mod_OandM,e_mod_Repair,e_mod_Demount,e_mod_Resell_Certify,e_mod_Store,e_mod_ReMFG_Disassembly,e_mod_Recycle_Crush -year,Wh/m2,Wh/m2,Wh/m2,Wh/m2,Wh/m2,Wh/m2,Wh/m2,Wh/m2,Wh/m2 -1995,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -1996,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -1997,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -1998,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -1999,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2000,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2001,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2002,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2003,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2004,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2005,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2006,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2007,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2008,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2009,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2010,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2011,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2012,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2013,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2014,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2015,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2016,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2017,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2018,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2019,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2020,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2021,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2022,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2023,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2024,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2025,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2026,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2027,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2028,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2029,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2030,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2031,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2032,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2033,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2034,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2035,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2036,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2037,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2038,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2039,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2040,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2041,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2042,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2043,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2044,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2045,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2046,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2047,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2048,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2049,3320,9.5,0,10700,9.5,0.2,0,1.1,670 -2050,3320,9.5,0,10700,9.5,0.2,0,1.1,670 diff --git a/PV_ICE/baselines/TEST_baseline_modules_mass_US.csv b/PV_ICE/baselines/TEST_baseline_modules_mass_US.csv deleted file mode 100644 index 9d4b095..0000000 --- a/PV_ICE/baselines/TEST_baseline_modules_mass_US.csv +++ /dev/null @@ -1,58 +0,0 @@ -year,new_Installed_Capacity_[MW],mod_eff,mod_reliability_t50,mod_reliability_t90,mod_degradation,mod_lifetime,mod_MFG_eff,mod_Repair,mod_MerchantTail,mod_EOL_collection_eff,mod_EOL_pg0_resell,mod_EOL_pg1_landfill,mod_EOL_pg2_stored,mod_EOL_pg3_reMFG,mod_EOL_pg4_recycled,mod_EOL_reMFG_yield,mod_EOL_sp_reMFG_recycle,mod_EOL_pb1_landfill,mod_EOL_pb2_stored,mod_EOL_pb3_reMFG,mod_EOL_pb4_recycled -year,MW,%,years,years,%,years,%,%,%,%,%,%,%,%,%,%,%,%,%,%,% -1995,10,12.5,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1996,10,12.7,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1997,10,12.88,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1998,10,13.06,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1999,10,13.24,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2000,10,13.42,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2001,10,13.6,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2002,10,13.72222222,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2003,10,13.84444444,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2004,10,13.96666667,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2005,10,14.08888889,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2006,10,14.21111111,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2007,10,14.33333333,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2008,10,14.45555556,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2009,10,14.57777778,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2010,10,14.7,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2011,10,15.1,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2012,10,15.4,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2013,10,16,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2014,10,16.3,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2015,10,17,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2016,10,17.5,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2017,10,17.7,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2018,10,18.4,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2019,10,19.2,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2020,10,20,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2021,10,20.9,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2022,10,21.1,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2023,10,21.88587403,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2024,10,22.20562728,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2025,10,22.47034948,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2026,10,22.6966295,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2027,10,22.89448321,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2028,10,23.07043369,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2029,10,23.22897228,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2030,10,23.3733262,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2031,10,23.50589418,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2032,10,23.62850877,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2033,10,23.7426023,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2034,10,23.84931597,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2035,10,23.94957409,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2036,10,24.04413599,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2037,10,24.13363324,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2038,10,24.21859695,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2039,10,24.29947807,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2040,10,24.3766628,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2041,10,24.45048453,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2042,10,24.52123306,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2043,10,24.5891619,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2044,10,24.65449415,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2045,10,24.71742718,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2046,10,24.77813646,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2047,10,24.8367787,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2048,10,24.89349446,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2049,10,24.94841027,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2050,10,25.00164048,20,25,0.75,20,98,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/docs/sphinx/source/whatsnew/v0.3.3.rst b/docs/sphinx/source/whatsnew/v0.3.3.rst index ceb509e..4434ca1 100644 --- a/docs/sphinx/source/whatsnew/v0.3.3.rst +++ b/docs/sphinx/source/whatsnew/v0.3.3.rst @@ -1,26 +1,36 @@ .. _whatsnew_0303: -v0.3.3 (TBD/2023) +v0.3.3 (03/22/2024) ======================= +* Formal release for the Energy layer and energy baselines. +* Update of end of life pathways, now including Resell, storage, and ability to modify yields and decisions for modules of good and bad state at end of life. More details on Mirletz EPJ 2024. +* Informal inclusion of the carbon layer in development. +* New interactive training available via JupyterBook and Google Collab +* Added raw, inputs, outputs, figures folders for saving simulation files. +* Simulations can also now be saved as pickles, for easy use and load. + +Code Updates +------------ * Updated default "reducecapacity" to False, i.e. by default, bifaciality will not affect installed capacity, it will be bonus energy generation +* Improved internal data path for baselines folder +* Additional math added to energy calculations layer to support carbon calculations Baseline Updates ----------------- -* CdTe mass baselines added -* Energy baselines finished for silicon. -* Modified degradation values to be system degradation values from Jordan 2022 publication. - +* Baselines for Roger Nagle's Master thesis exploring European deployment and sustainability pathways scenarios added +* Carbon baselines added (still under development) -New Documentation and Analysis ---------------------------------- -* reorganized into tutorial, publications, and baseline development documents -17 - Energy Results Paper -Energy Sensitivity - Lifetime, Effiency, Material Circularity +Documentation Updates +---------------------- +* Reorganized documentation folder into tutorials, publications, and baseline development documents +* Removed OpenEI documentation as it is out of date. +* Added documentation for using the energy layer, including journal for the Mirletz EPJ 2024 paper, and an energy sensitivity analysis journals Contributors ~~~~~~~~~~~~ -* Silvana Ayala (:ghuser:`shirubana`) * Heather Mirletz (:ghuser:`heathermirletz`) +* Silvana Ovaitt (:ghuser:`shirubana`) +* Rachel Woods-Robinson (:ghuser:`rwoodsrobinson`)