resolving merge

psrc · Oct 18, 2018 · 7ebef44 · 7ebef44
2 parents 95aef89 + 239ad65
commit 7ebef44
Show file tree

Hide file tree

Showing 10 changed files with 4,288 additions and 5,800 deletions.
diff --git a/input_configuration.py b/input_configuration.py
@@ -14,12 +14,11 @@
 
 ######Set up:######
 run_accessibility_calcs = True
-run_copy_daysim_code = True
 run_setup_emme_project_folders = True
 run_setup_emme_bank_folders = True
 run_copy_scenario_inputs = True
 run_import_networks = True
-#only run_daysim_zone_inputs in the base year currently
+#only run_daysim_zone_inputs in the base year
 run_daysim_zone_inputs = True
 run_integrated = False
 
@@ -36,7 +35,6 @@
 run_truck_model = True
 run_supplemental_trips = True
 run_daysim = True
-run_supplemental_generation = True
 ###########################
 
 #Summaries to run:######
@@ -45,6 +43,7 @@
 run_grouped_summary = False
 run_soundcast_summary = False
 run_truck_summary = False
+run_landuse_summary = False
 ########################
 
 ###### Specific reports to run######

diff --git a/run_soundcast.py b/run_soundcast.py
@@ -222,7 +222,12 @@ def run_all_summaries():
    if run_network_summary:
       subprocess.call([sys.executable, 'scripts/summarize/standard/daily_bank.py'])
       subprocess.call([sys.executable, 'scripts/summarize/standard/network_summary.py'])
-      subprocess.call([sys.executable, 'scripts/summarize/standard/emissions.py'])
+
+      try:
+        subprocess.call([sys.executable, 'scripts/summarize/standard/emissions.py'])
+      except:
+        print 'unable to generate emissions summary; check required inputs.'
+
       # if model_year == base_year:
       #    subprocess.call([sys.executable, 'scripts/summarize/standard/roadway_base_year_validation.py'])
       #    subprocess.call([sys.executable, 'scripts/summarize/standard/transit_base_year_validation.py'])