Skip to content

Commit d55394b

Browse files
MOVES4-ReleaseCandidate2 with movesdb20230515
The MOVES4 Release Candidate is made available for testing purposes and for modelers to become familiar with functional changes between MOVES3 and MOVES4 before MOVES4.0.0 is released. Emission results of MOVES4.0.0 may differ from the results of this release candidate. Results from this version may not be used in work for state implementation plans, conformity determinations, or for any other regulatory purpose.
1 parent c8e12b4 commit d55394b

File tree

170 files changed

+9963
-12117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+9963
-12117
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.tmp
88
*.bak
99
*.o
10+
*.code-workspace
1011

1112
calc/*.exe
1213
generators/*.exe

CITATION.cff

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cff-version: 1.2.0
2-
message: "To cite MOVES3.1, use the metadata from this file."
2+
message: "To cite MOVES4, use the metadata from this file."
33
authors:
44
- name: "USEPA"
5-
title: "Motor Vehicle Emission Simulator: MOVES3.1"
5+
title: "Motor Vehicle Emission Simulator: MOVES4-ReleaseCandidate2"
66
type: software
77
identifiers:
88
- type: other
99
value: "Office of Transportation and Air Quality. US Environmental Protection Agency. Ann Arbor, MI."
1010
description: "Publisher"
1111
url: "https://www.epa.gov/moves"
12-
version: 3.1
13-
date-released: 2022-12-09
12+
version: "Development 4.0.0-ReleaseCandidate2"
13+
date-released: 2023-06-13

License.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
Copyright U.S. Environmental Protection Agency
1+
The MOVES4 Release Candidate is made available for testing purposes
2+
and for modelers to become familiar with functional changes between
3+
MOVES3 and MOVES4 before MOVES4.0.0 is released. Emission results
4+
of MOVES4.0.0 may differ from the results of this release candidate.
5+
Results from this version may not be used in work for state
6+
implementation plans, conformity determinations, or for any other
7+
regulatory purpose.
28

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

MOVESConfiguration.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defaultServerName = localhost
2-
defaultDatabaseName = movesdb20221007
2+
defaultDatabaseName = movesdb20230515
33
executionServerName = localhost
44
executionDatabaseName = MOVESExecution
55
outputServerName = 127.0.0.1

MOVESMaster.bat MOVESMain.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@echo off
22
call setenv.bat
33

4+
if exist sharedwork\*.* erase /Q /S /F sharedwork\*.*
5+
if exist WorkerFolder\*.* erase /Q /S /F WorkerFolder\*.*
6+
47
set HR=%time:~0,2%
58
set HR=%Hr: =0%
69
set HR=%HR: =%
710
set logfile=moveslog_archive_%date:~10,4%-%date:~4,2%-%date:~7,2%_%HR%%time:~3,2%.txt
8-
if exist sharedwork\*.* erase /Q /S /F sharedwork\*.*
9-
if exist WorkerFolder\*.* erase /Q /S /F WorkerFolder\*.*
1011

1112
if exist moveslog.txt REN "moveslog.txt" "%logfile%"
12-
1313
if exist %logfile% (
1414
if not exist moveslog.zip (
1515
jar cMf moveslog.zip "%logfile%" && del "%logfile%"

NONROAD/NR08a/NONROAD.exe

276 KB
Binary file not shown.

NONROAD/NR08a/SOURCE/nonrdprm.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ c
178178
real*4 DENLPG
179179
real*4 DENDSL
180180
c
181-
parameter( DENGAS = 6.17 )
181+
parameter( DENGAS = 6.237 )
182182
parameter( DENCNG = 0.0061 )
183183
parameter( DENLPG = 4.507 )
184-
parameter( DENDSL = 7.1 )
184+
parameter( DENDSL = 7.044 )
185185
c
186186
c-----------------------------------------------------------------------
187187
c Parameter for fuel carbon mass fraction:

amazon/movesamazon.jar

20.9 KB
Binary file not shown.

build.xml

+29-44
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<echo message="startmysql - start a local copy of MySQL (DEPRECATED)" />
5959
<echo message="stopmysql - stop the local copy of MySQL (DEPRECATED)" />
6060
<echo message="-------------------------------------------------------------------------------"/>
61-
<echo message="rungui - display the MOVES Master user interface"/>
61+
<echo message="rungui - display the main MOVES user interface"/>
6262
<echo message="runworker - display the MOVES Worker user interface"/>
63-
<echo message="crungui - compile and run the MOVES Master user interface"/>
63+
<echo message="crungui - compile and run the main MOVES user interface"/>
6464
<echo message="crunworker - compile and run the MOVES Worker user interface"/>
6565
<echo message="-------------------------------------------------------------------------------"/>
6666
<echo message="1worker - start 1 local worker using the manyworkers.txt configuration " />
67-
<echo message=" file. If running on the same computer as MOVES Master, this" />
67+
<echo message=" file. If running on the same computer as main MOVES, this" />
6868
<echo message=" should be run in a separate command window. The worker will" />
6969
<echo message=" shutdown after there have been no TODO or InProgress files " />
7070
<echo message=" present for 2 minutes. Before using, edit manyworkers.txt to use" />
@@ -91,11 +91,12 @@
9191
<echo message=" using, edit maketodo.txt to use your system's " />
9292
<echo message=" sharedDistributedFolderPath." />
9393
<echo message=" ant maketodo -Drunspec=c:\myrunspecs\runspec1.mrs" />
94-
<echo message="master1worker -start MOVES with a single worker and wait for its DONE files." />
94+
<echo message="main1worker - start MOVES with a single worker and wait for its DONE files." />
9595
<echo message=" Like maketodo, use -Drunspec= to specify the runspec. Before " />
9696
<echo message=" using, edit both maketodo.txt and manyworkers.txt for your " />
97-
<echo message=" system's master and worker path settings." />
98-
<echo message=" ant master1worker -Drunspec=c:\myrunspecs\runspec1.mrs" />
97+
<echo message=" system's masterFolderPath and workFolderPath settings, " />
98+
<echo message=" respectively." />
99+
<echo message=" ant main1worker -Drunspec=c:\myrunspecs\runspec1.mrs" />
99100
<echo message="pickup - start MOVES to only pickup DONE files. Use -Dpdspec= to name the" />
100101
<echo message=" PDSpec XML file that will be used. Before using, edit " />
101102
<echo message=" maketodo.txt to use your system's sharedDistributedFolderPath." />
@@ -112,16 +113,11 @@
112113
<echo message="setlogin - store database user and password if the defaults have changed" />
113114
<echo message=" ant setlogin -Duser=moves -Dpassword=secret" />
114115
<echo message="-------------------------------------------------------------------------------"/>
115-
<echo message="convert2014_3 - convert a MOVES2014 database for use with MOVES3. Specify" />
116-
<echo message=" the name of the starting database with -Dinput= and name the" />
117-
<echo message=" resulting database with -Doutput= argument. IMPORTANT: see" />
118-
<echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
119-
<echo message=" ant convert2014_3 -Dinput=m2014_in -Doutput=m3_in" />
120-
<echo message="convert2014ab_3 - convert a MOVES2014a/b database for use with MOVES3. Specify" />
121-
<echo message=" the name of the starting database with -Dinput= and name the" />
122-
<echo message=" resulting database with -Doutput= argument. IMPORTANT: see" />
123-
<echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
124-
<echo message=" ant convert2014ab_3 -Dinput=m2014b_in -Doutput=m3_in" />
116+
<echo message="convert3_db_to_4 - convert a MOVES3 database for use with MOVES4. Specify" />
117+
<echo message=" the name of the starting database with -Dinput= and name the" />
118+
<echo message=" resulting database with -Doutput= argument. IMPORTANT: see" />
119+
<echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" />
120+
<echo message=" ant convert3_db_to_4 -Dinput=m3_in -Doutput=m4_in" />
125121
<echo message="-------------------------------------------------------------------------------"/>
126122
<echo message="dbimporter - run the MOVES Data Importers. IMPORTANT: Generate XML " />
127123
<echo message=" file from the Tools tab of the County or Project Data " />
@@ -156,7 +152,8 @@
156152
<echo message="-------------------------------------------------------------------------------"/>
157153
<echo message="run - Execute a runspec. " />
158154
<echo message=" Use -Drunspec= to name the one runspec that will be used." />
159-
<echo message=" ant run -Drunspec=c:\myrunspecs\runspec1.mrs" />
155+
<echo message=" ant run -Drunspec=c:\myrunspecs\runspec1.mrs" />
156+
160157
</target>
161158

162159
<path id="classpath">
@@ -899,15 +896,15 @@
899896
<var name="didstartmysql" value="1" />
900897
</else>
901898
</if>
902-
<echo>Launching the master...</echo>
899+
<echo>Launching MOVES...</echo>
903900
<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
904901
<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
905902
<classpath refid="classpath" />
906903
<arg value="-onlytodo" />
907904
<arg value="-r" />
908905
<arg value="${runspec}" />
909906
</java>
910-
<echo>Master finished.</echo>
907+
<echo>MOVES finished.</echo>
911908
<if>
912909
<equals arg1="${didstartmysql}" arg2="1" />
913910
<then>
@@ -918,10 +915,10 @@
918915
<arg value="--shutdown_timeout=30" />
919916
<arg value="shutdown" />
920917
</exec>
921-
<echo>Master and mysql have been shutdown.</echo>
918+
<echo>MOVES and mysql have been shutdown.</echo>
922919
</then>
923920
<else>
924-
<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
921+
<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
925922
</else>
926923
</if>
927924
</then>
@@ -931,7 +928,7 @@
931928
</if>
932929
</target>
933930

934-
<target name="master1worker" depends="">
931+
<target name="main1worker" depends="">
935932
<delete dir="manyworkers" />
936933
<mkdir dir="manyworkers" />
937934
<mkdir dir="manyworkers/workerfolder" />
@@ -968,15 +965,15 @@
968965
<var name="didstartmysql" value="1" />
969966
</else>
970967
</if>
971-
<echo>Launching the master, which will launch a worker...</echo>
968+
<echo>Launching MOVES, which will launch a worker...</echo>
972969
<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
973970
<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
974971
<classpath refid="classpath" />
975972
<arg value="-workerconfig=manyworkers.txt" />
976973
<arg value="-r" />
977974
<arg value="${runspec}" />
978975
</java>
979-
<echo>Master and 1 worker finished.</echo>
976+
<echo>MOVES and 1 worker finished.</echo>
980977
<if>
981978
<equals arg1="${didstartmysql}" arg2="1" />
982979
<then>
@@ -987,10 +984,10 @@
987984
<arg value="--shutdown_timeout=30" />
988985
<arg value="shutdown" />
989986
</exec>
990-
<echo>Master and mysql have been shutdown.</echo>
987+
<echo>MOVES and mysql have been shutdown.</echo>
991988
</then>
992989
<else>
993-
<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
990+
<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
994991
</else>
995992
</if>
996993
</then>
@@ -1034,14 +1031,14 @@
10341031
<var name="didstartmysql" value="1" />
10351032
</else>
10361033
</if>
1037-
<echo>Launching the master...</echo>
1034+
<echo>Launching MOVES...</echo>
10381035
<java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
10391036
<sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
10401037
<classpath refid="classpath" />
10411038
<arg value="-p" />
10421039
<arg value="${pdspec}" />
10431040
</java>
1044-
<echo>Master finished.</echo>
1041+
<echo>MOVES finished.</echo>
10451042
<if>
10461043
<equals arg1="${didstartmysql}" arg2="1" />
10471044
<then>
@@ -1052,10 +1049,10 @@
10521049
<arg value="--shutdown_timeout=30" />
10531050
<arg value="shutdown" />
10541051
</exec>
1055-
<echo>Master and mysql have been shutdown.</echo>
1052+
<echo>MOVES and mysql have been shutdown.</echo>
10561053
</then>
10571054
<else>
1058-
<echo>Master has been shutdown, but not MySQL since it was already running.</echo>
1055+
<echo>MOVES has been shutdown, but not MySQL since it was already running.</echo>
10591056
</else>
10601057
</if>
10611058
</then>
@@ -1105,27 +1102,15 @@
11051102
</jar>
11061103
</target>
11071104

1108-
<target name="convert2014_3" depends="">
1105+
<target name="convert3_db_to_4" depends="">
11091106
<java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m">
11101107
<classpath>
11111108
<pathelement path="${java.class.path}" />
11121109
</classpath>
11131110
<classpath refid="classpath" />
11141111
<arg value="-input=${input}" />
11151112
<arg value="-output=${output}" />
1116-
<arg value="-script=database\ConversionScripts\Convert_MOVES2014_input_to_MOVES3.sql" />
1117-
</java>
1118-
</target>
1119-
1120-
<target name="convert2014ab_3" depends="">
1121-
<java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m">
1122-
<classpath>
1123-
<pathelement path="${java.class.path}" />
1124-
</classpath>
1125-
<classpath refid="classpath" />
1126-
<arg value="-input=${input}" />
1127-
<arg value="-output=${output}" />
1128-
<arg value="-script=database\ConversionScripts\Convert_MOVES2014ab_input_to_MOVES3.sql" />
1113+
<arg value="-script=database\ConversionScripts\Convert_MOVES3_input_to_MOVES4.sql" />
11291114
</java>
11301115
</target>
11311116

0 commit comments

Comments
 (0)