Add back county marginals for base year run

Author: lmz

bay_area/hh_gq/configs_TM1/controls.csv

@@ -20,9 +20,9 @@ pers_age_65_plus,TAZ,persons,100000,AGE65P,(persons.AGEP >= 65) & (persons.AGEP
 gq_type_univ,TAZ,persons,10000000,gq_type_univ,persons.gqtype==1
 gq_type_mil,TAZ,persons,10000000,gq_type_mil,persons.gqtype==2
 gq_type_othnon,TAZ,persons,10000000,gq_type_othnon,persons.gqtype==3
-# pers_occ_management,COUNTY,persons,10000,pers_occ_management,(persons.occupation == 1) & (persons.employed == 1)
-# pers_occ_professional,COUNTY,persons,10000,pers_occ_professional,(persons.occupation == 2) & (persons.employed == 1)
-# pers_occ_services,COUNTY,persons,10000,pers_occ_services,(persons.occupation == 3) & (persons.employed == 1)
-# pers_occ_retail,COUNTY,persons,10000,pers_occ_retail,(persons.occupation == 4) & (persons.employed == 1)
-# pers_occ_manual,COUNTY,persons,10000,pers_occ_manual,(persons.occupation == 5) & (persons.employed == 1)
-# pers_occ_military,COUNTY,persons,10000,pers_occ_military,(persons.occupation == 6) & (persons.employed == 1)
+pers_occ_management,COUNTY,persons,10000,pers_occ_management,(persons.occupation == 1) & (persons.employed == 1)
+pers_occ_professional,COUNTY,persons,10000,pers_occ_professional,(persons.occupation == 2) & (persons.employed == 1)
+pers_occ_services,COUNTY,persons,10000,pers_occ_services,(persons.occupation == 3) & (persons.employed == 1)
+pers_occ_retail,COUNTY,persons,10000,pers_occ_retail,(persons.occupation == 4) & (persons.employed == 1)
+pers_occ_manual,COUNTY,persons,10000,pers_occ_manual,(persons.occupation == 5) & (persons.employed == 1)
+pers_occ_military,COUNTY,persons,10000,pers_occ_military,(persons.occupation == 6) & (persons.employed == 1)

bay_area/hh_gq/configs_TM1/settings.yaml

@@ -48,8 +48,8 @@ input_table_list:
   - tablename: TAZ_control_data
     filename : run_num_taz_summaries_model_year_hhgq.csv
     # from UrbanSim 1.5
-#  - tablename: COUNTY_control_data
-#    filename : run_num_county_marginals_model_year.csv
+  - tablename: COUNTY_control_data
+    filename : run_num_county_marginals_model_year.csv
     # from UrbanSim 1.5
 
 

bay_area/run_populationsim.bat

@@ -110,6 +110,7 @@ for %%Y in (!YEARS!) do (
   :: save input also
   if !MODELTYPE!==TM1 (
     copy /Y "hh_gq\data\%BAUS_RUNNUM%_taz_summaries_!YEAR!.csv"      "hh_gq\data\taz_summaries_!OUTPUT_SUFFIX!_!YEAR!.csv"
+    copy /Y "hh_gq\data\%BAUS_RUNNUM%_county_marginals_!YEAR!.csv"    "hh_gq\data\county_marginals_!OUTPUT_SUFFIX!_!YEAR!.csv"
     copy /Y "hh_gq\data\%BAUS_RUNNUM%_regional_marginals_!YEAR!.csv" "hh_gq\data\regional_marginals_!OUTPUT_SUFFIX!_!YEAR!.csv"
   )
   if !MODELTYPE!==TM2 (