Merge branch 'dev'

psrc · Aug 13, 2018 · 46c8671 · 46c8671
2 parents 9a5ed5c + bb49290
commit 46c8671
Showing 1 changed file with 4 additions and 23 deletions.
diff --git a/scripts/data_wrangling.py b/scripts/data_wrangling.py
@@ -161,29 +161,10 @@ def copy_scenario_inputs():
     print 'Copying scenario inputs...' 
     dir_util.copy_tree(scenario_inputs,'inputs/scenario')
 
-@timed
-def copy_large_inputs():
-    print 'Copying large inputs...' 
-    dir_util.copy_tree(scenario_inputs+'/networks','Inputs/networks')
-    dir_util.copy_tree(scenario_inputs+'/trucks','Inputs/trucks')
-    dir_util.copy_tree(scenario_inputs+'/supplemental','inputs/supplemental')
-    dir_util.copy_tree(scenario_inputs+'/supplemental','inputs/supplemental')
-    if run_supplemental_generation:
-        shcopy(scenario_inputs+'/tazdata/tazdata.in','inputs/trucks')
-    dir_util.copy_tree(scenario_inputs+'/tolls','Inputs/tolls')
-    dir_util.copy_tree(scenario_inputs+'/Fares','Inputs/Fares')
-    dir_util.copy_tree(scenario_inputs+'/bikes','Inputs/bikes')
-    dir_util.copy_tree(base_inputs+'/observed','Inputs/observed')
-    dir_util.copy_tree(base_inputs+'/corridors','inputs/corridors')
-    dir_util.copy_tree(scenario_inputs+'/parking','inputs/parking')
-    shcopy(scenario_inputs+'/landuse/hh_and_persons.h5','Inputs')
-    shcopy(base_inputs+'/etc/survey.h5','scripts/summarize/inputs/calibration')
-
-    # node to node short distance files:
-    shcopy(base_inputs+'/short_distance_files/node_index_2014.txt', 'Inputs')
-    shcopy(base_inputs+'/short_distance_files/node_to_node_distance_2014.h5', 'Inputs')
-    shcopy(base_inputs+'/short_distance_files/parcel_nodes_2014.txt', 'Inputs')
-
+    # Copy base year inputs (too large for storing on Github)
+    src = os.path.join(os.path.join(base_inputs,'landuse/node_to_node_distance_2014.h5'))
+    dst = os.path.join(os.getcwd(),'inputs/scenario/landuse/node_to_node_distance_2014.h5')
+    shutil.copyfile(src,dst)
 
 @timed
 def copy_shadow_price_file():