Skip to content

EMVL modifications #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cwsimmon wants to merge 21 commits into
base: FESTCV2.1_DISTRIBUTED
Choose a base branch
from
Open

EMVL modifications #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aa6c534
EMVL modifications
cwsimmon Nov 7, 2018
a1cdb52
- Added filename for NDep netcdf file to spinup script
cwsimmon Nov 9, 2018
ac92df1
Added gitignore to ignore class files.
cwsimmon Nov 9, 2018
332da90
Finished mods for using NDep netcdf file
cwsimmon Nov 14, 2018
f509c5c
- Fix to allow batching on SLURM
cwsimmon Nov 27, 2018
91f4ecb
Added option to suppress dly file output
cwsimmon Dec 6, 2018
6fac84f
Add support for SLURM job arrays
cwsimmon Feb 27, 2019
9637ea6
-added batch support for LSF and PBS workload managers
cwsimmon Mar 20, 2019
86ccdd0
-Fixed bug in running EpicApp with direct submission
cwsimmon Mar 25, 2019
5001b0c
- Added support for using a job scheduler with singularity container
cwsimmon Jun 17, 2019
e8214bd
Changed default Minimum Crop Acres to 0.0
cwsimmon Jun 20, 2019
04e4595
Merged EMVL modifications with latest repo changes
Mar 27, 2024
3faa4b7
Updates to allow multiyear runs. Also contains log4j updates.
Apr 25, 2024
7779339
Multiple fixes:
May 2, 2024
f34402f
Added creation of missing directories
Jun 24, 2024
fb29d8b
Added menu to select output format
Aug 19, 2024
0e287cf
Updates to run scripts for EPIC2SWAT
Sep 3, 2024
84293b9
Update to CMAQ and yearly average run scripts to support multi-year runs
May 6, 2025
863eb60
Bug fix for CMAQ yearly average run scripts
cwsimmon Sep 22, 2025
d0d58ce
Minor modification to CMAQ yearly average run script
cwsimmon Sep 23, 2025
581b778
Added 2016 fertilizer year
Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.class
34 changes: 17 additions & 17 deletions festc_bootstrap/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>festc_bootstrap</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>festc_bootstrap</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
0 festc_core/bin/.gitignore → festc_bootstrap/bin/.gitignore
View file
Open in desktop
File renamed without changes.
Binary file removed festc_bootstrap/bin/gov/epa/festc/boot/FestcClassLoader.class
View file
Open in desktop
Binary file not shown.
Binary file removed festc_bootstrap/bin/gov/epa/festc/boot/FestcLifecycleHandler.class
View file
Open in desktop
Binary file not shown.
39 changes: 20 additions & 19 deletions festc_bootstrap/boot.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# Comma separated list of folders with plug-ins
# (plug-in repositories)
#pluginFolders = ../,./lib,../festc_core,
pluginFolders = ./,./lib,../festc_core,../festc_saf_ui
org.java.plugin.standard.PluginLifecycleHandler = gov.epa.festc.boot.FestcLifecycleHandler

log4j.rootLogger=warn, console, R
log4j.logger.org.java = warn

log4j.appender.console = org.apache.log4j.core.appender.ConsoleAppender
log4j.appender.console.layout = org.apache.log4j.core.Layout.PatternLayout
log4j.appender.console.layout.conversionPattern = %d [%t] %-5p %c %m%n

log4j.appender.R=org.apache.log4j.core.appender.RollingFileAppender
log4j.appender.R.File=${user.home}/festc/festc.log
log4j.appender.R.MaxFileSize=100KB
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.core.Layout.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c %m%n
# Comma separated list of folders with plug-ins
# (plug-in repositories)
#pluginFolders = ../,./lib,../festc_core,
#pluginFolders = ./,./lib,../festc_core,../festc_saf_ui
pluginFolders = ./,./lib,../core,../saf.core.ui
org.java.plugin.standard.PluginLifecycleHandler = gov.epa.festc.boot.FestcLifecycleHandler

log4j.rootLogger=warn, console, R
log4j.logger.org.java = warn

log4j.appender.console = org.apache.log4j.core.appender.ConsoleAppender
log4j.appender.console.layout = org.apache.log4j.core.Layout.PatternLayout
log4j.appender.console.layout.conversionPattern = %d [%t] %-5p %c %m%n

log4j.appender.R=org.apache.log4j.core.appender.RollingFileAppender
log4j.appender.R.File=${user.home}/festc/festc.log
log4j.appender.R.MaxFileSize=100KB
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.core.Layout.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c %m%n
176 changes: 88 additions & 88 deletions festc_bootstrap/bootstrap.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<output-test url="file://$MODULE_DIR$/test/bin" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/saf.core.runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jpf-boot.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jpf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/log4j-1.2-api-2.0-rc1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/j3dutils.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/vecmath.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/j3dcore.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="junit-4.0" level="application" />
<orderEntryProperties />
</component>
</module>
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/bin" />
<exclude-output />
<output-test url="file://$MODULE_DIR$/test/bin" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/saf.core.runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jpf-boot.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jpf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/log4j-1.2-api-2.0-rc1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/j3dutils.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/vecmath.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../jdk1.5.0_06/jre/lib/ext/j3dcore.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="junit-4.0" level="application" />
<orderEntryProperties />
</component>
</module>

38 changes: 19 additions & 19 deletions festc_bootstrap/dist_boot.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Comma separated list of folders with plug-ins
# (plug-in repositories)
#pluginFolders = ../,./lib,../festc_core,
pluginFolders = ./,./lib,../core,../saf.core.ui
org.java.plugin.standard.PluginLifecycleHandler = gov.epa.festc.boot.FestcLifecycleHandler
log4j.rootLogger=warn, console, R
log4j.logger.org.java = warn
log4j.appender.console = org.apache.log4j.core.appender.ConsoleAppender
log4j.appender.console.layout = org.apache.log4j.core.Layout.PatternLayout
log4j.appender.console.layout.conversionPattern = %d [%t] %-5p %c %m%n
log4j.appender.R=org.apache.log4j.core.appender.RollingFileAppender
log4j.appender.R.File=${user.home}/festc/festc.log
log4j.appender.R.MaxFileSize=100KB
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.core.Layout.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c %m%n
# Comma separated list of folders with plug-ins
# (plug-in repositories)
#pluginFolders = ../,./lib,../festc_core,
pluginFolders = ./,./lib,../core,../saf.core.ui
org.java.plugin.standard.PluginLifecycleHandler = gov.epa.festc.boot.FestcLifecycleHandler

log4j.rootLogger=warn, console, R
log4j.logger.org.java = warn

log4j.appender.console = org.apache.log4j.core.appender.ConsoleAppender
log4j.appender.console.layout = org.apache.log4j.core.Layout.PatternLayout
log4j.appender.console.layout.conversionPattern = %d [%t] %-5p %c %m%n

log4j.appender.R=org.apache.log4j.core.appender.RollingFileAppender
log4j.appender.R.File=${user.home}/festc/festc.log
log4j.appender.R.MaxFileSize=100KB
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.core.Layout.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p %c %m%n
Loading