Skip to content

Commit 365b358

Browse files
MOVES3.0.4 with movesdb20220805
Merge branch 'dev/v3.0.4'
2 parents 707ba4b + 720f289 commit 365b358

File tree

91 files changed

+2749
-156
lines changed

Some content is hidden

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

91 files changed

+2749
-156
lines changed

CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ identifiers:
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.0.3
13-
date-released: 2022-01-13
12+
version: "Development 3.0.4"
13+
#date-released: YYYY-MM-DD

MOVESConfiguration.txt

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

MOVESMaster.bat

+22-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
@echo off
2+
call setenv.bat
3+
4+
set HR=%time:~0,2%
5+
set HR=%Hr: =0%
6+
set HR=%HR: =%
7+
set logfile=moveslog_archive_%date:~10,4%-%date:~4,2%-%date:~7,2%_%HR%%time:~3,2%.txt
28
if exist sharedwork\*.* erase /Q /S /F sharedwork\*.*
39
if exist WorkerFolder\*.* erase /Q /S /F WorkerFolder\*.*
4-
if exist moveslog_old.txt erase moveslog_old.txt
5-
if exist moveslog.txt rename moveslog.txt moveslog_old.txt
6-
call setenv.bat
7-
ant rungui
10+
11+
if exist moveslog.txt REN "moveslog.txt" "%logfile%"
12+
13+
if exist %logfile% (
14+
if not exist moveslog.zip (
15+
jar cMf moveslog.zip "%logfile%" && del "%logfile%"
16+
) else (
17+
jar uMf moveslog.zip "%logfile%" && del "%logfile%"
18+
)
19+
)
20+
21+
ant rungui
22+
23+
24+
25+

NONROAD/NR08a/SOURCE/readme.md

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
To compile the nonroad executable, install `gfortran` and navigate to this folder in the command prompt. Then type `make`.
1+
# Compiling NONROAD
22

3-
`make` will find the makefile and then `gfortran` is used to compile the code.
3+
The NONROAD model is written in FORTRAN. It is available pre-compiled both on GitHub and when using the Windows installer for MOVES, so most users will not need to compile NONROAD. However, users running in a Linux environment will need to recompile.
44

5-
Note that the location of the nonroad executable is configured in MOVES using 4 files:
5+
Previously, EPA recommended using `gfortran` to compile NONROAD. However, we have received reports that in certain instances, NONROAD compiled with `gfortran` on some Linux platforms incorrectly produces near-zero emission results for some equipment types. Therefore, when compiling for Linux, EPA recommends finding a compatible FORTRAN compiler using the resources at [fortran-lang.org](https://fortran-lang.org/compilers/). Note that we have not experienced any issues compiling with `gfortran` on Windows installed with [MSYS2](https://www.msys2.org/) or [Cygwin](https://cygwin.com/).
6+
7+
Regardless of which compiler is used, NONROAD should be compiled using the `makefile` found in the `NONROAD/NR08a/SOURCE` folder. This can be done by navigating to the `NONROAD/NR08a/SOURCE` folder in a terminal and running the `make` command. Note that the first line of the makefile may need to be edited to specify your chosen compiler if you do not use `gfortran`.
8+
9+
After compiling NONROAD, delete the `NONROAD/NR08a/NONROAD.exe` file, and move your new executable to this location. After moving, ensure the file name is the same (including capitalization) as `NONROAD.exe`. If a different filename or directory is used, you will need to update the path to executable in the following configuration files:
610

711
1. MOVESConfiguration.txt
812
2. MOVESWorker.txt
913
3. maketodo.txt
1014
4. manyworkers.txt
11-
12-
Depending on how this is set and which operating system is used, the nonroad executable may need to be moved and/or renamed to match the capitalization set in the configuration files.

ant/CONTRIBUTORS

+15
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ Adam Sotona
88
Adrian Nistor
99
Adrien Grand
1010
Aleksandr Ishutin
11+
Alex
1112
Alex Rosen
13+
Alexander Grund
1214
Alexei Yudichev
1315
Alexey Panchenko
1416
Alexey Solofnenko
@@ -34,13 +36,15 @@ Arcadius Ahouansou
3436
Arjan Veenstra
3537
Arnaud Vandyck
3638
Arnout J. Kuiper
39+
Arturo Bernal
3740
Arun Jamwal
3841
Aslak Hellesôy
3942
Atsuhiko Yamanaka
4043
Avik Sengupta
4144
Balazs Fejes 2
4245
barney2k7
4346
Bart Vanhaute
47+
Basil Crow
4448
Ben Galbraith
4549
Ben Gertzfield
4650
Benjamin Burgess
@@ -130,6 +134,7 @@ Eli Tucker
130134
Emmanuel Bourg
131135
Eugène Adell
132136
Eric Barboni
137+
Eric Delaunay
133138
Eric Olsen
134139
Eric Pugh
135140
Erik Costlow
@@ -157,13 +162,15 @@ Gilles Querret
157162
Gilles Scokart
158163
Glenn McAllister
159164
Glenn Twiggs
165+
Gösen
160166
Greg Nelson
161167
Greg Roodt
162168
Greg Schueler
163169
Grégoire Vatry
164170
Günther Kögel
165171
Harish Prabandham
166172
Haroon Rafique
173+
Helder Pereira
167174
Hiroaki Nakamura
168175
Holger Engels
169176
Holger Joest
@@ -221,6 +228,7 @@ Joseph Walton
221228
Josh Lucas
222229
Juerg Wanner
223230
Julian Simpson
231+
Julien Lepiller
224232
Justin Vallon
225233
Justyna Horwat
226234
Karl Jansen
@@ -247,6 +255,8 @@ Ludovic Claude
247255
Maarten Coene
248256
Magesh Umasankar
249257
Maneesh Sahu
258+
Marc Guillemot
259+
Marc Strapetz
250260
Marcel Schutte
251261
Marcus Börger
252262
Mario Frasca
@@ -282,6 +292,7 @@ Matthew Watson
282292
Matthew Yanos
283293
Matthias Bhend
284294
Matthias Gutheil
295+
Matthias Johann Vill
285296
Michael Bayne
286297
Michael Clarke
287298
Michael Davey
@@ -292,6 +303,7 @@ Michael Newcomb
292303
Michael Nygard
293304
Michael Saunders
294305
Michael Seele
306+
Mickaël Guessant
295307
Miha
296308
Mike Davis
297309
Mike Roberts
@@ -387,6 +399,7 @@ Sebastien Arod
387399
Shiraz Kanga
388400
Simeon Fitch
389401
Simon Law
402+
Simon Legner
390403
Simone Bordet
391404
Stefan Bodewig
392405
Stefan Heimann
@@ -421,6 +434,7 @@ Tim Stephenson
421434
Tim Whittington
422435
Timoteo Ohara
423436
Timothy Gerard Endres
437+
TJ Rothwell
424438
Tom Ball
425439
Tom Brus
426440
Tom Cunningham
@@ -429,6 +443,7 @@ Tom Eugelink
429443
Tom May
430444
Tomasz Bech
431445
Tomáš Zezula
446+
Tony Gravagno
432447
Trejkaz Xaoza
433448
Ulrich Schmidt
434449
Uwe Schindler

ant/NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Ant
2-
Copyright 1999-2019 The Apache Software Foundation
2+
Copyright 1999-2021 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).

0 commit comments

Comments
 (0)