Update for TM1.5.2.0 release

BayAreaMetro · Mar 1, 2020 · 752e824 · 752e824
1 parent 8551df3
commit 752e824
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/model-files/RunModel.bat b/model-files/RunModel.bat
@@ -70,43 +70,20 @@ if %MODEL_YEAR% GTR 3000 (
 )
 
 set FUTURE_ABBR=%myfolder:~15,2%
-echo FUTURE SHORT NAME = %FUTURE_ABBR%
 set FUTURE=X
-echo FUTURE TEMPORARY LONG NAME = X
 
 :: FUTURE ------------------------- make sure FUTURE_ABBR is one of the five [BY, BP, RT,CG,BF] -------------------------
 :: The long names are: BaseYear ie 2015, Blueprint aka PBA50, CleanAndGreen, BackToTheFuture, or RisingTidesFallingFortunes
 
-
-echo off
-if %FUTURE_ABBR%==BY (
-:: for base year
-  set FUTURE=PBA50
-)
-
-echo off
-if %FUTURE_ABBR%==BP (
-:: for the Blueprint
-  set FUTURE=PBA50
-)
-
-echo off
-if %FUTURE_ABBR%==RT (
-  set FUTURE=RisingTidesFallingFortunes
-)
-
-echo off
-if %FUTURE_ABBR%==CG (
-   set FUTURE=CleanAndGreen
-)
-
-echo off
-if %FUTURE_ABBR%==BF (
-  set FUTURE=BackToTheFuture
+if %PROJECT%==IPA (SET FUTURE=PBA50)
+if %PROJECT%==PPA (
+  if %FUTURE_ABBR%==RT (set FUTURE=RisingTidesFallingFortunes)
+  if %FUTURE_ABBR%==CG (set FUTURE=CleanAndGreen)
+  if %FUTURE_ABBR%==BF (set FUTURE=BackToTheFuture)
 )
 
 echo on
-echo FUTURE LONG NAME = %FUTURE%
+echo FUTURE = %FUTURE%
 
 echo off
 if %FUTURE%==X (

diff --git a/model-files/SetUpModel.bat b/model-files/SetUpModel.bat
@@ -8,7 +8,7 @@
 SET computer_prefix=%computername:~0,4%
 
 :: copy over CTRAMP
-set GITHUB_DIR=\\mainmodel\MainModelShare\travel-model-one-1.5.1.11
+set GITHUB_DIR=\\mainmodel\MainModelShare\travel-model-one-1.5.2.0
 mkdir CTRAMP\model
 mkdir CTRAMP\runtime
 mkdir CTRAMP\scripts