Skip to content

Commit

Permalink
move emmebank aggregator to the initialization
Browse files Browse the repository at this point in the history
  • Loading branch information
AshishKuls committed Mar 3, 2023
1 parent f0de671 commit ed986c4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions abm/src/main/emme/toolbox/master_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,10 @@ def __call__(self, main_directory, scenario_id, scenario_title, emmebank_title,

# Check that setup files were generated
self.run_proc("CheckOutput.bat", [drive + path_no_drive, 'Setup'], "Check for outputs")

if run_rsm_setup == 1:
# this is to aggregate the EE, EI and Truck matrices from emme databank
emmebank_aggregator(main_directory, orig_full_model_dir, taz_crosswalk_file)

# Note: iteration indexes from 0, msa_iteration indexes from 1
for iteration in range(startFromIteration - 1, end_iteration):
Expand Down Expand Up @@ -809,10 +813,6 @@ def __call__(self, main_directory, scenario_id, scenario_title, emmebank_title,
[drive, drive + path_forward_slash, sample_rate[iteration], msa_iteration],
"Java-Run CT-RAMP", capture_output=True)

if run_rsm == 1:
# this is to aggregate the EE, EI and Truck matrices from emme databank
emmebank_aggregator(main_directory, orig_full_model_dir, taz_crosswalk_file)

if not skipOtherSimulateModel[iteration]:
self.remove_prev_iter_files(smm_abm_files, output_dir, iteration)
self.run_proc(
Expand Down

0 comments on commit ed986c4

Please sign in to comment.