MOVES3.0.0 with database movesdb20201105

.gitignore

@@ -1,4 +1,5 @@
 *.class
+*.zip
 *.psp
 *.doc
 *.docx
@@ -7,12 +8,17 @@
 *.bak
 *.o
 
-**/go/**/*.exe
+calc/*.exe
+generators/*.exe
+calc/externalcalculatorgo
+generators/externalgenerator
 
 **/cvs
 
 artwork/*
 bin/*
+jre/*
+jre32/*
 installer/*
 izpack/*
 javadocs/*
@@ -22,16 +28,23 @@ uninstaller/*
 MOVESTemporary/*
 SharedWork/*
 WorkerFolder/*
-
-go32/*
+manyworkers/*
 
 install.xml
+go*output.txt
 PriorMasterID.txt
 PriorWorkerID.txt
+MOVESAlgorithms.html
 MOVESComputerID.txt
 moveslog.txt
 moveslog_old.txt
 MOVESWindows.txt
-go*output.txt
-calc/go/externalcalculatorgo
+mrulist.tmp
 
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

MOVESConfiguration.txt

@@ -1,13 +1,14 @@
 defaultServerName = localhost
-defaultDatabaseName = movesdb20181022
+defaultDatabaseName = movesdb20201105
 executionServerName = localhost
 executionDatabaseName = MOVESExecution
 outputServerName = 127.0.0.1
 outputDatabaseName = MOVESOutput
 nonroadExePath = NONROAD\NR08a\NONROAD.exe
 sharedDistributedFolderPath = SharedWork
-computerIDPath = MOVESComputerID.txt
+computerIDPath = 
 masterFolderPath = .
 saveTODOPath = 
 mysqlUserName = moves
-mysqlPassword = 744EF51E4F93167816578A645279E592D2B4D8A76AD450DF6463
+mysqlPassword = 744ff5134053c418265b626f5d7035e3dff3d50c609c548f6f63
+generatorExePath = generators\externalgenerator64.exe

NONROAD/NR08a/SOURCE/rdnropt.f

@@ -237,11 +237,11 @@ subroutine rdnropt( ierr )
         call spinit()
         if( ABS(ethvpct * 0.35 * 0.01 * ethmkt - oxypct) .GT. 0.1 ) then
            write(IOWSTD,'(/,1X,2A,3F7.2,/)',ERR=9999) 
-     &    'WARNING:  Oxygen content mismatch ',
+     &    'INFO:  Oxygen content mismatch ',
      &     'with Ethanol Blend Mkt Share & Vol %: ',
      &    oxypct, ethmkt, ethvpct
           write(IOWMSG,'(/,1X,2A,3F7.2,/)',ERR=9999) 
-     &    'WARNING:  Oxygen content mismatch ',
+     &    'INFO:  Oxygen content mismatch ',
      &     'with Ethanol Blend Mkt Share & Vol %: ',
      &    oxypct, ethmkt, ethvpct
         endif

WorkerConfiguration.txt

@@ -6,7 +6,8 @@ sharedDistributedFolderPath = SharedWork
 concurrentStatements = 1
 nonroadApplicationPath = NONROAD\NR08a\nonroad.exe
 nonroadWorkingFolderPath = NONROAD\NR08a
-calculatorApplicationPath = calc\go\externalcalculatorgo64.exe
+calculatorApplicationPath = calc\externalcalculatorgo64.exe
 workerDebug = False
 mysqlUserName = moves
-mysqlPassword = 744EF51E4F93167816578A645279E592D2B4D8A76AD450DF6463
+mysqlPassword = 744ff5134053c418265b626f5d7035e3dff3d50c609c548f6f63
+

amazon/setenv.bat

@@ -1,5 +1,5 @@
 @echo off
 set ANT_HOME=..\ant
-set JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_79
+set JAVA_HOME=..\jre
 set CLASSPATH=
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%PATH%

amazon/statuslog.txt

@@ -0,0 +1,8 @@
+Status
+--------------
+This is a full message Three 
+This is a full message Four 
+This is a full message One 
+This is a full message Two 
+AMessageZero 
+