From 74c6fb1686a99b6bb41cbb03187dfe473f79b70f Mon Sep 17 00:00:00 2001 From: Silvana Ovaitt Date: Wed, 11 Sep 2024 17:33:12 -0700 Subject: [PATCH] pytest1 fix --- tests/baseline_material_test.csv | 204 +++++++++++++++---------------- tests/baseline_module_test.csv | 204 +++++++++++++++---------------- tests/test_main.py | 16 +-- 3 files changed, 212 insertions(+), 212 deletions(-) diff --git a/tests/baseline_material_test.csv b/tests/baseline_material_test.csv index 8020b70f..227c9405 100644 --- a/tests/baseline_material_test.csv +++ b/tests/baseline_material_test.csv @@ -1,102 +1,102 @@ -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_EOL_collected_Recycled,mat_EOL_Recycling_eff,mat_EOL_Recycled_into_HQ,mat_EOL_RecycledHQ_Reused4MFG -year,%,g,%,%,%,%,%,%,%,%,% -1995,100,10000,100,100,100,100,100,100,100,100,100 -1996,100,10000,100,100,100,100,100,100,100,100,100 -1997,100,10000,100,100,100,100,100,100,100,100,100 -1998,100,10000,100,100,100,100,100,100,100,100,100 -1999,100,10000,100,100,100,100,100,100,100,100,100 -2000,100,10000,100,100,100,100,100,100,100,100,100 -2001,100,10000,100,100,100,100,100,100,100,100,100 -2002,100,10000,100,100,100,100,100,100,100,100,100 -2003,100,10000,100,100,100,100,100,100,100,100,100 -2004,100,10000,100,100,100,100,100,100,100,100,100 -2005,100,10000,100,100,100,100,100,100,100,100,100 -2006,100,10000,100,100,100,100,100,100,100,100,100 -2007,100,10000,100,100,100,100,100,100,100,100,100 -2008,100,10000,100,100,100,100,100,100,100,100,100 -2009,100,10000,100,100,100,100,100,100,100,100,100 -2010,100,10000,100,100,100,100,100,100,100,100,100 -2011,100,10000,100,100,100,100,100,100,100,100,100 -2012,100,10000,100,100,100,100,100,100,100,100,100 -2013,100,10000,100,100,100,100,100,100,100,100,100 -2014,100,10000,100,100,100,100,100,100,100,100,100 -2015,100,10000,100,100,100,100,100,100,100,100,100 -2016,100,10000,100,100,100,100,100,100,100,100,100 -2017,100,10000,100,100,100,100,100,100,100,100,100 -2018,100,10000,100,100,100,100,100,100,100,100,100 -2019,100,10000,100,100,100,100,100,100,100,100,100 -2020,100,10000,100,100,100,100,100,100,100,100,100 -2021,100,10000,100,100,100,100,100,100,100,100,100 -2022,100,10000,100,100,100,100,100,100,100,100,100 -2023,100,10000,100,100,100,100,100,100,100,100,100 -2024,100,10000,100,100,100,100,100,100,100,100,100 -2025,100,10000,100,100,100,100,100,100,100,100,100 -2026,100,10000,100,100,100,100,100,100,100,100,100 -2027,100,10000,100,100,100,100,100,100,100,100,100 -2028,100,10000,100,100,100,100,100,100,100,100,100 -2029,100,10000,100,100,100,100,100,100,100,100,100 -2030,100,10000,100,100,100,100,100,100,100,100,100 -2031,100,10000,100,100,100,100,100,100,100,100,100 -2032,100,10000,100,100,100,100,100,100,100,100,100 -2033,100,10000,100,100,100,100,100,100,100,100,100 -2034,100,10000,100,100,100,100,100,100,100,100,100 -2035,100,10000,100,100,100,100,100,100,100,100,100 -2036,100,10000,100,100,100,100,100,100,100,100,100 -2037,100,10000,100,100,100,100,100,100,100,100,100 -2038,100,10000,100,100,100,100,100,100,100,100,100 -2039,100,10000,100,100,100,100,100,100,100,100,100 -2040,100,10000,100,100,100,100,100,100,100,100,100 -2041,100,10000,100,100,100,100,100,100,100,100,100 -2042,100,10000,100,100,100,100,100,100,100,100,100 -2043,100,10000,100,100,100,100,100,100,100,100,100 -2044,100,10000,100,100,100,100,100,100,100,100,100 -2045,100,10000,100,100,100,100,100,100,100,100,100 -2046,100,10000,100,100,100,100,100,100,100,100,100 -2047,100,10000,100,100,100,100,100,100,100,100,100 -2048,100,10000,100,100,100,100,100,100,100,100,100 -2049,100,10000,100,100,100,100,100,100,100,100,100 -2050,100,10000,100,100,100,100,100,100,100,100,100 -2051,100,10000,100,100,100,100,100,100,100,100,100 -2052,100,10000,100,100,100,100,100,100,100,100,100 -2053,100,10000,100,100,100,100,100,100,100,100,100 -2054,100,10000,100,100,100,100,100,100,100,100,100 -2055,100,10000,100,100,100,100,100,100,100,100,100 -2056,100,10000,100,100,100,100,100,100,100,100,100 -2057,100,10000,100,100,100,100,100,100,100,100,100 -2058,100,10000,100,100,100,100,100,100,100,100,100 -2059,100,10000,100,100,100,100,100,100,100,100,100 -2060,100,10000,100,100,100,100,100,100,100,100,100 -2061,100,10000,100,100,100,100,100,100,100,100,100 -2062,100,10000,100,100,100,100,100,100,100,100,100 -2063,100,10000,100,100,100,100,100,100,100,100,100 -2064,100,10000,100,100,100,100,100,100,100,100,100 -2065,100,10000,100,100,100,100,100,100,100,100,100 -2066,100,10000,100,100,100,100,100,100,100,100,100 -2067,100,10000,100,100,100,100,100,100,100,100,100 -2068,100,10000,100,100,100,100,100,100,100,100,100 -2069,100,10000,100,100,100,100,100,100,100,100,100 -2070,100,10000,100,100,100,100,100,100,100,100,100 -2071,100,10000,100,100,100,100,100,100,100,100,100 -2072,100,10000,100,100,100,100,100,100,100,100,100 -2073,100,10000,100,100,100,100,100,100,100,100,100 -2074,100,10000,100,100,100,100,100,100,100,100,100 -2075,100,10000,100,100,100,100,100,100,100,100,100 -2076,100,10000,100,100,100,100,100,100,100,100,100 -2077,100,10000,100,100,100,100,100,100,100,100,100 -2078,100,10000,100,100,100,100,100,100,100,100,100 -2079,100,10000,100,100,100,100,100,100,100,100,100 -2080,100,10000,100,100,100,100,100,100,100,100,100 -2081,100,10000,100,100,100,100,100,100,100,100,100 -2082,100,10000,100,100,100,100,100,100,100,100,100 -2083,100,10000,100,100,100,100,100,100,100,100,100 -2084,100,10000,100,100,100,100,100,100,100,100,100 -2085,100,10000,100,100,100,100,100,100,100,100,100 -2086,100,10000,100,100,100,100,100,100,100,100,100 -2087,100,10000,100,100,100,100,100,100,100,100,100 -2088,100,10000,100,100,100,100,100,100,100,100,100 -2089,100,10000,100,100,100,100,100,100,100,100,100 -2090,100,10000,100,100,100,100,100,100,100,100,100 -2091,100,10000,100,100,100,100,100,100,100,100,100 -2092,100,10000,100,100,100,100,100,100,100,100,100 -2093,100,10000,100,100,100,100,100,100,100,100,100 -2094,100,10000,100,100,100,100,100,100,100,100,100 +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,100,10000,100,100,100,100,100,100,100,100,100,100,100 +1996,100,10000,100,100,100,100,100,100,100,100,100,100,100 +1997,100,10000,100,100,100,100,100,100,100,100,100,100,100 +1998,100,10000,100,100,100,100,100,100,100,100,100,100,100 +1999,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2000,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2001,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2002,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2003,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2004,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2005,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2006,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2007,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2008,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2009,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2010,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2011,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2012,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2013,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2014,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2015,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2016,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2017,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2018,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2019,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2020,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2021,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2022,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2023,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2024,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2025,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2026,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2027,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2028,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2029,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2030,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2031,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2032,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2033,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2034,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2035,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2036,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2037,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2038,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2039,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2040,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2041,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2042,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2043,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2044,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2045,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2046,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2047,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2048,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2049,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2050,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2051,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2052,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2053,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2054,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2055,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2056,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2057,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2058,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2059,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2060,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2061,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2062,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2063,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2064,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2065,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2066,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2067,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2068,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2069,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2070,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2071,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2072,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2073,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2074,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2075,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2076,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2077,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2078,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2079,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2080,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2081,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2082,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2083,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2084,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2085,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2086,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2087,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2088,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2089,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2090,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2091,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2092,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2093,100,10000,100,100,100,100,100,100,100,100,100,100,100 +2094,100,10000,100,100,100,100,100,100,100,100,100,100,100 diff --git a/tests/baseline_module_test.csv b/tests/baseline_module_test.csv index 16a602ad..cc5b702c 100644 --- a/tests/baseline_module_test.csv +++ b/tests/baseline_module_test.csv @@ -1,102 +1,102 @@ -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,%,%,%,%,% -1995,100,10,10,15,0.55,15,100,100,100,0,0 -1996,100,10,10,15,0.55,15,100,100,100,0,0 -1997,100,10,10,15,0.55,15,100,100,100,0,0 -1998,100,10,10,15,0.55,15,100,100,100,0,0 -1999,100,10,10,15,0.55,15,100,100,100,0,0 -2000,100,10,10,15,0.55,15,100,100,100,0,0 -2001,100,10,10,15,0.55,15,100,100,100,0,0 -2002,100,10,10,15,0.55,15,100,100,100,0,0 -2003,100,10,10,15,0.55,15,100,100,100,0,0 -2004,100,10,10,15,0.55,15,100,100,100,0,0 -2005,100,10,10,15,0.55,15,100,100,100,0,0 -2006,100,10,10,15,0.55,15,100,100,100,0,0 -2007,100,10,10,15,0.55,15,100,100,100,0,0 -2008,100,10,10,15,0.55,15,100,100,100,0,0 -2009,100,10,10,15,0.55,15,100,100,100,0,0 -2010,100,10,10,15,0.55,15,100,100,100,0,0 -2011,100,10,10,15,0.55,15,100,100,100,0,0 -2012,100,10,10,15,0.55,15,100,100,100,0,0 -2013,100,10,10,15,0.55,15,100,100,100,0,0 -2014,100,10,10,15,0.55,15,100,100,100,0,0 -2015,100,10,10,15,0.55,15,100,100,100,0,0 -2016,100,10,10,15,0.55,15,100,100,100,0,0 -2017,100,10,10,15,0.55,15,100,100,100,0,0 -2018,100,10,10,15,0.55,15,100,100,100,0,0 -2019,100,10,10,15,0.55,15,100,100,100,0,0 -2020,100,10,10,15,0.55,15,100,100,100,0,0 -2021,100,10,10,15,0.55,15,100,100,100,0,0 -2022,100,10,10,15,0.55,15,100,100,100,0,0 -2023,100,10,10,15,0.55,15,100,100,100,0,0 -2024,100,10,10,15,0.55,15,100,100,100,0,0 -2025,100,10,10,15,0.55,15,100,100,100,0,0 -2026,100,10,10,15,0.55,15,100,100,100,0,0 -2027,100,10,10,15,0.55,15,100,100,100,0,0 -2028,100,10,10,15,0.55,15,100,100,100,0,0 -2029,100,10,10,15,0.55,15,100,100,100,0,0 -2030,100,10,10,15,0.55,15,100,100,100,0,0 -2031,100,10,10,15,0.55,15,100,100,100,0,0 -2032,100,10,10,15,0.55,15,100,100,100,0,0 -2033,100,10,10,15,0.55,15,100,100,100,0,0 -2034,100,10,10,15,0.55,15,100,100,100,0,0 -2035,100,10,10,15,0.55,15,100,100,100,0,0 -2036,100,10,10,15,0.55,15,100,100,100,0,0 -2037,100,10,10,15,0.55,15,100,100,100,0,0 -2038,100,10,10,15,0.55,15,100,100,100,0,0 -2039,100,10,10,15,0.55,15,100,100,100,0,0 -2040,100,10,10,15,0.55,15,100,100,100,0,0 -2041,100,10,10,15,0.55,15,100,100,100,0,0 -2042,100,10,10,15,0.55,15,100,100,100,0,0 -2043,100,10,10,15,0.55,15,100,100,100,0,0 -2044,100,10,10,15,0.55,15,100,100,100,0,0 -2045,100,10,10,15,0.55,15,100,100,100,0,0 -2046,100,10,10,15,0.55,15,100,100,100,0,0 -2047,100,10,10,15,0.55,15,100,100,100,0,0 -2048,100,10,10,15,0.55,15,100,100,100,0,0 -2049,100,10,10,15,0.55,15,100,100,100,0,0 -2050,100,10,10,15,0.55,15,100,100,100,0,0 -2051,100,10,10,15,0.55,15,100,100,100,0,0 -2052,100,10,10,15,0.55,15,100,100,100,0,0 -2053,100,10,10,15,0.55,15,100,100,100,0,0 -2054,100,10,10,15,0.55,15,100,100,100,0,0 -2055,100,10,10,15,0.55,15,100,100,100,0,0 -2056,100,10,10,15,0.55,15,100,100,100,0,0 -2057,100,10,10,15,0.55,15,100,100,100,0,0 -2058,100,10,10,15,0.55,15,100,100,100,0,0 -2059,100,10,10,15,0.55,15,100,100,100,0,0 -2060,100,10,10,15,0.55,15,100,100,100,0,0 -2061,100,10,10,15,0.55,15,100,100,100,0,0 -2062,100,10,10,15,0.55,15,100,100,100,0,0 -2063,100,10,10,15,0.55,15,100,100,100,0,0 -2064,100,10,10,15,0.55,15,100,100,100,0,0 -2065,100,10,10,15,0.55,15,100,100,100,0,0 -2066,100,10,10,15,0.55,15,100,100,100,0,0 -2067,100,10,10,15,0.55,15,100,100,100,0,0 -2068,100,10,10,15,0.55,15,100,100,100,0,0 -2069,100,10,10,15,0.55,15,100,100,100,0,0 -2070,100,10,10,15,0.55,15,100,100,100,0,0 -2071,100,10,10,15,0.55,15,100,100,100,0,0 -2072,100,10,10,15,0.55,15,100,100,100,0,0 -2073,100,10,10,15,0.55,15,100,100,100,0,0 -2074,100,10,10,15,0.55,15,100,100,100,0,0 -2075,100,10,10,15,0.55,15,100,100,100,0,0 -2076,100,10,10,15,0.55,15,100,100,100,0,0 -2077,100,10,10,15,0.55,15,100,100,100,0,0 -2078,100,10,10,15,0.55,15,100,100,100,0,0 -2079,100,10,10,15,0.55,15,100,100,100,0,0 -2080,100,10,10,15,0.55,15,100,100,100,0,0 -2081,100,10,10,15,0.55,15,100,100,100,0,0 -2082,100,10,10,15,0.55,15,100,100,100,0,0 -2083,100,10,10,15,0.55,15,100,100,100,0,0 -2084,100,10,10,15,0.55,15,100,100,100,0,0 -2085,100,10,10,15,0.55,15,100,100,100,0,0 -2086,100,10,10,15,0.55,15,100,100,100,0,0 -2087,100,10,10,15,0.55,15,100,100,100,0,0 -2088,100,10,10,15,0.55,15,100,100,100,0,0 -2089,100,10,10,15,0.55,15,100,100,100,0,0 -2090,100,10,10,15,0.55,15,100,100,100,0,0 -2091,100,10,10,15,0.55,15,100,100,100,0,0 -2092,100,10,10,15,0.55,15,100,100,100,0,0 -2093,100,10,10,15,0.55,15,100,100,100,0,0 -2094,100,10,10,15,0.55,15,100,100,100,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,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +1996,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +1997,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +1998,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +1999,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2000,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2001,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2002,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2003,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2004,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2005,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2006,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2007,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2008,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2009,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2010,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2011,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2012,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2013,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2014,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2015,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2016,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2017,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2018,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2019,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2020,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2021,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2022,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2023,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2024,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2025,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2026,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2027,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2028,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2029,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2030,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2031,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2032,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2033,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2034,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2035,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2036,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2037,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2038,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2039,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2040,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2041,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2042,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2043,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2044,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2045,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2046,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2047,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2048,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2049,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2050,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2051,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2052,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2053,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2054,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2055,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2056,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2057,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2058,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2059,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2060,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2061,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2062,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2063,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2064,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2065,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2066,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2067,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2068,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2069,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2070,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2071,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2072,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2073,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2074,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2075,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2076,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2077,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2078,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2079,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2080,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2081,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2082,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2083,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2084,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2085,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2086,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2087,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2088,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2089,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2090,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2091,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2092,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2093,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 +2094,100,10,10,15,0.55,15,100,0,0,100,0,0,0,0,100,0,0,0,0,0,100 diff --git a/tests/test_main.py b/tests/test_main.py index 38d33948..26f7b910 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -31,17 +31,17 @@ def test_project_lifetime(): r1 = PV_ICE.Simulation() - r1.createScenario('standard', file=MODULEBASELINE) - r1.scenario['standard'].addMaterial('glass', file=MATERIALBASELINE) - failyear = r1.scenario['standard'].data['mod_lifetime'][0] - r1.calculateMassFlow() + r1.createScenario('standard', massmodulefile=MODULEBASELINE) + r1.scenario['standard'].addMaterial('glass', massmatfile=MATERIALBASELINE) + failyear = r1.scenario['standard'].dataIn_m['mod_lifetime'][0] + r1.calculateMassFlow(debugflag=True) # Assert all modules go to trash at end of lifetime - assert r1.scenario['standard'].data['EOL_on_Year_'+str(int(failyear)+1)].iloc[0] == 0 + assert r1.scenario['standard'].dataDebug_m['EOL_PG_Year_'+str(int(failyear)+1)].iloc[0] == 0 # Assert that since the manufacturing process is perfect, and there is no # trash and recycled input on this year, euqlas 0 - mat_massperm2 = r1.scenario['standard'].material['glass'].materialdata['mat_massperm2'].iloc[0] - assert (r1.scenario['standard'].data['Area'][0]*mat_massperm2- - r1.scenario['standard'].material['glass'].materialdata['mat_Virgin_Stock'][0]) == 0.0 + mat_massperm2 = r1.scenario['standard'].material['glass'].matdataIn_m['mat_massperm2'].iloc[0] + assert (r1.scenario['standard'].dataOut_m['Area'][0]*mat_massperm2- + r1.scenario['standard'].material['glass'].matdataOut_m['mat_Virgin_Stock'][0]) == 0.0 def test_infinite_Weibull():