Merge pull request #101 from NREL/fix_timeseries_aggregation_bug

Fix timeseries aggregation bug

buildstockbatch/postprocessing.py

@@ -155,17 +155,23 @@ def get_factor(folder):
 
     if type(inp1) is str:
         full_path = f"{inp1}/run/enduse_timeseries.parquet"
-        with fs.open(full_path, 'rb') as f:
-            file1 = pd.read_parquet(f, engine='pyarrow').set_index('Time')
-            file1 = file1 * get_factor(inp1)
+        try:
+            with fs.open(full_path, 'rb') as f:
+                file1 = pd.read_parquet(f, engine='pyarrow').set_index('Time')
+                file1 = file1 * get_factor(inp1)
+        except ResourceNotFound:
+            file1 = pd.DataFrame()  # if the timeseries file is missing, set it to empty dataframe
     else:
         file1 = inp1
 
     if type(inp2) is str:
         full_path = f"{inp2}/run/enduse_timeseries.parquet"
-        with fs.open(full_path, 'rb') as f:
-            file2 = pd.read_parquet(f, engine='pyarrow').set_index('Time')
-            file2 = file2 * get_factor(inp2)
+        try:
+            with fs.open(full_path, 'rb') as f:
+                file2 = pd.read_parquet(f, engine='pyarrow').set_index('Time')
+                file2 = file2 * get_factor(inp2)
+        except ResourceNotFound:
+            file2 = pd.DataFrame()
     else:
         file2 = inp2
 

buildstockbatch/test/test_base.py

@@ -49,7 +49,7 @@ def test_missing_simulation_output_report_applicable(basic_residential_project_f
     up01_parquet = os.path.join(results_dir, 'parquet', 'upgrades', 'upgrade=1', 'results_up01.parquet')
     assert(os.path.exists(up01_parquet))
     df = pd.read_parquet(up01_parquet, engine='pyarrow')
-    assert((~df['simulation_output_report.applicable']).any())
+    assert(not df['simulation_output_report.applicable'].any())
 
 
 def test_combine_files_flexible(basic_residential_project_file):

buildstockbatch/test/test_results/simulation_output/up01/bldg0000003/run/failed.job

@@ -0,0 +1 @@
+Failed Workflow 2019-04-17 17:32:31 +0000