Merge remote-tracking branch 'upstream/develop' into issue178

* upstream/develop: Correct if-block syntax in config.postsnd and config.wavepostbndpnt after testing setup scripts FHMAX_WAV_IBP variable check for wavepostbndpnt job Bufr sounding job update Add config.resources.nco.static ecflow forecast job resource updates from NCO v16.0.7 install Update EMC_verif-global tag to verif_global_v1.13.5 Add missing symlinks for WAFS source code folders Update EMC_gfs_wafs tag to gfs_wafs.v6.0.19 Remove KEEPDATA from config.base.nco.static Pull in config changes from NCO v16.0.7 install Pull in workflow changes from NCO v16.0.7 install remove flags that were not present in Makefiles update jasper to 2.x.25. remove compiler flag in fv3nc2nemsio Update EMC_verif-global tag to verif_global_v1.13.4 another use of _d where an _4 is needed Adjust how target is set for build_workflow_utils Add workflow_utils to build_all and link scripts copy/paste error from enkf_chgres_recenter.fd to enkf_chgres_recenter_nc.fd. When going from nemsio to netcdf, the linking of ip, sp and w3nco changed from _d to _4. update .gitignore to exclude build and install directories as well as compiled files. bugfix in build_workflow_utils.sh hack. nceplibs-ncio now creates the module ncio and not fv3gfs_ncio. Update EMC_verif-global tag to verif_global_v1.13.4 add cmake build capability for workflow utilities ecFlow resource adjustments from NCO for forecast and post jobs issue NOAA-EMC#257 shorten run time on Mars Dell1 file system Refs: NOAA-EMC#178
KateFriedman-NOAA · Mar 9, 2021 · 370e814 · 370e814
2 parents 364e46f + 258b342
commit 370e814
Show file tree

Hide file tree

Showing 255 changed files with 2,160 additions and 1,297 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,14 @@
 #--------------------------
 __pycache__
 *.pyc
-*.o
+*.[aox]
 *.mod
 
-# Ignore exec folder
+# Ignore folders
 #-------------------
 exec/
+build*/
+install*/
 
 # Ignore fix directory symlinks
 #------------------------------

diff --git a/Externals.cfg b/Externals.cfg
@@ -36,7 +36,7 @@ protocol = git
 required = True
 
 [EMC_verif-global]
-tag = verif_global_v1.13.2
+tag = verif_global_v1.13.4
 local_path = sorc/verif-global.fd
 repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git
 protocol = git

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_anl.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_anl.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f000.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f000.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f001.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f001.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f002.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f002.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f003.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f003.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f004.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f004.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f005.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f005.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f006.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f006.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f007.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f007.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f008.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f008.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f009.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f009.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f010.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f010.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f011.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f011.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%

diff --git a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f012.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f012.ecf
@@ -4,19 +4,19 @@
 #BSUB -q %QUEUE%
 #BSUB -P %PROJ%
 #BSUB -W 0:20
-#BSUB -n 98
+#BSUB -n 112
 #BSUB -R affinity[core(1)]
-#BSUB -R span[ptile=14]
+#BSUB -R span[ptile=28]
 #BSUB -cwd /tmp
 
 %include <head.h>
 %include <envir-p3.h>
 
 set -x
 
-export NODES=7
-export ntasks=98
-export ptile=14
+export NODES=4
+export ntasks=112
+export ptile=28
 export threads=1
 
 export NET=%NET:gfs%