MOVES4.0.0 with movesdb20230615

Author: danielbizercox

.gitignore

@@ -7,6 +7,7 @@
 *.tmp
 *.bak
 *.o
+*.code-workspace
 
 calc/*.exe
 generators/*.exe

CITATION.cff

@@ -1,13 +1,13 @@
 cff-version: 1.2.0
-message: "To cite MOVES3.1, use the metadata from this file."
+message: "To cite MOVES4, use the metadata from this file."
 authors:
   - name: "USEPA"
-title: "Motor Vehicle Emission Simulator: MOVES3.1"
+title: "Motor Vehicle Emission Simulator: MOVES4"
 type: software
 identifiers:
   - type: other
     value: "Office of Transportation and Air Quality. US Environmental Protection Agency. Ann Arbor, MI."
     description: "Publisher"
 url: "https://www.epa.gov/moves"
-version: 3.1
-date-released: 2022-12-09
+version: 4.0.0
+date-released: 2023-08-30

License.txt

@@ -1,7 +1,3 @@
 Copyright U.S. Environmental Protection Agency
-
 Licensed for use pursuant to the GNU General Public License (GPL)
-
 For information about the GPL see http://www.gnu.org/licenses/gpl.html
-
-

MOVESConfiguration.txt

@@ -1,5 +1,5 @@
 defaultServerName = localhost
-defaultDatabaseName = movesdb20221007
+defaultDatabaseName = movesdb20230615
 executionServerName = localhost
 executionDatabaseName = MOVESExecution
 outputServerName = 127.0.0.1

MOVESMaster.bat MOVESMain.bat

@@ -1,15 +1,15 @@
 @echo off
 call setenv.bat
 
+if exist sharedwork\*.* erase /Q /S /F sharedwork\*.*
+if exist WorkerFolder\*.* erase /Q /S /F WorkerFolder\*.*
+
 set HR=%time:~0,2%
 set HR=%Hr: =0% 
 set HR=%HR: =%
 set logfile=moveslog_archive_%date:~10,4%-%date:~4,2%-%date:~7,2%_%HR%%time:~3,2%.txt
-if exist sharedwork\*.* erase /Q /S /F sharedwork\*.*
-if exist WorkerFolder\*.* erase /Q /S /F WorkerFolder\*.*
 
 if exist moveslog.txt REN "moveslog.txt" "%logfile%"
-
 if exist %logfile% (
 	if not exist moveslog.zip ( 
 		jar cMf moveslog.zip "%logfile%" && del "%logfile%"

NONROAD/NR08a/NONROAD.exe

@@ -178,10 +178,10 @@ c
       real*4 DENLPG
       real*4 DENDSL
 c
-      parameter( DENGAS = 6.17   )
+      parameter( DENGAS = 6.237 )
       parameter( DENCNG = 0.0061 )
       parameter( DENLPG = 4.507 )
-      parameter( DENDSL = 7.1   )
+      parameter( DENDSL = 7.044 )
 c
 c-----------------------------------------------------------------------
 c   Parameter for fuel carbon mass fraction:

NONROAD/NR08a/SOURCE/nonrdprm.inc

@@ -58,13 +58,13 @@
 		<echo message="startmysql   - start a local copy of MySQL (DEPRECATED)" />
 		<echo message="stopmysql    - stop the local copy of MySQL (DEPRECATED)" />
 		<echo message="-------------------------------------------------------------------------------"/>
-		<echo message="rungui       - display the MOVES Master user interface"/>
+		<echo message="rungui       - display the main MOVES user interface"/>
 		<echo message="runworker    - display the MOVES Worker user interface"/>
-		<echo message="crungui      - compile and run the MOVES Master user interface"/>
+		<echo message="crungui      - compile and run the main MOVES user interface"/>
 		<echo message="crunworker   - compile and run the MOVES Worker user interface"/>
 		<echo message="-------------------------------------------------------------------------------"/>
 		<echo message="1worker      - start 1 local worker using the manyworkers.txt configuration " />
-		<echo message="               file. If running on the same computer as MOVES Master, this" />
+		<echo message="               file. If running on the same computer as main MOVES, this" />
 		<echo message="               should be run in a separate command window. The worker will" />
 		<echo message="               shutdown after there have been no TODO or InProgress files " />
 		<echo message="               present for 2 minutes. Before using, edit manyworkers.txt to use" />
@@ -91,11 +91,12 @@
 		<echo message="               using, edit maketodo.txt to use your system's " />
 		<echo message="               sharedDistributedFolderPath." />
 		<echo message="    ant maketodo -Drunspec=c:\myrunspecs\runspec1.mrs" />
-		<echo message="master1worker -start MOVES with a single worker and wait for its DONE files." />
+		<echo message="main1worker  - start MOVES with a single worker and wait for its DONE files." />
 		<echo message="               Like maketodo, use -Drunspec= to specify the runspec. Before " />
 		<echo message="               using, edit both maketodo.txt and manyworkers.txt for your " />
-		<echo message="               system's master and worker path settings." />
-		<echo message="    ant master1worker -Drunspec=c:\myrunspecs\runspec1.mrs" />
+		<echo message="               system's masterFolderPath and workFolderPath settings, " />
+		<echo message="               respectively." />
+		<echo message="    ant main1worker -Drunspec=c:\myrunspecs\runspec1.mrs" />
 		<echo message="pickup       - start MOVES to only pickup DONE files. Use -Dpdspec= to name the" />
 		<echo message="               PDSpec XML file that will be used. Before using, edit " />
 		<echo message="               maketodo.txt to use your system's sharedDistributedFolderPath." />
@@ -112,16 +113,11 @@
 		<echo message="setlogin     - store database user and password if the defaults have changed" />
 		<echo message="    ant setlogin -Duser=moves -Dpassword=secret" />
 		<echo message="-------------------------------------------------------------------------------"/>
-		<echo message="convert2014_3   - convert a MOVES2014 database for use with MOVES3. Specify" />
-		<echo message="                  the name of the starting database with -Dinput= and name the" />
-		<echo message="                  resulting database with -Doutput= argument. IMPORTANT: see" />
-		<echo message="                  database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
-		<echo message="    ant convert2014_3 -Dinput=m2014_in -Doutput=m3_in" />
-		<echo message="convert2014ab_3 - convert a MOVES2014a/b database for use with MOVES3. Specify" />
-		<echo message="                  the name of the starting database with -Dinput= and name the" />
-		<echo message="                  resulting database with -Doutput= argument. IMPORTANT: see" />
-		<echo message="                  database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
-		<echo message="    ant convert2014ab_3 -Dinput=m2014b_in -Doutput=m3_in" />
+		<echo message="convert3_db_to_4 - convert a MOVES3 database for use with MOVES4. Specify" />
+		<echo message="                   the name of the starting database with -Dinput= and name the" />
+		<echo message="                   resulting database with -Doutput= argument. IMPORTANT: see" />
+		<echo message="                   database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
+		<echo message="    ant convert3_db_to_4 -Dinput=m3_in -Doutput=m4_in" />
 		<echo message="-------------------------------------------------------------------------------"/>
 		<echo message="dbimporter      - run the MOVES Data Importers. IMPORTANT: Generate XML " />
 		<echo message="                  file from the Tools tab of the County or Project Data " />
@@ -156,7 +152,8 @@
 		<echo message="-------------------------------------------------------------------------------"/>
 		<echo message="run             - Execute a runspec. " />
 		<echo message="                  Use -Drunspec= to name the one runspec that will be used." />
-		<echo message="    ant run -Drunspec=c:\myrunspecs\runspec1.mrs" />		
+		<echo message="    ant run -Drunspec=c:\myrunspecs\runspec1.mrs" />
+		
 	</target>
 
 	<path id="classpath">
@@ -899,15 +896,15 @@
 						<var name="didstartmysql" value="1" />
 					</else>
 				</if>
-				<echo>Launching the master...</echo>
+				<echo>Launching MOVES...</echo>
 				<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
 					<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
 					<classpath refid="classpath" />
 					<arg value="-onlytodo" />
 					<arg value="-r" />
 					<arg value="${runspec}" />
 				</java>
-				<echo>Master finished.</echo>
+				<echo>MOVES finished.</echo>
 				<if>
 					<equals arg1="${didstartmysql}" arg2="1" />
 					<then>
@@ -918,10 +915,10 @@
 							<arg value="--shutdown_timeout=30" />
 							<arg value="shutdown" />
 						</exec>
-						<echo>Master and mysql have been shutdown.</echo>
+						<echo>MOVES and mysql have been shutdown.</echo>
 					</then>
 					<else>
-						<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
+						<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
 					</else>
 				</if>
 			</then>
@@ -931,7 +928,7 @@
 		</if>
 	</target>
 
-	<target name="master1worker" depends="">
+	<target name="main1worker" depends="">
 		<delete dir="manyworkers" />
 		<mkdir dir="manyworkers" />
 		<mkdir dir="manyworkers/workerfolder" />
@@ -968,15 +965,15 @@
 						<var name="didstartmysql" value="1" />
 					</else>
 				</if>
-				<echo>Launching the master, which will launch a worker...</echo>
+				<echo>Launching MOVES, which will launch a worker...</echo>
 				<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
 					<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
 					<classpath refid="classpath" />
 					<arg value="-workerconfig=manyworkers.txt" />
 					<arg value="-r" />
 					<arg value="${runspec}" />
 				</java>
-				<echo>Master and 1 worker finished.</echo>
+				<echo>MOVES and 1 worker finished.</echo>
 				<if>
 					<equals arg1="${didstartmysql}" arg2="1" />
 					<then>
@@ -987,10 +984,10 @@
 							<arg value="--shutdown_timeout=30" />
 							<arg value="shutdown" />
 						</exec>
-						<echo>Master and mysql have been shutdown.</echo>
+						<echo>MOVES and mysql have been shutdown.</echo>
 					</then>
 					<else>
-						<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
+						<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
 					</else>
 				</if>
 			</then>
@@ -1034,14 +1031,14 @@
 						<var name="didstartmysql" value="1" />
 					</else>
 				</if>
-				<echo>Launching the master...</echo>
+				<echo>Launching MOVES...</echo>
 				<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
 					<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
 					<classpath refid="classpath" />
 					<arg value="-p" />
 					<arg value="${pdspec}" />
 				</java>
-				<echo>Master finished.</echo>
+				<echo>MOVES finished.</echo>
 				<if>
 					<equals arg1="${didstartmysql}" arg2="1" />
 					<then>
@@ -1052,10 +1049,10 @@
 							<arg value="--shutdown_timeout=30" />
 							<arg value="shutdown" />
 						</exec>
-						<echo>Master and mysql have been shutdown.</echo>
+						<echo>MOVES and mysql have been shutdown.</echo>
 					</then>
 					<else>
-						<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
+						<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
 					</else>
 				</if>
 			</then>
@@ -1105,27 +1102,15 @@
 		</jar>
 	</target>
 
-	<target name="convert2014_3" depends="">
+	<target name="convert3_db_to_4" depends="">
 		<java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m">
 			<classpath>
 				<pathelement path="${java.class.path}" />
 			</classpath>
 			<classpath refid="classpath" />
 			<arg value="-input=${input}" />
 			<arg value="-output=${output}" />
-			<arg value="-script=database\ConversionScripts\Convert_MOVES2014_input_to_MOVES3.sql" />
-		</java>
-	</target>
-
-	<target name="convert2014ab_3" depends="">
-		<java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m">
-			<classpath>
-				<pathelement path="${java.class.path}" />
-			</classpath>
-			<classpath refid="classpath" />
-			<arg value="-input=${input}" />
-			<arg value="-output=${output}" />
-			<arg value="-script=database\ConversionScripts\Convert_MOVES2014ab_input_to_MOVES3.sql" />
+			<arg value="-script=database\ConversionScripts\Convert_MOVES3_input_to_MOVES4.sql" />
 		</java>
 	</target>
 
@@ -1159,7 +1144,7 @@
 					<classpath refid="classpath" />
 					<arg value="-input=${input}" />
 					<arg value="-output=${output}" />
-					<arg value="-script=database\NEIQA\M3onroadCDBchecks.sql" />
+					<arg value="-script=database\NEIQA\onroadCDBchecks.sql" />
 				</java>
 			</else>
 		</if>		
@@ -1195,7 +1180,7 @@
 					<classpath refid="classpath" />
 					<arg value="-input=${input}" />
 					<arg value="-output=${output}" />
-					<arg value="-script=database\NEIQA\M3nonroadCDBchecks.sql" />
+					<arg value="-script=database\NEIQA\nonroadCDBchecks.sql" />
 				</java>
 			</else>
 		</if>