MOVES3.0.4 with movesdb20220805

Merge branch 'dev/v3.0.4'

CITATION.cff

@@ -9,5 +9,5 @@ identifiers:
     value: "Office of Transportation and Air Quality. US Environmental Protection Agency. Ann Arbor, MI."
     description: "Publisher"
 url: "https://www.epa.gov/moves"
-version: 3.0.3
-date-released: 2022-01-13
+version: "Development 3.0.4"
+#date-released: YYYY-MM-DD

MOVESConfiguration.txt

@@ -1,5 +1,5 @@
 defaultServerName = localhost
-defaultDatabaseName = movesdb20220105
+defaultDatabaseName = movesdb20220802
 executionServerName = localhost
 executionDatabaseName = MOVESExecution
 outputServerName = 127.0.0.1

MOVESMaster.bat

@@ -1,7 +1,25 @@
 @echo off
+call setenv.bat
+
+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_old.txt erase moveslog_old.txt
-if exist moveslog.txt rename moveslog.txt moveslog_old.txt
-call setenv.bat
-ant rungui
+
+if exist moveslog.txt REN "moveslog.txt" "%logfile%"
+
+if exist %logfile% (
+	if not exist moveslog.zip ( 
+		jar cMf moveslog.zip "%logfile%" && del "%logfile%"
+	) else ( 
+		jar uMf moveslog.zip "%logfile%" && del "%logfile%"
+	)
+)
+
+ant rungui
+
+
+
+

NONROAD/NR08a/SOURCE/readme.md

@@ -1,12 +1,14 @@
-To compile the nonroad executable, install `gfortran` and navigate to this folder in the command prompt. Then type `make`.
+# Compiling NONROAD
 
-`make` will find the makefile and then `gfortran` is used to compile the code.
+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.
 
-Note that the location of the nonroad executable is configured in MOVES using 4 files:
+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/).
+
+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`.
+
+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:
 
 1. MOVESConfiguration.txt
 2. MOVESWorker.txt
 3. maketodo.txt
 4. manyworkers.txt
-
-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

@@ -8,7 +8,9 @@ Adam Sotona
 Adrian Nistor
 Adrien Grand
 Aleksandr Ishutin
+Alex
 Alex Rosen
+Alexander Grund
 Alexei Yudichev
 Alexey Panchenko
 Alexey Solofnenko
@@ -34,13 +36,15 @@ Arcadius Ahouansou
 Arjan Veenstra
 Arnaud Vandyck
 Arnout J. Kuiper
+Arturo Bernal
 Arun Jamwal
 Aslak Hellesôy
 Atsuhiko Yamanaka
 Avik Sengupta
 Balazs Fejes 2
 barney2k7
 Bart Vanhaute
+Basil Crow
 Ben Galbraith
 Ben Gertzfield
 Benjamin Burgess
@@ -130,6 +134,7 @@ Eli Tucker
 Emmanuel Bourg
 Eugène Adell
 Eric Barboni
+Eric Delaunay
 Eric Olsen
 Eric Pugh
 Erik Costlow
@@ -157,13 +162,15 @@ Gilles Querret
 Gilles Scokart
 Glenn McAllister
 Glenn Twiggs
+Gösen
 Greg Nelson
 Greg Roodt
 Greg Schueler
 Grégoire Vatry
 Günther Kögel
 Harish Prabandham
 Haroon Rafique
+Helder Pereira
 Hiroaki Nakamura
 Holger Engels
 Holger Joest
@@ -221,6 +228,7 @@ Joseph Walton
 Josh Lucas
 Juerg Wanner
 Julian Simpson
+Julien Lepiller
 Justin Vallon
 Justyna Horwat
 Karl Jansen
@@ -247,6 +255,8 @@ Ludovic Claude
 Maarten Coene
 Magesh Umasankar
 Maneesh Sahu
+Marc Guillemot
+Marc Strapetz
 Marcel Schutte
 Marcus Börger
 Mario Frasca 
@@ -282,6 +292,7 @@ Matthew Watson
 Matthew Yanos
 Matthias Bhend
 Matthias Gutheil
+Matthias Johann Vill
 Michael Bayne
 Michael Clarke
 Michael Davey
@@ -292,6 +303,7 @@ Michael Newcomb
 Michael Nygard
 Michael Saunders
 Michael Seele
+Mickaël Guessant
 Miha
 Mike Davis
 Mike Roberts
@@ -387,6 +399,7 @@ Sebastien Arod
 Shiraz Kanga
 Simeon Fitch
 Simon Law
+Simon Legner
 Simone Bordet
 Stefan Bodewig
 Stefan Heimann
@@ -421,6 +434,7 @@ Tim Stephenson
 Tim Whittington
 Timoteo Ohara
 Timothy Gerard Endres
+TJ Rothwell
 Tom Ball
 Tom Brus
 Tom Cunningham
@@ -429,6 +443,7 @@ Tom Eugelink
 Tom May
 Tomasz Bech
 Tomáš Zezula
+Tony Gravagno
 Trejkaz Xaoza
 Ulrich Schmidt
 Uwe Schindler

ant/NOTICE

@@ -1,5 +1,5 @@
 Apache Ant
-Copyright 1999-2019 The Apache Software Foundation
+Copyright 1999-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).