diff --git a/.gitignore b/.gitignore index fb64c9dbc4..b3cde49fa0 100644 --- 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 index c0396e82cd..6f5fcd4798 100644 --- 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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 index 6c76d2984d..f2a37b6727 100755 --- 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,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f013.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f013.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f013.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f013.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f014.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f014.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f014.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f014.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f015.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f015.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f015.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f015.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f016.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f016.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f016.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f016.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f017.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f017.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f017.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f017.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f018.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f018.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f018.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f018.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f019.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f019.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f019.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f019.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f020.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f020.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f020.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f020.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f021.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f021.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f021.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f021.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f022.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f022.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f022.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f022.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f023.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f023.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f023.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f023.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f024.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f024.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f024.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f024.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f025.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f025.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f025.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f025.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f026.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f026.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f026.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f026.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f027.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f027.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f027.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f027.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f028.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f028.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f028.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f028.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f029.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f029.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f029.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f029.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f030.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f030.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f030.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f030.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f031.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f031.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f031.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f031.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f032.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f032.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f032.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f032.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f033.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f033.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f033.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f033.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f034.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f034.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f034.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f034.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f035.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f035.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f035.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f035.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f036.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f036.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f036.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f036.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f037.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f037.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f037.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f037.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f038.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f038.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f038.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f038.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f039.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f039.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f039.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f039.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f040.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f040.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f040.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f040.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f041.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f041.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f041.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f041.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f042.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f042.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f042.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f042.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f043.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f043.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f043.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f043.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f044.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f044.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f044.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f044.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f045.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f045.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f045.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f045.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f046.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f046.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f046.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f046.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f047.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f047.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f047.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f047.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f048.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f048.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f048.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f048.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f049.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f049.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f049.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f049.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f050.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f050.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f050.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f050.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f051.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f051.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f051.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f051.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f052.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f052.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f052.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f052.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f053.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f053.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f053.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f053.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f054.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f054.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f054.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f054.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f055.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f055.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f055.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f055.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f056.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f056.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f056.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f056.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f057.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f057.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f057.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f057.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f058.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f058.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f058.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f058.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f059.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f059.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f059.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f059.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f060.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f060.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f060.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f060.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f061.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f061.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f061.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f061.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f062.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f062.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f062.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f062.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f063.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f063.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f063.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f063.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f064.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f064.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f064.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f064.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f065.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f065.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f065.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f065.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f066.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f066.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f066.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f066.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f067.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f067.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f067.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f067.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f068.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f068.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f068.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f068.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f069.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f069.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f069.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f069.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f070.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f070.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f070.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f070.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f071.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f071.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f071.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f071.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f072.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f072.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f072.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f072.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f073.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f073.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f073.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f073.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f074.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f074.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f074.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f074.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f075.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f075.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f075.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f075.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f076.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f076.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f076.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f076.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f077.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f077.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f077.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f077.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f078.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f078.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f078.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f078.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f079.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f079.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f079.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f079.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f080.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f080.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f080.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f080.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f081.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f081.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f081.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f081.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f082.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f082.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f082.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f082.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f083.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f083.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f083.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f083.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f084.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f084.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f084.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f084.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f085.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f085.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f085.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f085.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f086.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f086.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f086.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f086.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f087.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f087.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f087.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f087.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f088.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f088.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f088.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f088.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f089.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f089.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f089.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f089.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f090.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f090.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f090.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f090.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f091.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f091.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f091.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f091.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f092.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f092.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f092.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f092.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f093.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f093.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f093.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f093.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f094.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f094.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f094.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f094.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f095.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f095.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f095.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f095.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f096.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f096.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f096.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f096.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f097.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f097.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f097.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f097.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f098.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f098.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f098.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f098.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f099.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f099.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f099.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f099.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f100.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f100.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f100.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f100.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f101.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f101.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f101.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f101.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f102.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f102.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f102.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f102.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f103.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f103.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f103.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f103.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f104.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f104.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f104.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f104.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f105.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f105.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f105.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f105.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f106.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f106.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f106.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f106.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f107.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f107.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f107.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f107.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f108.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f108.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f108.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f108.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f109.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f109.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f109.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f109.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f110.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f110.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f110.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f110.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f111.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f111.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f111.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f111.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f112.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f112.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f112.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f112.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f113.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f113.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f113.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f113.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f114.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f114.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f114.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f114.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f115.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f115.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f115.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f115.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f116.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f116.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f116.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f116.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f117.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f117.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f117.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f117.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f118.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f118.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f118.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f118.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f119.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f119.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f119.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f119.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f120.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f120.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f120.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f120.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f123.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f123.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f123.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f123.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f126.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f126.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f126.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f126.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f129.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f129.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f129.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f129.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f132.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f132.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f132.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f132.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f135.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f135.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f135.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f135.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f138.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f138.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f138.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f138.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f141.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f141.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f141.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f141.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f144.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f144.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f144.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f144.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f147.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f147.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f147.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f147.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f150.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f150.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f150.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f150.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f153.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f153.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f153.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f153.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f156.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f156.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f156.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f156.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f159.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f159.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f159.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f159.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f162.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f162.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f162.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f162.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f165.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f165.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f165.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f165.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f168.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f168.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f168.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f168.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f171.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f171.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f171.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f171.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f174.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f174.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f174.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f174.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f177.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f177.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f177.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f177.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f180.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f180.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f180.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f180.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f183.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f183.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f183.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f183.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f186.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f186.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f186.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f186.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f189.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f189.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f189.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f189.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f192.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f192.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f192.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f192.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f195.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f195.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f195.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f195.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f198.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f198.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f198.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f198.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f201.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f201.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f201.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f201.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f204.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f204.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f204.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f204.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f207.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f207.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f207.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f207.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f210.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f210.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f210.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f210.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f213.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f213.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f213.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f213.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f216.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f216.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f216.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f216.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f219.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f219.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f219.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f219.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f222.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f222.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f222.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f222.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f225.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f225.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f225.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f225.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f228.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f228.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f228.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f228.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f231.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f231.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f231.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f231.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f234.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f234.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f234.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f234.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f237.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f237.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f237.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f237.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f240.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f240.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f240.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f240.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f243.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f243.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f243.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f243.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f246.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f246.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f246.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f246.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f249.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f249.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f249.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f249.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f252.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f252.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f252.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f252.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f255.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f255.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f255.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f255.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f258.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f258.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f258.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f258.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f261.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f261.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f261.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f261.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f264.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f264.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f264.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f264.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f267.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f267.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f267.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f267.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f270.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f270.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f270.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f270.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f273.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f273.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f273.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f273.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f276.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f276.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f276.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f276.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f279.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f279.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f279.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f279.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f282.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f282.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f282.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f282.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f285.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f285.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f285.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f285.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f288.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f288.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f288.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f288.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f291.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f291.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f291.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f291.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f294.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f294.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f294.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f294.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f297.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f297.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f297.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f297.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f300.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f300.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f300.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f300.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f303.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f303.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f303.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f303.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f306.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f306.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f306.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f306.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f309.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f309.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f309.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f309.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f312.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f312.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f312.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f312.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f315.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f315.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f315.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f315.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f318.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f318.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f318.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f318.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f321.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f321.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f321.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f321.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f324.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f324.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f324.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f324.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f327.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f327.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f327.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f327.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f330.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f330.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f330.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f330.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f333.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f333.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f333.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f333.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f336.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f336.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f336.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f336.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f339.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f339.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f339.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f339.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f342.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f342.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f342.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f342.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f345.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f345.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f345.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f345.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f348.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f348.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f348.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f348.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f351.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f351.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f351.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f351.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f354.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f354.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f354.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f354.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f357.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f357.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f357.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f357.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f360.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f360.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f360.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f360.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f363.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f363.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f363.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f363.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f366.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f366.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f366.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f366.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f369.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f369.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f369.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f369.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f372.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f372.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f372.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f372.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f375.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f375.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f375.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f375.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f378.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f378.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f378.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f378.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f381.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f381.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f381.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f381.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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_f384.ecf b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f384.ecf index 6c76d2984d..f2a37b6727 100755 --- a/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f384.ecf +++ b/ecflow/ecf/scripts/gfs/atmos/post/jgfs_atmos_post_f384.ecf @@ -4,9 +4,9 @@ #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 @@ -14,9 +14,9 @@ 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/jgfs_forecast.ecf b/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf index 2adc7d53c9..8fc18335e9 100755 --- a/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf +++ b/ecflow/ecf/scripts/gfs/jgfs_forecast.ecf @@ -4,9 +4,9 @@ #BSUB -q %QUEUE% #BSUB -P %PROJ% #BSUB -W 2:30 -#BSUB -n 3388 -#BSUB -R affinity[core(4)] -#BSUB -R span[ptile=7] +#BSUB -n 2424 +#BSUB -R affinity[core(7)] +#BSUB -R span[ptile=4] #BSUB -cwd /tmp %include @@ -14,10 +14,10 @@ set -x -export NODES=484 -export ntasks=3388 -export ptile=7 -export threads=4 +export NODES=606 +export ntasks=2424 +export ptile=4 +export threads=7 export NET=%NET:gfs% export RUN=%RUN% diff --git a/modulefiles/workflow_utils.hera b/modulefiles/workflow_utils.hera new file mode 100644 index 0000000000..a0f71bee00 --- /dev/null +++ b/modulefiles/workflow_utils.hera @@ -0,0 +1,29 @@ +#%Module##################################################### +## Workflow Utilities - hera +############################################################# + +module load cmake/3.16.1 + +module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack +module load hpc/1.1.0 +module load hpc-intel/18.0.5.274 +module load hpc-impi/2018.0.4 + +module load jasper/2.0.25 +module load zlib/1.2.11 +module load png/1.6.35 + +module load bacio/2.4.1 +module load w3nco/2.4.1 +module load w3emc/2.7.3 +module load sp/2.3.3 +module load ip/3.3.3 +module load nemsio/2.5.2 +module load nemsiogfs/2.5.3 +#module load ncio/1.0.0 +module load sigio/2.3.2 +module load g2/3.4.1 +module load bufr/11.4.0 + +module load hdf5/1.10.6 +module load netcdf/4.7.4 diff --git a/modulefiles/workflow_utils.orion b/modulefiles/workflow_utils.orion new file mode 100644 index 0000000000..f379e1dbd0 --- /dev/null +++ b/modulefiles/workflow_utils.orion @@ -0,0 +1,29 @@ +#%Module##################################################### +## Workflow Utilities - orion +############################################################# + +module load cmake/3.17.3 + +module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack +module load hpc/1.1.0 +module load hpc-intel/2018.4 +module load hpc-impi/2018.4 + +module load jasper/2.0.25 +module load zlib/1.2.11 +module load png/1.6.35 + +module load bacio/2.4.1 +module load w3nco/2.4.1 +module load w3emc/2.7.3 +module load sp/2.3.3 +module load ip/3.3.3 +module load nemsio/2.5.2 +module load nemsiogfs/2.5.3 +#module load ncio/1.0.0 +module load sigio/2.3.2 +module load g2/3.4.1 +module load bufr/11.4.0 + +module load hdf5/1.10.6 +module load netcdf/4.7.4 diff --git a/modulefiles/workflow_utils.wcoss_dell_p3 b/modulefiles/workflow_utils.wcoss_dell_p3 new file mode 100644 index 0000000000..3e20cff4a4 --- /dev/null +++ b/modulefiles/workflow_utils.wcoss_dell_p3 @@ -0,0 +1,29 @@ +#%Module##################################################### +## Workflow Utilities - wcoss_dell_p3 +############################################################# + +module load cmake/3.16.2 + +module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack +module load hpc/1.1.0 +module load hpc-ips/18.0.1.163 +module load hpc-impi/18.0.1 + +module load jasper/2.0.25 +module load zlib/1.2.11 +module load png/1.6.35 + +module load bacio/2.4.1 +module load w3nco/2.4.1 +module load w3emc/2.7.3 +module load sp/2.3.3 +module load ip/3.3.3 +module load nemsio/2.5.2 +module load nemsiogfs/2.5.3 +#module load ncio/1.0.0 +module load sigio/2.3.2 +module load g2/3.4.1 +module load bufr/11.4.0 + +module load hdf5/1.10.6 +module load netcdf/4.7.4 diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 5634905a2f..55923c0c27 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -47,7 +47,7 @@ export NOSCRUB="@NOSCRUB@" export BASE_GIT="@BASE_GIT@" # Toggle to turn on/off GFS downstream processing. -export DO_BUFRSND="YES" # BUFR sounding products +export DO_BUFRSND="NO" # BUFR sounding products export DO_GEMPAK="NO" # GEMPAK products export DO_AWIPS="NO" # AWIPS products export WAFSF="NO" # WAFS products diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static index 4718f4577c..7f5788dddc 100755 --- a/parm/config/config.base.nco.static +++ b/parm/config/config.base.nco.static @@ -74,7 +74,6 @@ export NCP="/bin/cp -p" export NMV="/bin/mv" export NLN="/bin/ln -sf" export VERBOSE="YES" -export KEEPDATA="NO" export CHGRP_CMD="chgrp rstprod" export NEMSIOGET="$HOMEgfs/exec/nemsio_get" export NCDUMP="$NETCDF/bin/ncdump" diff --git a/parm/config/config.fcst b/parm/config/config.fcst index d228273bab..28aa9b64eb 100755 --- a/parm/config/config.fcst +++ b/parm/config/config.fcst @@ -7,6 +7,7 @@ echo "BEGIN: config.fcst" # Source model specific information that is resolution dependent . $EXPDIR/config.fv3 $CASE +[[ "$CDUMP" == "gfs" ]] && export nth_fv3=$nth_fv3_gfs # Get task specific resources . $EXPDIR/config.resources fcst @@ -253,13 +254,14 @@ elif [[ "$CDUMP" == "gfs" ]] ; then # GFS cycle specific parameters export io_layout="1,1" fi - # Debug load balancing - #export KEEPDATA="YES" - #export ESMF_RUNTIME_PROFILE=ON - #export ESMF_RUNTIME_PROFILE_OUTPUT=SUMMARY fi + ## Debug load balancing + # export KEEPDATA="YES" + # export ESMF_RUNTIME_PROFILE=ON + # export ESMF_RUNTIME_PROFILE_OUTPUT=SUMMARY + # Regrid tiles to global Gaussian grid in NEMSIO export REGRID_NEMSIO_SH="$HOMEgfs/ush/fv3gfs_regrid_nemsio.sh" diff --git a/parm/config/config.fv3 b/parm/config/config.fv3 index 410a5ed4a7..eca11a0f81 100755 --- a/parm/config/config.fv3 +++ b/parm/config/config.fv3 @@ -44,6 +44,7 @@ case $case_in in export npe_wav=16 export npe_wav_gfs=16 export nth_fv3=1 + export nth_fv3_gfs=1 export cdmbgwd="0.071,2.1,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 export WRTTASK_PER_GROUP=$npe_node_max @@ -60,6 +61,7 @@ case $case_in in export npe_wav=40 export npe_wav_gfs=40 export nth_fv3=1 + export nth_fv3_gfs=1 export cdmbgwd="0.14,1.8,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 export WRTTASK_PER_GROUP=6 @@ -75,7 +77,8 @@ case $case_in in export layout_y_gfs=6 export npe_wav=140 export npe_wav_gfs=140 - export nth_fv3=4 + export nth_fv3=2 + export nth_fv3_gfs=2 export cdmbgwd="0.23,1.5,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 export WRTTASK_PER_GROUP=$npe_node_max @@ -92,6 +95,7 @@ case $case_in in export npe_wav=140 export npe_wav_gfs=140 export nth_fv3=1 + export nth_fv3_gfs=1 export cdmbgwd="1.1,0.72,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=1 export WRTTASK_PER_GROUP=$npe_node_max @@ -103,11 +107,12 @@ case $case_in in export DELTIM=150 export layout_x=8 export layout_y=12 - export layout_x_gfs=8 - export layout_y_gfs=12 + export layout_x_gfs=16 + export layout_y_gfs=16 export npe_wav=140 - export npe_wav_gfs=140 + export npe_wav_gfs=440 export nth_fv3=4 + export nth_fv3_gfs=7 export cdmbgwd="4.0,0.15,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=2 export WRTTASK_PER_GROUP=$(echo "2*$npe_node_max" |bc) @@ -124,6 +129,7 @@ case $case_in in export npe_wav=140 export npe_wav_gfs=140 export nth_fv3=4 + export nth_fv3_gfs=4 export cdmbgwd="4.0,0.10,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=4 export WRTTASK_PER_GROUP=$(echo "2*$npe_node_max" |bc) @@ -140,6 +146,7 @@ case $case_in in export npe_wav=140 export npe_wav_gfs=140 export nth_fv3=4 + export nth_fv3_gfs=4 export cdmbgwd="4.0,0.05,1.0,1.0" # mountain blocking, ogwd, cgwd, cgwd src scaling export WRITE_GROUP=4 export WRTTASK_PER_GROUP=$(echo "3*$npe_node_max" |bc) diff --git a/parm/config/config.postsnd b/parm/config/config.postsnd index 33e7ea55c9..d64b401cdb 100755 --- a/parm/config/config.postsnd +++ b/parm/config/config.postsnd @@ -9,5 +9,7 @@ echo "BEGIN: config.postsnd" . $EXPDIR/config.resources postsnd export POSTSNDSH=$HOMEgfs/jobs/JGFS_ATMOS_POSTSND +export ENDHOUR=180 +if [[ "$FHMAX_GFS" -lt "$ENDHOUR" ]] ; then export ENDHOUR=$FHMAX_GFS ; fi echo "END: config.postsnd" diff --git a/parm/config/config.resources b/parm/config/config.resources index ac081db976..86b5acf661 100755 --- a/parm/config/config.resources +++ b/parm/config/config.resources @@ -177,11 +177,11 @@ elif [ $step = "post" ]; then export wtime_post="02:00:00" export wtime_post_gfs="06:00:00" - export npe_post=96 + export npe_post=112 export nth_post=1 export npe_node_post=12 export npe_node_dwn=$npe_node_max - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_node_post=14 ; fi + if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_node_post=28 ; fi if [[ "$machine" == "WCOSS_C" ]]; then export memory_post="3072M"; fi elif [ $step = "wafs" ]; then diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static index 07b3b15f4d..a6a2c88c0a 100755 --- a/parm/config/config.resources.nco.static +++ b/parm/config/config.resources.nco.static @@ -22,19 +22,9 @@ step=$1 echo "BEGIN: config.resources" -if [[ "$machine" = "WCOSS_DELL_P3" ]]; then - export npe_node_max=28 - if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5 - export npe_node_max=40 - fi -elif [[ "$machine" = "WCOSS_C" ]]; then - export npe_node_max=24 -elif [[ "$machine" = "JET" ]]; then - export npe_node_max=24 -elif [[ "$machine" = "HERA" ]]; then - export npe_node_max=40 -elif [[ "$machine" = "ORION" ]]; then - export npe_node_max=40 +export npe_node_max=28 +if [ "$QUEUE" = "dev2" -o "$QUEUE" = "devonprod2" -o "$QUEUE" = "devmax2" ]; then # WCOSS Dell 3.5 + export npe_node_max=40 fi if [ $step = "prep" -o $step = "prepbufr" ]; then @@ -47,23 +37,26 @@ if [ $step = "prep" -o $step = "prepbufr" ]; then elif [ $step = "waveinit" ]; then export wtime_waveinit="00:10:00" - export npe_waveinit=10 + export npe_waveinit=12 export nth_waveinit=1 export npe_node_waveinit=$(echo "$npe_node_max / $nth_waveinit" | bc) export NTASKS=${npe_waveinit} elif [ $step = "waveprep" ]; then - export wtime_waveprep="00:30:00" - export npe_waveprep=65 + export wtime_waveprep="00:10:00" + export wtime_waveprep_gfs="00:30:00" + export npe_waveprep=84 export nth_waveprep=1 export npe_node_waveprep=$(echo "$npe_node_max / $nth_waveprep" | bc) export NTASKS=${npe_waveprep} elif [ $step = "wavepostsbs" ]; then - export wtime_wavepostsbs="06:00:00" - export npe_wavepostsbs=10 + export wtime_wavepostsbs="00:20:00" + export wtime_wavepostsbs_gfs="03:00:00" + export npe_wavepostsbs=28 + export npe_wavepostsbs_gfs=280 export nth_wavepostsbs=1 export npe_node_wavepostsbs=$(echo "$npe_node_max / $nth_wavepostsbs" | bc) export NTASKS=${npe_wavepostsbs} @@ -78,7 +71,8 @@ elif [ $step = "wavepostbndpnt" ]; then elif [ $step = "wavepostpnt" ]; then - export wtime_wavepostpnt="01:30:00" + export wtime_wavepostpnt="00:12:00" + export wtime_wavepostpnt_gfs="01:30:00" export npe_wavepostpnt=280 export nth_wavepostpnt=1 export npe_node_wavepostpnt=$(echo "$npe_node_max / $nth_wavepostpnt" | bc) @@ -110,19 +104,13 @@ elif [ $step = "waveawipsgridded" ]; then elif [ $step = "anal" ]; then - export wtime_anal="00:45:00" + export wtime_anal="01:00:00" + export wtime_anal_gfs="00:40:00" export npe_anal=1000 - export nth_anal=4 export npe_anal_gfs=1000 - if [ $CASE = "C384" ]; then - export npe_anal=160 - export nth_anal=10 - fi - if [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then export npe_anal=84; fi - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_anal=7; fi + export nth_anal=7 export npe_node_anal=$(echo "$npe_node_max / $nth_anal" | bc) export nth_cycle=$npe_node_max - if [[ "$machine" == "WCOSS_C" ]]; then export memory_anal="3072M"; fi elif [ $step = "analcalc" ]; then @@ -130,7 +118,6 @@ elif [ $step = "analcalc" ]; then export npe_analcalc=127 export nth_analcalc=1 export npe_node_analcalc=$npe_node_max - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_analcalc=127 ; fi elif [ $step = "analdiag" ]; then @@ -138,40 +125,36 @@ elif [ $step = "analdiag" ]; then export npe_analdiag=112 export nth_analdiag=1 export npe_node_analdiag=$npe_node_max - if [[ "$machine" == "WCOSS_C" ]]; then export memory_analdiag="3072M"; fi elif [ $step = "gldas" ]; then - export wtime_gldas="00:10:00" - export npe_gldas=96 + export wtime_gldas="00:20:00" + export npe_gldas=112 export nth_gldas=1 export npe_node_gldas=$npe_node_max export npe_gaussian=96 export nth_gaussian=1 export npe_node_gaussian=24 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_gldas=112 ; fi - if [[ "$machine" == "WCOSS_C" ]]; then export memory_gldas="3072M"; fi elif [ $step = "fcst" ]; then - export wtime_fcst="00:30:00" + export wtime_fcst="01:00:00" export wtime_fcst_gfs="02:30:00" export npe_fcst=$(echo "$layout_x * $layout_y * 6" | bc) export npe_fcst_gfs=$(echo "$layout_x_gfs * $layout_y_gfs * 6" | bc) export nth_fcst=${nth_fv3:-2} export npe_node_fcst=$(echo "$npe_node_max / $nth_fcst" | bc) - if [[ "$machine" == "WCOSS_C" ]]; then export memory_fcst="1024M"; fi elif [ $step = "post" ]; then - export wtime_post="02:00:00" - export wtime_post_gfs="06:00:00" - export npe_post=96 + export wtime_post="00:12:00" + export wtime_post_gfs="00:20:00" + export npe_post=98 + export npe_post_gfs=112 export nth_post=1 - export npe_node_post=12 + export npe_node_post=14 + export npe_node_post_gfs=28 export npe_node_dwn=$npe_node_max - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export npe_node_post=14 ; fi - if [[ "$machine" == "WCOSS_C" ]]; then export memory_post="3072M"; fi elif [ $step = "wafs" ]; then @@ -224,11 +207,6 @@ elif [ $step = "vrfy" ]; then export npe_node_vrfy=1 export npe_vrfy_gfs=1 export npe_node_vrfy_gfs=1 - if [[ "$machine" == "WCOSS_C" ]]; then - export memory_vrfy="3072M" - elif [[ "$machine" == "HERA" ]]; then - export memory_vrfy="16384M" - fi elif [ $step = "metp" ]; then @@ -239,11 +217,6 @@ elif [ $step = "metp" ]; then export wtime_metp_gfs="06:00:00" export npe_metp_gfs=4 export npe_node_metp_gfs=4 - if [[ "$machine" == "WCOSS_C" ]]; then - export memory_metp="3072M" - elif [[ "$machine" == "THEIA" ]]; then - export memory_metp="16384M" - fi elif [ $step = "echgres" ]; then @@ -265,19 +238,9 @@ elif [ $step = "eobs" -o $step = "eomg" ]; then export wtime_eobs="00:10:00" export wtime_eomg="01:00:00" - if [ $CASE = "C768" ]; then - export npe_eobs=480 - elif [ $CASE = "C384" ]; then - export npe_eobs=42 - elif [ $CASE = "C192" ]; then - export npe_eobs=28 - elif [ $CASE = "C96" -o $CASE = "C48" ]; then - export npe_eobs=14 - fi - export nth_eobs=2 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_eobs=7; fi + export npe_eobs=480 + export nth_eobs=7 export npe_node_eobs=$(echo "$npe_node_max / $nth_eobs" | bc) - if [[ "$machine" == "WCOSS_C" ]]; then export memory_eobs="3072M"; fi elif [ $step = "ediag" ]; then @@ -285,46 +248,21 @@ elif [ $step = "ediag" ]; then export npe_ediag=56 export nth_ediag=1 export npe_node_ediag=$npe_node_max - if [[ "$machine" == "WCOSS_C" ]]; then export memory_ediag="3072M"; fi elif [ $step = "eupd" ]; then export wtime_eupd="00:30:00" - if [ $CASE = "C768" ]; then - export npe_eupd=960 - export nth_eupd=6 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then - export nth_eupd=7 - fi - elif [ $CASE = "C384" ]; then - export npe_eupd=270 - export nth_eupd=2 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then - export nth_eupd=9 - fi - if [[ "$machine" = "HERA" ]]; then - export npe_eupd=84 - export nth_eupd=10 - fi - elif [ $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then - export npe_eupd=42 - export nth_eupd=2 - fi + export npe_eupd=960 + export nth_eupd=7 export npe_node_eupd=$(echo "$npe_node_max / $nth_eupd" | bc) - if [[ "$machine" == "WCOSS_C" ]]; then - export memory_eupd="3072M" - fi elif [ $step = "ecen" ]; then export wtime_ecen="00:10:00" export npe_ecen=80 - export nth_ecen=6 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_ecen=7; fi - if [ $CASE = "C384" -o $CASE = "C192" -o $CASE = "C96" -o $CASE = "C48" ]; then export nth_ecen=2; fi + export nth_ecen=7 export npe_node_ecen=$(echo "$npe_node_max / $nth_ecen" | bc) export nth_cycle=$nth_ecen - if [[ "$machine" == "WCOSS_C" ]]; then export memory_ecen="3072M"; fi elif [ $step = "esfc" ]; then @@ -333,7 +271,6 @@ elif [ $step = "esfc" ]; then export npe_node_esfc=$npe_node_max export nth_esfc=1 export nth_cycle=$nth_esfc - if [[ "$machine" == "WCOSS_C" ]]; then export memory_esfc="3072M"; fi elif [ $step = "efcs" ]; then @@ -341,16 +278,13 @@ elif [ $step = "efcs" ]; then export npe_efcs=$(echo "$layout_x * $layout_y * 6" | bc) export nth_efcs=${nth_fv3:-2} export npe_node_efcs=$(echo "$npe_node_max / $nth_efcs" | bc) - if [[ "$machine" == "WCOSS_C" ]]; then export memory_efcs="254M"; fi elif [ $step = "epos" ]; then export wtime_epos="00:15:00" export npe_epos=80 - export nth_epos=6 - if [[ "$machine" = "WCOSS_DELL_P3" ]]; then export nth_epos=7; fi + export nth_epos=7 export npe_node_epos=$(echo "$npe_node_max / $nth_epos" | bc) - if [[ "$machine" == "WCOSS_C" ]]; then export memory_epos="254M"; fi elif [ $step = "postsnd" ]; then @@ -364,21 +298,13 @@ elif [ $step = "postsnd" ]; then export npe_postsnd=13 export npe_node_postsnd=4 fi - if [[ "$machine" = "HERA" ]]; then export npe_node_postsnd=2; fi - if [[ "$machine" == "WCOSS_C" ]]; then export memory_postsnd="254M"; fi elif [ $step = "awips" ]; then export wtime_awips="03:30:00" - export npe_awips=4 - export npe_node_awips=4 - export nth_awips=2 - if [[ "$machine" == "WCOSS_DELL_P3" ]]; then - export npe_awips=2 - export npe_node_awips=2 - export nth_awips=1 - fi - if [[ "$machine" == "WCOSS_C" ]]; then export memory_awips="2048M"; fi + export npe_awips=2 + export npe_node_awips=2 + export nth_awips=1 elif [ $step = "gempak" ]; then @@ -386,7 +312,6 @@ elif [ $step = "gempak" ]; then export npe_gempak=17 export npe_node_gempak=4 export nth_gempak=3 - if [[ "$machine" == "WCOSS_C" ]]; then export memory_gempak="254M"; fi else diff --git a/parm/config/config.wavepostbndpnt b/parm/config/config.wavepostbndpnt index 5ec96a697f..eb3bb72ef8 100755 --- a/parm/config/config.wavepostbndpnt +++ b/parm/config/config.wavepostbndpnt @@ -8,4 +8,7 @@ echo "BEGIN: config.wavepostbndpnt" # Get task specific resources . $EXPDIR/config.resources wavepostbndpnt +export FHMAX_WAV_IBP=180 +if [[ "$FHMAX_GFS" -lt "$FHMAX_WAV_IBP" ]] ; then export FHMAX_WAV_IBP=$FHMAX_GFS ; fi + echo "END: config.wavepostbndpnt" diff --git a/scripts/exgfs_wave_nawips.sh b/scripts/exgfs_wave_nawips.sh index 45a7e1873a..c4fa9e764d 100755 --- a/scripts/exgfs_wave_nawips.sh +++ b/scripts/exgfs_wave_nawips.sh @@ -51,7 +51,8 @@ while [ $fhcnt -le $FHMAX_WAV ]; do for grid in $grids;do case $grid in ao_9km) grdIDin='arctic.9km' - grdIDout='gfswaveao9km' ;; + #grdIDout='gfswaveao9km' ;; + grdIDout='gfswavearc' ;; at_10m) grdIDin='atlocn.0p16' grdIDout='gfswaveat10m' ;; ep_10m) grdIDin='epacif.0p16' @@ -61,9 +62,11 @@ while [ $fhcnt -le $FHMAX_WAV ]; do glo_30m) grdIDin='global.0p25' grdIDout='gfswavegl30m' ;; glo_10m) grdIDin='global.0p16' - grdIDout='gfswaveg16k' ;; + #grdIDout='gfswaveg16k' ;; + grdIDout='gfswavenh' ;; gso_15m) grdIDin='gsouth.0p25' - grdIDout='gfswaves25k' ;; + #grdIDout='gfswaves25k' ;; + grdIDout='gfswavesh' ;; *) gridIDin= grdIDout= ;; esac diff --git a/scripts/exgfs_wave_post_bndpnt.sh b/scripts/exgfs_wave_post_bndpnt.sh index 17a1376af9..0851f6fb52 100755 --- a/scripts/exgfs_wave_post_bndpnt.sh +++ b/scripts/exgfs_wave_post_bndpnt.sh @@ -41,7 +41,7 @@ # Set wave model ID tag to include member number # if ensemble; waveMEMB var empty in deterministic export WAV_MOD_TAG=${CDUMP}wave${waveMEMB} - FHMAX_WAV_IBP=180 + FHMAX_WAV_IBP=${FHMAX_WAV_IBP:-180} postmsg "$jlogfile" "HAS BEGUN on `hostname`" diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt new file mode 100644 index 0000000000..bdcafdc088 --- /dev/null +++ b/sorc/CMakeLists.txt @@ -0,0 +1,72 @@ +cmake_minimum_required(VERSION 3.15) + +# Get the version from the VERSION file. +#file(STRINGS "VERSION" pVersion) +set(pVersion 1.0.0) + +project( + workflow_utils + VERSION ${pVersion} + LANGUAGES Fortran) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +include(GNUInstallDirs) + +# User options. +option(OPENMP "use OpenMP threading" ON) + +# Build type +if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$") + message(STATUS "Setting build type to 'Release' as none was specified.") + set(CMAKE_BUILD_TYPE + "Release" + CACHE STRING "Choose the type of build." FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" + "MinSizeRel" "RelWithDebInfo") +endif() + +# Set compiler flags. +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback") + set(CMAKE_Fortran_FLAGS_RELEASE "-O3") + set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace") + set(CMAKE_Fortran_FLAGS_RELEASE "-O3") + set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -ggdb -fno-unsafe-math-optimizations -frounding-math -fsignaling-nans -ffpe-trap=invalid,zero,overflow -fbounds-check") +endif() + +# Find packages. +find_package(MPI REQUIRED) +find_package(NetCDF REQUIRED Fortran) + +if(OPENMP) + find_package(OpenMP REQUIRED COMPONENTS Fortran) +endif() + +find_package(bacio REQUIRED) +find_package(w3nco REQUIRED) +find_package(w3emc REQUIRED) +find_package(sp REQUIRED) +find_package(ip REQUIRED) +find_package(ncio REQUIRED) +find_package(nemsio REQUIRED) +find_package(nemsiogfs REQUIRED) +find_package(sigio REQUIRED) +find_package(g2 REQUIRED) +find_package(bufr REQUIRED) + +add_subdirectory(enkf_chgres_recenter.fd) +add_subdirectory(enkf_chgres_recenter_nc.fd) +add_subdirectory(fv3nc2nemsio.fd) +add_subdirectory(regrid_nemsio.fd) +add_subdirectory(gaussian_sfcanl.fd) +add_subdirectory(gfs_bufr.fd) +add_subdirectory(tocsbufr.fd) +add_subdirectory(fbwndgfs.fd) +add_subdirectory(vint.fd) +add_subdirectory(tave.fd) +add_subdirectory(syndat_qctropcy.fd) +add_subdirectory(syndat_maksynrc.fd) +add_subdirectory(syndat_getjtbul.fd) +add_subdirectory(supvit.fd) diff --git a/sorc/build_all.sh b/sorc/build_all.sh index 4f8cfae730..9f0a12c064 100755 --- a/sorc/build_all.sh +++ b/sorc/build_all.sh @@ -266,6 +266,20 @@ fi ((err+=$rc)) } +#------------------------------------ +# build workflow_utils +#------------------------------------ +$Build_workflow_utils && { +echo " .... Building workflow_utils .... " +target=$target ./build_workflow_utils.sh > $logs_dir/build_workflow_utils.log 2>&1 +rc=$? +if [[ $rc -ne 0 ]] ; then + echo "Fatal error in building workflow_utils." + echo "The log file is in $logs_dir/build_workflow_utils.log" +fi +((err+=$rc)) +} + #------------------------------------ # build gfs_util #------------------------------------ diff --git a/sorc/build_workflow_utils.sh b/sorc/build_workflow_utils.sh new file mode 100755 index 0000000000..06739fd262 --- /dev/null +++ b/sorc/build_workflow_utils.sh @@ -0,0 +1,48 @@ +#!/bin/bash +set -eux + +[[ $(uname -s) == Darwin ]] && cmd=$(which greadlink) || cmd=$(which readlink) +readonly UTILS_DIR=$(cd "$(dirname "$($cmd -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P) + +# Adapt for global-workflow structure. +target=${target:-"NULL"} +modulefile=${UTILS_DIR}/../modulefiles/workflow_utils.$target +if [[ -f $modulefile ]]; then + set +x + source ${UTILS_DIR}/machine-setup.sh > /dev/null 2>&1 + source $modulefile + module list + set -x +fi +# End adaptation + +# Begin hack +# In place until nceplibs-ncio is in hpc-stack and available as a module +# After nceplibs-ncio is in hpc-stack, add the following line to +# ${UTILS_DIR}/../modulefiles/workflow_utils. +# "module load ncio/" +# and remove this hack + +[[ -d nceplibs-ncio ]] && rm -rf nceplibs-ncio +git clone -b develop https://github.com/noaa-emc/nceplibs-ncio +cd nceplibs-ncio +mkdir -p build && cd build +cmake -DCMAKE_INSTALL_PREFIX=../install .. +make -j ${BUILD_JOBS:-4} VERBOSE=${BUILD_VERBOSE:-} +make install +cd ../.. +export ncio_ROOT=$PWD/nceplibs-ncio/install +# End hack + +BUILD_DIR=${BUILD_DIR:-${UTILS_DIR}/build} +[[ -d $BUILD_DIR ]] && rm -rf $BUILD_DIR +mkdir -p ${BUILD_DIR} +cd $BUILD_DIR + +INSTALL_DIR=${INSTALL_DIR:-${UTILS_DIR}/install} + +CMAKE_FLAGS+=" -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR" + +cmake ${UTILS_DIR} ${CMAKE_FLAGS} +make -j ${BUILD_JOBS:-4} VERBOSE=${BUILD_VERBOSE:-} +make install diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 79ade445ff..2ac8445b0c 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -104,7 +104,7 @@ if [[ ! -d gfs_wafs.fd ]] ; then rm -f ${topdir}/checkout-gfs_wafs.log git clone --recursive https://github.com/NOAA-EMC/EMC_gfs_wafs.git gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1 cd gfs_wafs.fd - git checkout gfs_wafs.v6.0.18 + git checkout gfs_wafs.v6.0.19 cd ${topdir} else echo 'Skip. Directory gfs_wafs.fd already exists.' @@ -115,7 +115,7 @@ if [[ ! -d verif-global.fd ]] ; then rm -f ${topdir}/checkout-verif-global.log git clone --recursive https://github.com/NOAA-EMC/EMC_verif-global.git verif-global.fd >> ${topdir}/checkout-verif-global.log 2>&1 cd verif-global.fd - git checkout verif_global_v1.13.2 + git checkout verif_global_v1.13.5 cd ${topdir} else echo 'Skip. Directory verif-global.fd already exist.' diff --git a/sorc/cmake/FindNetCDF.cmake b/sorc/cmake/FindNetCDF.cmake new file mode 100644 index 0000000000..9e32378ff5 --- /dev/null +++ b/sorc/cmake/FindNetCDF.cmake @@ -0,0 +1,347 @@ +# (C) Copyright 2011- ECMWF. +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. +# In applying this licence, ECMWF does not waive the privileges and immunities +# granted to it by virtue of its status as an intergovernmental organisation nor +# does it submit to any jurisdiction. + +# Try to find NetCDF includes and library. +# Supports static and shared libaries and allows each component to be found in sepearte prefixes. +# +# This module defines +# +# - NetCDF_FOUND - System has NetCDF +# - NetCDF_INCLUDE_DIRS - the NetCDF include directories +# - NetCDF_VERSION - the version of NetCDF +# - NetCDF_CONFIG_EXECUTABLE - the netcdf-config executable if found +# - NetCDF_PARALLEL - Boolean True if NetCDF4 has parallel IO support via hdf5 and/or pnetcdf +# - NetCDF_HAS_PNETCDF - Boolean True if NetCDF4 has pnetcdf support +# +# Deprecated Defines +# - NetCDF_LIBRARIES - [Deprecated] Use NetCDF::NetCDF_ targets instead. +# +# +# Following components are available: +# +# - C - C interface to NetCDF (netcdf) +# - CXX - CXX4 interface to NetCDF (netcdf_c++4) +# - Fortran - Fortran interface to NetCDF (netcdff) +# +# For each component the following are defined: +# +# - NetCDF__FOUND - whether the component is found +# - NetCDF__LIBRARIES - the libraries for the component +# - NetCDF__LIBRARY_SHARED - Boolean is true if libraries for component are shared +# - NetCDF__INCLUDE_DIRS - the include directories for specified component +# - NetCDF::NetCDF_ - target of component to be used with target_link_libraries() +# +# The following paths will be searched in order if set in CMake (first priority) or environment (second priority) +# +# - NetCDF_ROOT - root of NetCDF installation +# - NetCDF_PATH - root of NetCDF installation +# +# The search process begins with locating NetCDF Include headers. If these are in a non-standard location, +# set one of the following CMake or environment variables to point to the location: +# +# - NetCDF_INCLUDE_DIR or NetCDF_${comp}_INCLUDE_DIR +# - NetCDF_INCLUDE_DIRS or NetCDF_${comp}_INCLUDE_DIR +# +# Notes: +# +# - Use "NetCDF::NetCDF_" targets only. NetCDF_LIBRARIES exists for backwards compatibility and should not be used. +# - These targets have all the knowledge of include directories and library search directories, and a single +# call to target_link_libraries will provide all these transitive properties to your target. Normally all that is +# needed to build and link against NetCDF is, e.g.: +# target_link_libraries(my_c_tgt PUBLIC NetCDF::NetCDF_C) +# - "NetCDF" is always the preferred naming for this package, its targets, variables, and environment variables +# - For compatibility, some variables are also set/checked using alternate names NetCDF4, NETCDF, or NETCDF4 +# - Environments relying on these older environment variable names should move to using a "NetCDF_ROOT" environment variable +# - Preferred component capitalization follows the CMake LANGUAGES variables: i.e., C, Fortran, CXX +# - For compatibility, alternate capitalizations are supported but should not be used. +# - If no components are defined, all components will be searched +# + +list( APPEND _possible_components C CXX Fortran ) + +## Include names for each component +set( NetCDF_C_INCLUDE_NAME netcdf.h ) +set( NetCDF_CXX_INCLUDE_NAME netcdf ) +set( NetCDF_Fortran_INCLUDE_NAME netcdf.mod ) + +## Library names for each component +set( NetCDF_C_LIBRARY_NAME netcdf ) +set( NetCDF_CXX_LIBRARY_NAME netcdf_c++4 ) +set( NetCDF_Fortran_LIBRARY_NAME netcdff ) + +## Enumerate search components +foreach( _comp ${_possible_components} ) + string( TOUPPER "${_comp}" _COMP ) + set( _arg_${_COMP} ${_comp} ) + set( _name_${_COMP} ${_comp} ) +endforeach() + +set( _search_components C) +foreach( _comp ${${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS} ) + string( TOUPPER "${_comp}" _COMP ) + set( _arg_${_COMP} ${_comp} ) + list( APPEND _search_components ${_name_${_COMP}} ) + if( NOT _name_${_COMP} ) + message(SEND_ERROR "Find${CMAKE_FIND_PACKAGE_NAME}: COMPONENT ${_comp} is not a valid component. Valid components: ${_possible_components}" ) + endif() +endforeach() +list( REMOVE_DUPLICATES _search_components ) + +## Search hints for finding include directories and libraries +foreach( _comp IN ITEMS "_" "_C_" "_Fortran_" "_CXX_" ) + foreach( _name IN ITEMS NetCDF4 NetCDF NETCDF4 NETCDF ) + foreach( _var IN ITEMS ROOT PATH ) + list(APPEND _search_hints ${${_name}${_comp}${_var}} $ENV{${_name}${_comp}${_var}} ) + list(APPEND _include_search_hints + ${${_name}${_comp}INCLUDE_DIR} $ENV{${_name}${_comp}INCLUDE_DIR} + ${${_name}${_comp}INCLUDE_DIRS} $ENV{${_name}${_comp}INCLUDE_DIRS} ) + endforeach() + endforeach() +endforeach() +#Old-school HPC module env variable names +foreach( _name IN ITEMS NetCDF4 NetCDF NETCDF4 NETCDF ) + foreach( _comp IN ITEMS "_C" "_Fortran" "_CXX" ) + list(APPEND _search_hints ${${_name}} $ENV{${_name}}) + list(APPEND _search_hints ${${_name}${_comp}} $ENV{${_name}${_comp}}) + endforeach() +endforeach() + +## Find headers for each component +set(NetCDF_INCLUDE_DIRS) +set(_new_search_components) +foreach( _comp IN LISTS _search_components ) + if(NOT ${PROJECT_NAME}_NetCDF_${_comp}_FOUND) + list(APPEND _new_search_components ${_comp}) + endif() + find_file(NetCDF_${_comp}_INCLUDE_FILE + NAMES ${NetCDF_${_comp}_INCLUDE_NAME} + DOC "NetCDF ${_comp} include directory" + HINTS ${_include_search_hints} ${_search_hints} + PATH_SUFFIXES include include/netcdf + ) + mark_as_advanced(NetCDF_${_comp}_INCLUDE_FILE) + message(DEBUG "NetCDF_${_comp}_INCLUDE_FILE: ${NetCDF_${_comp}_INCLUDE_FILE}") + if( NetCDF_${_comp}_INCLUDE_FILE ) + get_filename_component(NetCDF_${_comp}_INCLUDE_FILE ${NetCDF_${_comp}_INCLUDE_FILE} ABSOLUTE) + get_filename_component(NetCDF_${_comp}_INCLUDE_DIR ${NetCDF_${_comp}_INCLUDE_FILE} DIRECTORY) + list(APPEND NetCDF_INCLUDE_DIRS ${NetCDF_${_comp}_INCLUDE_DIR}) + endif() +endforeach() +if(NetCDF_INCLUDE_DIRS) + list(REMOVE_DUPLICATES NetCDF_INCLUDE_DIRS) +endif() +set(NetCDF_INCLUDE_DIRS "${NetCDF_INCLUDE_DIRS}" CACHE STRING "NetCDF Include directory paths" FORCE) + +## Find n*-config executables for search components +foreach( _comp IN LISTS _search_components ) + if( _comp MATCHES "^(C)$" ) + set(_conf "c") + elseif( _comp MATCHES "^(Fortran)$" ) + set(_conf "f") + elseif( _comp MATCHES "^(CXX)$" ) + set(_conf "cxx4") + endif() + find_program( NetCDF_${_comp}_CONFIG_EXECUTABLE + NAMES n${_conf}-config + HINTS ${NetCDF_INCLUDE_DIRS} ${_include_search_hints} ${_search_hints} + PATH_SUFFIXES bin Bin ../bin ../../bin + DOC "NetCDF n${_conf}-config helper" ) + message(DEBUG "NetCDF_${_comp}_CONFIG_EXECUTABLE: ${NetCDF_${_comp}_CONFIG_EXECUTABLE}") +endforeach() + +set(_C_libs_flag --libs) +set(_Fortran_libs_flag --flibs) +set(_CXX_libs_flag --libs) +set(_C_includes_flag --includedir) +set(_Fortran_includes_flag --includedir) +set(_CXX_includes_flag --includedir) +function(netcdf_config exec flag output_var) + set(${output_var} False PARENT_SCOPE) + if( exec ) + execute_process( COMMAND ${exec} ${flag} RESULT_VARIABLE _ret OUTPUT_VARIABLE _val) + if( _ret EQUAL 0 ) + string( STRIP ${_val} _val ) + set( ${output_var} ${_val} PARENT_SCOPE ) + endif() + endif() +endfunction() + +## Detect additional package properties +netcdf_config(${NetCDF_C_CONFIG_EXECUTABLE} --has-parallel4 _val) +if( NOT _val MATCHES "^(yes|no)$" ) + netcdf_config(${NetCDF_C_CONFIG_EXECUTABLE} --has-parallel _val) +endif() +if( _val MATCHES "^(yes)$" ) + set(NetCDF_PARALLEL TRUE CACHE STRING "NetCDF has parallel IO capability via pnetcdf or hdf5." FORCE) +else() + set(NetCDF_PARALLEL FALSE CACHE STRING "NetCDF has no parallel IO capability." FORCE) +endif() + +if(NetCDF_PARALLEL) + find_package(MPI REQUIRED) +endif() + +## Find libraries for each component +set( NetCDF_LIBRARIES ) +foreach( _comp IN LISTS _search_components ) + string( TOUPPER "${_comp}" _COMP ) + + find_library( NetCDF_${_comp}_LIBRARY + NAMES ${NetCDF_${_comp}_LIBRARY_NAME} + DOC "NetCDF ${_comp} library" + HINTS ${NetCDF_${_comp}_INCLUDE_DIRS} ${_search_hints} + PATH_SUFFIXES lib64 lib ../lib64 ../lib ../../lib64 ../../lib ) + mark_as_advanced( NetCDF_${_comp}_LIBRARY ) + get_filename_component(NetCDF_${_comp}_LIBRARY ${NetCDF_${_comp}_LIBRARY} ABSOLUTE) + set(NetCDF_${_comp}_LIBRARY ${NetCDF_${_comp}_LIBRARY} CACHE STRING "NetCDF ${_comp} library" FORCE) + message(DEBUG "NetCDF_${_comp}_LIBRARY: ${NetCDF_${_comp}_LIBRARY}") + + if( NetCDF_${_comp}_LIBRARY ) + if( NetCDF_${_comp}_LIBRARY MATCHES ".a$" ) + set( NetCDF_${_comp}_LIBRARY_SHARED FALSE ) + set( _library_type STATIC) + else() + list( APPEND NetCDF_LIBRARIES ${NetCDF_${_comp}_LIBRARY} ) + set( NetCDF_${_comp}_LIBRARY_SHARED TRUE ) + set( _library_type SHARED) + endif() + endif() + + #Use nc-config to set per-component LIBRARIES variable if possible + netcdf_config( ${NetCDF_${_comp}_CONFIG_EXECUTABLE} ${_${_comp}_libs_flag} _val ) + if( _val ) + set( NetCDF_${_comp}_LIBRARIES ${_val} ) + if(NOT NetCDF_${_comp}_LIBRARY_SHARED AND NOT NetCDF_${_comp}_FOUND) #Static targets should use nc_config to get a proper link line with all necessary static targets. + list( APPEND NetCDF_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} ) + endif() + else() + set( NetCDF_${_comp}_LIBRARIES ${NetCDF_${_comp}_LIBRARY} ) + if(NOT NetCDF_${_comp}_LIBRARY_SHARED) + message(SEND_ERROR "Unable to properly find NetCDF. Found static libraries at: ${NetCDF_${_comp}_LIBRARY} but could not run nc-config: ${NetCDF_CONFIG_EXECUTABLE}") + endif() + endif() + + #Use nc-config to set per-component INCLUDE_DIRS variable if possible + netcdf_config( ${NetCDF_${_comp}_CONFIG_EXECUTABLE} ${_${_comp}_includes_flag} _val ) + if( _val ) + string( REPLACE " " ";" _val ${_val} ) + set( NetCDF_${_comp}_INCLUDE_DIRS ${_val} ) + else() + set( NetCDF_${_comp}_INCLUDE_DIRS ${NetCDF_${_comp}_INCLUDE_DIR} ) + endif() + + if( NetCDF_${_comp}_LIBRARIES AND NetCDF_${_comp}_INCLUDE_DIRS ) + set( ${CMAKE_FIND_PACKAGE_NAME}_${_arg_${_COMP}}_FOUND TRUE ) + if (NOT TARGET NetCDF::NetCDF_${_comp}) + add_library(NetCDF::NetCDF_${_comp} ${_library_type} IMPORTED) + set_target_properties(NetCDF::NetCDF_${_comp} PROPERTIES + IMPORTED_LOCATION ${NetCDF_${_comp}_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES "${NetCDF_${_comp}_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} ) + if( NOT _comp MATCHES "^(C)$" ) + target_link_libraries(NetCDF::NetCDF_${_comp} INTERFACE NetCDF::NetCDF_C) + endif() + if(MPI_${_comp}_FOUND) + target_link_libraries(NetCDF::NetCDF_${_comp} INTERFACE MPI::MPI_${_comp}) + endif() + endif() + endif() +endforeach() +if(NetCDF_LIBRARIES AND NetCDF_${_comp}_LIBRARY_SHARED) + list(REMOVE_DUPLICATES NetCDF_LIBRARIES) +endif() +set(NetCDF_LIBRARIES "${NetCDF_LIBRARIES}" CACHE STRING "NetCDF library targets" FORCE) + +## Find version via netcdf-config if possible +if (NetCDF_INCLUDE_DIRS) + if( NetCDF_C_CONFIG_EXECUTABLE ) + netcdf_config( ${NetCDF_C_CONFIG_EXECUTABLE} --version _vers ) + if( _vers ) + string(REGEX REPLACE ".* ((([0-9]+)\\.)+([0-9]+)).*" "\\1" NetCDF_VERSION "${_vers}" ) + endif() + else() + foreach( _dir IN LISTS NetCDF_INCLUDE_DIRS) + if( EXISTS "${_dir}/netcdf_meta.h" ) + file(STRINGS "${_dir}/netcdf_meta.h" _netcdf_version_lines + REGEX "#define[ \t]+NC_VERSION_(MAJOR|MINOR|PATCH|NOTE)") + string(REGEX REPLACE ".*NC_VERSION_MAJOR *\([0-9]*\).*" "\\1" _netcdf_version_major "${_netcdf_version_lines}") + string(REGEX REPLACE ".*NC_VERSION_MINOR *\([0-9]*\).*" "\\1" _netcdf_version_minor "${_netcdf_version_lines}") + string(REGEX REPLACE ".*NC_VERSION_PATCH *\([0-9]*\).*" "\\1" _netcdf_version_patch "${_netcdf_version_lines}") + string(REGEX REPLACE ".*NC_VERSION_NOTE *\"\([^\"]*\)\".*" "\\1" _netcdf_version_note "${_netcdf_version_lines}") + set(NetCDF_VERSION "${_netcdf_version_major}.${_netcdf_version_minor}.${_netcdf_version_patch}${_netcdf_version_note}") + unset(_netcdf_version_major) + unset(_netcdf_version_minor) + unset(_netcdf_version_patch) + unset(_netcdf_version_note) + unset(_netcdf_version_lines) + endif() + endforeach() + endif() +endif () + +## Finalize find_package +include(FindPackageHandleStandardArgs) + +if(NOT NetCDF_FOUND OR _new_search_components) + find_package_handle_standard_args( ${CMAKE_FIND_PACKAGE_NAME} + REQUIRED_VARS NetCDF_INCLUDE_DIRS NetCDF_LIBRARIES + VERSION_VAR NetCDF_VERSION + HANDLE_COMPONENTS ) +endif() + +foreach( _comp IN LISTS _search_components ) + if( NetCDF_${_comp}_FOUND ) + #Record found components to avoid duplication in NetCDF_LIBRARIES for static libraries + set(NetCDF_${_comp}_FOUND ${NetCDF_${_comp}_FOUND} CACHE BOOL "NetCDF ${_comp} Found" FORCE) + #Set a per-package, per-component found variable to communicate between multiple calls to find_package() + set(${PROJECT_NAME}_NetCDF_${_comp}_FOUND True) + endif() +endforeach() + +if( ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY AND _new_search_components) + message( STATUS "Find${CMAKE_FIND_PACKAGE_NAME} defines targets:" ) + message( STATUS " - NetCDF_VERSION [${NetCDF_VERSION}]") + message( STATUS " - NetCDF_PARALLEL [${NetCDF_PARALLEL}]") + foreach( _comp IN LISTS _new_search_components ) + string( TOUPPER "${_comp}" _COMP ) + message( STATUS " - NetCDF_${_comp}_CONFIG_EXECUTABLE [${NetCDF_${_comp}_CONFIG_EXECUTABLE}]") + if( ${CMAKE_FIND_PACKAGE_NAME}_${_arg_${_COMP}}_FOUND ) + get_filename_component(_root ${NetCDF_${_comp}_INCLUDE_DIR}/.. ABSOLUTE) + if( NetCDF_${_comp}_LIBRARY_SHARED ) + message( STATUS " - NetCDF::NetCDF_${_comp} [SHARED] [Root: ${_root}] Lib: ${NetCDF_${_comp}_LIBRARY} ") + else() + message( STATUS " - NetCDF::NetCDF_${_comp} [STATIC] [Root: ${_root}] Lib: ${NetCDF_${_comp}_LIBRARY} ") + endif() + endif() + endforeach() +endif() + +foreach( _prefix NetCDF NetCDF4 NETCDF NETCDF4 ${CMAKE_FIND_PACKAGE_NAME} ) + set( ${_prefix}_INCLUDE_DIRS ${NetCDF_INCLUDE_DIRS} ) + set( ${_prefix}_LIBRARIES ${NetCDF_LIBRARIES}) + set( ${_prefix}_VERSION ${NetCDF_VERSION} ) + set( ${_prefix}_FOUND ${${CMAKE_FIND_PACKAGE_NAME}_FOUND} ) + set( ${_prefix}_CONFIG_EXECUTABLE ${NetCDF_CONFIG_EXECUTABLE} ) + set( ${_prefix}_PARALLEL ${NetCDF_PARALLEL} ) + + foreach( _comp ${_search_components} ) + string( TOUPPER "${_comp}" _COMP ) + set( _arg_comp ${_arg_${_COMP}} ) + set( ${_prefix}_${_comp}_FOUND ${${CMAKE_FIND_PACKAGE_NAME}_${_arg_comp}_FOUND} ) + set( ${_prefix}_${_COMP}_FOUND ${${CMAKE_FIND_PACKAGE_NAME}_${_arg_comp}_FOUND} ) + set( ${_prefix}_${_arg_comp}_FOUND ${${CMAKE_FIND_PACKAGE_NAME}_${_arg_comp}_FOUND} ) + + set( ${_prefix}_${_comp}_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} ) + set( ${_prefix}_${_COMP}_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} ) + set( ${_prefix}_${_arg_comp}_LIBRARIES ${NetCDF_${_comp}_LIBRARIES} ) + + set( ${_prefix}_${_comp}_INCLUDE_DIRS ${NetCDF_${_comp}_INCLUDE_DIRS} ) + set( ${_prefix}_${_COMP}_INCLUDE_DIRS ${NetCDF_${_comp}_INCLUDE_DIRS} ) + set( ${_prefix}_${_arg_comp}_INCLUDE_DIRS ${NetCDF_${_comp}_INCLUDE_DIRS} ) + endforeach() +endforeach() diff --git a/sorc/enkf_chgres_recenter.fd/CMakeLists.txt b/sorc/enkf_chgres_recenter.fd/CMakeLists.txt new file mode 100644 index 0000000000..36389b8d52 --- /dev/null +++ b/sorc/enkf_chgres_recenter.fd/CMakeLists.txt @@ -0,0 +1,29 @@ +list(APPEND fortran_src +driver.f90 +input_data.f90 +interp.f90 +output_data.f90 +setup.f90 +utils.f90 +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i4 -fp-model precise") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") +endif() + +set(exe_name enkf_chgres_recenter.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + nemsio::nemsio + bacio::bacio_4 + ip::ip_d + sp::sp_d + w3nco::w3nco_d) +if(OpenMP_Fortran_FOUND) + target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran) +endif() + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/enkf_chgres_recenter_nc.fd/CMakeLists.txt b/sorc/enkf_chgres_recenter_nc.fd/CMakeLists.txt new file mode 100644 index 0000000000..79375e345f --- /dev/null +++ b/sorc/enkf_chgres_recenter_nc.fd/CMakeLists.txt @@ -0,0 +1,28 @@ +list(APPEND fortran_src +driver.f90 +input_data.f90 +interp.f90 +output_data.f90 +setup.f90 +utils.f90 +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model precise") +endif() + +set(exe_name enkf_chgres_recenter_nc.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + bacio::bacio_4 + ip::ip_4 + sp::sp_4 + w3nco::w3nco_4 + ncio::ncio + NetCDF::NetCDF_Fortran) +if(OpenMP_Fortran_FOUND) + target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran) +endif() + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/enkf_chgres_recenter_nc.fd/input_data.f90 b/sorc/enkf_chgres_recenter_nc.fd/input_data.f90 index 609aed05a6..b77fe26b3e 100644 --- a/sorc/enkf_chgres_recenter_nc.fd/input_data.f90 +++ b/sorc/enkf_chgres_recenter_nc.fd/input_data.f90 @@ -2,7 +2,7 @@ module input_data use utils use setup - use module_fv3gfs_ncio + use module_ncio implicit none @@ -23,7 +23,7 @@ module input_data real, allocatable, public :: clwmr_input(:,:) real, allocatable, public :: dzdt_input(:,:) real, allocatable, public :: grle_input(:,:) - real, allocatable, public :: cldamt_input(:,:) + real, allocatable, public :: cldamt_input(:,:) real, allocatable, public :: hgt_input(:) real, allocatable, public :: icmr_input(:,:) real, allocatable, public :: o3mr_input(:,:) @@ -80,7 +80,7 @@ subroutine read_input_data call read_attribute(indset, 'ak', ak) call read_attribute(indset, 'bk', bk) - + nvcoord_input = 2 allocate(vcoord_input(lev+1,nvcoord_input)) do k = 1, lev+1 @@ -114,7 +114,7 @@ subroutine read_input_data call read_vardata(indset, 'ugrd', work3d) do vlev = 1, lev rvlev = lev+1-vlev - ugrd_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + ugrd_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN U WIND AT LEVEL ',vlev, "IS: ", maxval(ugrd_input(:,vlev)), minval(ugrd_input(:,vlev)) enddo @@ -124,7 +124,7 @@ subroutine read_input_data call read_vardata(indset, 'vgrd', work3d) do vlev = 1, lev rvlev = lev+1-vlev - vgrd_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + vgrd_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN V WIND AT LEVEL ', vlev, "IS: ", maxval(vgrd_input(:,vlev)), minval(vgrd_input(:,vlev)) enddo @@ -134,7 +134,7 @@ subroutine read_input_data call read_vardata(indset, 'tmp', work3d) do vlev = 1, lev rvlev = lev+1-vlev - tmp_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + tmp_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN TEMPERATURE AT LEVEL ', vlev, 'IS: ', maxval(tmp_input(:,vlev)), minval(tmp_input(:,vlev)) enddo @@ -144,7 +144,7 @@ subroutine read_input_data call read_vardata(indset, 'spfh', work3d) do vlev = 1, lev rvlev = lev+1-vlev - spfh_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + spfh_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN SPECIFIC HUMIDITY AT LEVEL ', vlev, 'IS: ', maxval(spfh_input(:,vlev)), minval(spfh_input(:,vlev)) enddo @@ -154,7 +154,7 @@ subroutine read_input_data call read_vardata(indset, 'clwmr', work3d) do vlev = 1, lev rvlev = lev+1-vlev - clwmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + clwmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN CLOUD LIQUID WATER AT LEVEL ', vlev, 'IS: ', maxval(clwmr_input(:,vlev)), minval(clwmr_input(:,vlev)) enddo @@ -182,7 +182,7 @@ subroutine read_input_data else dzdt_input = missing_value print*,'DZDT NOT IN INPUT FILE' - idzdt = 0 + idzdt = 0 endif @@ -200,7 +200,7 @@ subroutine read_input_data else rwmr_input = missing_value print*,'RWMR NOT IN INPUT FILE' - irwmr = 0 + irwmr = 0 endif print* @@ -210,14 +210,14 @@ subroutine read_input_data if (iret == 0) then do vlev = 1, lev rvlev = lev+1-vlev - icmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + icmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN ICMR AT LEVEL ', vlev, 'IS: ', maxval(icmr_input(:,vlev)), minval(icmr_input(:,vlev)) enddo iicmr = 1 else icmr_input = missing_value print*,'ICMR NOT IN INPUT FILE' - iicmr = 0 + iicmr = 0 endif print* @@ -227,14 +227,14 @@ subroutine read_input_data if (iret == 0) then do vlev = 1, lev rvlev = lev+1-vlev - snmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + snmr_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN SNMR AT LEVEL ', vlev, 'IS: ', maxval(snmr_input(:,vlev)), minval(snmr_input(:,vlev)) enddo isnmr = 1 else snmr_input = missing_value print*,'SNMR NOT IN INPUT FILE' - isnmr = 0 + isnmr = 0 endif print* @@ -244,14 +244,14 @@ subroutine read_input_data if (iret == 0) then do vlev = 1, lev rvlev = lev+1-vlev - grle_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) + grle_input(:,vlev) = reshape(work3d(:,:,rvlev),(/ij_input/)) print*,'MAX/MIN GRLE AT LEVEL ', vlev, 'IS: ', maxval(grle_input(:,vlev)), minval(grle_input(:,vlev)) enddo igrle = 1 else grle_input = missing_value print*,'GRLE NOT IN INPUT FILE' - igrle = 0 + igrle = 0 endif print* @@ -269,12 +269,12 @@ subroutine read_input_data else cldamt_input = missing_value print*,'CLDAMT NOT IN INPUT FILE' - icldamt = 0 + icldamt = 0 endif else cldamt_input = missing_value print*,'CLDAMT NOT READ - CLD_AMT NAMELIST OPTION NOT SET TO TRUE' - icldamt = 0 + icldamt = 0 end if call read_vardata(indset, 'dpres', work3d, errcode=iret) @@ -325,7 +325,7 @@ subroutine read_vcoord_info call read_attribute(refdset, 'ak', ak) call read_attribute(refdset, 'bk', bk) call close_dataset(refdset) - + lev_output = size(bk) - 1 nvcoord=2 diff --git a/sorc/enkf_chgres_recenter_nc.fd/output_data.f90 b/sorc/enkf_chgres_recenter_nc.fd/output_data.f90 index 17766d23c0..00b39fc7c8 100644 --- a/sorc/enkf_chgres_recenter_nc.fd/output_data.f90 +++ b/sorc/enkf_chgres_recenter_nc.fd/output_data.f90 @@ -1,6 +1,6 @@ module output_data - use module_fv3gfs_ncio + use module_ncio implicit none @@ -81,7 +81,7 @@ subroutine set_output_grid print*,"READ SURFACE HEIGHT" call read_vardata(indset, 'hgtsfc', work2d) - hgt_external_output = reshape(work2d,(/ij_output/)) + hgt_external_output = reshape(work2d,(/ij_output/)) call close_dataset(indset) diff --git a/sorc/fbwndgfs.fd/CMakeLists.txt b/sorc/fbwndgfs.fd/CMakeLists.txt new file mode 100644 index 0000000000..dcdf057cd2 --- /dev/null +++ b/sorc/fbwndgfs.fd/CMakeLists.txt @@ -0,0 +1,21 @@ +list(APPEND fortran_src + fbwndgfs.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i8 -convert big_endian -assume byterecl") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-integer-8 -fconvert=big-endian") +endif() + +set(exe_name fbwndgfs.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + bacio::bacio_8 + ip::ip_8 + sp::sp_8 + w3emc::w3emc_8 + w3nco::w3nco_8) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/fv3gfs_build.cfg b/sorc/fv3gfs_build.cfg index 130c6dde03..340c174140 100644 --- a/sorc/fv3gfs_build.cfg +++ b/sorc/fv3gfs_build.cfg @@ -9,14 +9,15 @@ Building ufs_utils (ufs_utils) ........................ yes Building gldas (gldas) ................................ yes Building gfs_wafs (gfs_wafs) .......................... yes - Building gaussian_sfcanl (gaussian_sfcanl)............. yes - Building enkf_chgres_recenter (enkf_chgres_recenter) .. yes - Building enkf_chgres_recenter_nc (enkf_chgres_recenter_nc) .. yes - Building tropcy_NEMS (tropcy) ......................... yes - Building gfs_fbwndgfs (gfs_fbwndgfs) .................. yes - Building gfs_bufrsnd (gfs_bufrsnd) .................... yes - Building fv3nc2nemsio (fv3nc2nemsio) .................. yes - Building regrid_nemsio (regrid_nemsio) ................ yes + Building gaussian_sfcanl (gaussian_sfcanl)............. no + Building enkf_chgres_recenter (enkf_chgres_recenter) .. no + Building enkf_chgres_recenter_nc (enkf_chgres_recenter_nc) .. no + Building tropcy_NEMS (tropcy) ......................... no + Building gfs_fbwndgfs (gfs_fbwndgfs) .................. no + Building gfs_bufrsnd (gfs_bufrsnd) .................... no + Building fv3nc2nemsio (fv3nc2nemsio) .................. no + Building regrid_nemsio (regrid_nemsio) ................ no + Building workflow_utils (workflow_utils)................yes Building gfs_util (gfs_util) .......................... yes # -- END -- diff --git a/sorc/fv3nc2nemsio.fd/CMakeLists.txt b/sorc/fv3nc2nemsio.fd/CMakeLists.txt new file mode 100644 index 0000000000..82778a1017 --- /dev/null +++ b/sorc/fv3nc2nemsio.fd/CMakeLists.txt @@ -0,0 +1,17 @@ +list(APPEND fortran_src +constants.f90 +fv3_main.f90 +fv3_module.f90 +kinds.f90 +) + +set(exe_name fv3nc2nemsio.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + nemsio::nemsio + bacio::bacio_4 + w3nco::w3nco_d + NetCDF::NetCDF_Fortran) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/fv3nc2nemsio.fd/fv3_main.f90 b/sorc/fv3nc2nemsio.fd/fv3_main.f90 index 39ca00a78f..48c7440b14 100644 --- a/sorc/fv3nc2nemsio.fd/fv3_main.f90 +++ b/sorc/fv3nc2nemsio.fd/fv3_main.f90 @@ -63,13 +63,13 @@ program fv3_main if (nhcas == 0 ) then !non-hydrostatic case nvar3d=9 allocate (name3din(nvar3d), name3dout(nvar3d)) - name3din=(/'ucomp','vcomp','temp','sphum','o3mr','nhpres','w','clwmr','delp'/) - name3dout=(/'ugrd','vgrd','tmp','spfh','o3mr','pres','vvel','clwmr','dpres'/) + name3din=(/'ucomp ','vcomp ','temp ','sphum ','o3mr ','nhpres','w ','clwmr ','delp '/) + name3dout=(/'ugrd ','vgrd ','tmp ','spfh ','o3mr ','pres ','vvel ','clwmr','dpres'/) else nvar3d=8 allocate (name3din(nvar3d), name3dout(nvar3d)) - name3din=(/'ucomp','vcomp','temp','sphum','o3mr','hypres','clwmr','delp'/) - name3dout=(/'ugrd','vgrd','tmp','spfh','o3mr','pres','clwmr','dpres'/) + name3din=(/'ucomp ','vcomp ','temp ','sphum ','o3mr ','hypres','clwmr ','delp '/) + name3dout=(/'ugrd ','vgrd ','tmp ','spfh ','o3mr ','pres ','clwmr','dpres'/) endif ! open netcdf files diff --git a/sorc/gaussian_sfcanl.fd/CMakeLists.txt b/sorc/gaussian_sfcanl.fd/CMakeLists.txt new file mode 100644 index 0000000000..6447fdaf6a --- /dev/null +++ b/sorc/gaussian_sfcanl.fd/CMakeLists.txt @@ -0,0 +1,21 @@ +list(APPEND fortran_src + gaussian_sfcanl.f90 +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i4 -fp-model precise") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") +endif() + +set(exe_name gaussian_sfcanl.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + nemsio::nemsio + bacio::bacio_4 + sp::sp_4 + w3nco::w3nco_d + NetCDF::NetCDF_Fortran) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/gfs_bufr.fd/CMakeLists.txt b/sorc/gfs_bufr.fd/CMakeLists.txt new file mode 100644 index 0000000000..b0fc45b651 --- /dev/null +++ b/sorc/gfs_bufr.fd/CMakeLists.txt @@ -0,0 +1,55 @@ +list(APPEND fortran_src + bfrhdr.f + bfrize.f + buff.f + #calwxt_gfs_baldwin.f + #calwxt_gfs_ramer.f + gfsbufr.f + lcl.f + meteorg.f + mstadb.f + newsig1.f + read_nemsio.f + #read_netcdf.f + read_netcdf_p.f + rsearch.f + svp.f + tdew.f + terp3.f + vintg.f +) + +list(APPEND fortran_src_free + calpreciptype.f + funcphys.f + gslp.f + machine.f + modstuff1.f + physcons.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -convert big_endian -fp-model source") + set_source_files_properties(${fortran_src_free} PROPERTIES COMPILE_FLAGS "-free") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian") + set_source_files_properties(${fortran_src_free} PROPERTIES COMPILE_FLAGS "-ffree-form") +endif() + +set(exe_name gfs_bufr.x) +add_executable(${exe_name} ${fortran_src} ${fortran_src_free}) +target_link_libraries( + ${exe_name} + nemsio::nemsio + bacio::bacio_4 + sigio::sigio + sp::sp_4 + w3emc::w3emc_4 + w3nco::w3nco_4 + bufr::bufr_4_DA + NetCDF::NetCDF_Fortran) +if(OpenMP_Fortran_FOUND) + target_link_libraries(${exe_name} OpenMP::OpenMP_Fortran) +endif() + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/gfs_bufr.fd/meteorg.f b/sorc/gfs_bufr.fd/meteorg.f index da98238929..6b7c2c7db4 100755 --- a/sorc/gfs_bufr.fd/meteorg.f +++ b/sorc/gfs_bufr.fd/meteorg.f @@ -6,15 +6,15 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, !$$$ SUBPROGRAM DOCUMENTATION BLOCK ! . . . . -! SUBPROGRAM: meteorg +! SUBPROGRAM: meteorg ! PRGMMR: HUALU PAN ORG: W/NMC23 DATE: 1999-07-21 ! ! ABSTRACT: Creates BUFR meteogram files for the AVN and MRF. ! ! PROGRAM HISTORY LOG: -! 1999-07-21 HUALU PAN -! 2007-02-02 FANGLIN YANG EXPAND FOR HYBRID COORDINATES USING SIGIO -! 2009-07-24 FANGLIN YANG CHANGE OUTPUT PRESSURE TO INTEGER-LAYER +! 1999-07-21 HUALU PAN +! 2007-02-02 FANGLIN YANG EXPAND FOR HYBRID COORDINATES USING SIGIO +! 2009-07-24 FANGLIN YANG CHANGE OUTPUT PRESSURE TO INTEGER-LAYER ! PRESSURE (line 290) ! CORRECT THE TEMPERATURE ADJUSTMENT (line 238) ! 2014-03-27 DANA CARLIS UNIFY CODE WITH GFS FORECAST MODEL PRECIP @@ -22,14 +22,14 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! 2016-09-27 HUIYA CHUANG MODIFY TO READ GFS NEMS OUTPUT ON GRID SPACE ! 2017-02-27 GUANG PING LOU CHANGE OUTPUT PRECIPITATION TO HOURLY AMOUNT ! TO 120 HOURS AND 3 HOURLY TO 180 HOURS. -! 2018-02-01 GUANG PING LOU INGEST FV3GFS NEMSIO ACCUMULATED PRECIPITATION +! 2018-02-01 GUANG PING LOU INGEST FV3GFS NEMSIO ACCUMULATED PRECIPITATION ! AND RECALCULATE HOURLY AND 3 HOURLY OUTPUT DEPENDING -! ON LOGICAL VALUE OF precip_accu. +! ON LOGICAL VALUE OF precip_accu. ! 2018-02-08 GUANG PING LOU ADDED READING IN AND USING DZDT AS VERTICAL VELOCITY ! 2018-02-16 GUANG PING LOU ADDED READING IN AND USING MODEL DELP AND DELZ ! 2018-02-21 GUANG PING LOU THIS VERSION IS BACKWARD COMPATIBLE TO GFS MODEL ! 2018-03-27 GUANG PING LOU CHANGE STATION ELEVATION CORRECTION LAPSE RATE FROM 0.01 TO 0.0065 -! 2018-03-28 GUANG PING LOU GENERALIZE TIME INTERVAL +! 2018-03-28 GUANG PING LOU GENERALIZE TIME INTERVAL ! 2019-07-08 GUANG PING LOU ADDED STATION CHARACTER IDS ! 2019-10-08 GUANG PING LOU MODIFY TO READ IN NetCDF FILES. RETAIN NEMSIO ! RELATED CALLS AND CLEAN UP THE CODE. @@ -43,28 +43,28 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! rlon(npoint) - longtitude ! istat(npoint) - station id ! elevstn(npoint) - station elevation (m) -! nf - forecast cycle -! fnsig - sigma file name -! idate(4) - date +! nf - forecast cycle +! fnsig - sigma file name +! idate(4) - date ! levs - input vertical layers -! kdim - sfc file dimension +! kdim - sfc file dimension ! -! OUTPUT: -! nfile - output data file channel -! jdate - date YYYYMMDDHH +! OUTPUT: +! nfile - output data file channel +! jdate - date YYYYMMDDHH ! ! ATTRIBUTES: -! LANGUAGE: +! LANGUAGE: ! MACHINE: IBM SP ! !$$$ use netcdf use nemsio_module - use sigio_module + use sigio_module use physcons use mersenne_twister use funcphys - implicit none + implicit none include 'mpif.h' type(nemsio_gfile) :: gfile type(nemsio_gfile) :: ffile @@ -93,6 +93,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, real,dimension(im,jm):: apcp, cpcp real,dimension(npoint,2+levs*3):: grids real,dimension(npoint) :: rlat,rlon,pmsl,ps,psn,elevstn + real,dimension(1) :: psone real,dimension(im*jm) :: dum1d,dum1d2 real,dimension(im,jm) :: gdlat, hgt, gdlon real,dimension(im,jm,15) :: dum2d @@ -115,8 +116,8 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, integer :: n3dfercld,iseedl integer :: istat(npoint) logical :: trace - logical, parameter :: debugprint=.true. -!! logical, parameter :: debugprint=.false. +!! logical, parameter :: debugprint=.true. + logical, parameter :: debugprint=.false. character lprecip_accu*3 real, parameter :: ERAD=6.371E6 real, parameter :: DTR=3.1415926/180. @@ -188,7 +189,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, error=nf90_inq_varid(ncid, "lat", id_var) error=nf90_get_var(ncid, id_var, gdlat) !!end read NetCDF hearder info, read nemsio below if necessary - else + else call nemsio_open(gfile,trim(fnsig),'read',iret=iret) call nemsio_getfilehead(gfile,iret=iret @@ -218,14 +219,14 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, gdlon(i,j)=dum1d2((j-1)*im+i) end do end do - - endif !end read in nemsio hearder + + endif !end read in nemsio hearder if(debugprint) then - do k=1,levs+1 + do k=1,levs+1 print*,'vcoord(k,1)= ', k, vcoord(k,1) end do - do k=1,levs+1 + do k=1,levs+1 print*,'vcoord(k,2)= ', k, vcoord(k,2) end do print*,'sample lat= ',gdlat(im/5,jm/4) @@ -240,7 +241,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,1,VarName,hgt,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'surface hgt not found' - else + else VarName='hgt' LayName='sfc' call read_nemsio(gfile,im,jm,1,VarName,LayName,hgt, @@ -258,7 +259,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'surface pressure not found' - else + else VarName='pres' LayName='sfc' call read_nemsio(gfile,im,jm,1,VarName, @@ -275,7 +276,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,t3d,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'temp not found' - else + else VarName='tmp' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName,t3d,error) @@ -294,7 +295,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,q3d,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'spfh not found' - else + else VarName='spfh' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName,q3d,error) @@ -313,7 +314,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,uh,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'ugrd not found' - else + else VarName='ugrd' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName,uh,error) @@ -332,7 +333,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,vh,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'vgrd not found' - else + else VarName='vgrd' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName,vh,error) @@ -351,7 +352,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,omega3d,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'dzdt not found' - else + else VarName='dzdt' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName, @@ -371,7 +372,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,delpz,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'dpres not found' - else + else VarName='dpres' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName, @@ -390,7 +391,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, do j=1,jm do i=1,im pint(i,j,k)=vcoord(k,1) - + +vcoord(k,2)*pint(i,j,1) + + +vcoord(k,2)*pint(i,j,1) end do end do end do @@ -433,7 +434,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,levs,VarName,delpz,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'delz not found' - else + else VarName='delz' LayName='mid layer' call read_nemsio(gfile,im,jm,levs,VarName,LayName,delpz,error) @@ -521,7 +522,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, !open T-nint below error=nf90_open(trim(fngrib2),nf90_nowrite,ncid2) if(error /= 0)print*,'file not open',trim(fngrib), trim(fngrib2) - else + else call nemsio_open(ffile,trim(fngrib),'read',iret=error) call nemsio_open(ffile2,trim(fngrib2),'read',iret=error) if(error /= 0)print*,'file not open',trim(fngrib), trim(fngrib2) @@ -533,7 +534,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid,im,jm,1,VarName,lwmask,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'lwmask not found' - else + else VarName='land' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName,lwmask,error) @@ -551,7 +552,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'tmpsfc not found' - else + else VarName='tmp' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -569,7 +570,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'tmp2m not found' - else + else VarName='tmp' LayName='2 m above gnd' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -588,7 +589,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'spfh2m not found' - else + else VarName='spfh' LayName='2 m above gnd' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -607,7 +608,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'ugrd10m not found' - else + else VarName='ugrd' LayName='10 m above gnd' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -623,7 +624,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'vgrd10m not found' - else + else VarName='vgrd' LayName='10 m above gnd' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -639,7 +640,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'soilt1 not found' - else + else VarName='tmp' LayName='0-10 cm down' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -658,7 +659,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'snod not found' - else + else VarName='snod' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -675,7 +676,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'lhtfl not found' - else + else VarName='lhtfl' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -706,7 +707,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid2,im,jm,1,VarName,cpcp,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'prate_ave not found' - else + else VarName='prate_ave' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -739,7 +740,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, call read_netcdf_p(ncid2,im,jm,1,VarName,cpcp,Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'cprat_ave not found' - else + else VarName='cprat_ave' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -752,7 +753,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, do j=1,jm do i=1,im dum2d(i,j,10)=(apcp(i,j)*fhour-cpcp(i,j)*ap)*3600.0 - & + & end do end do @@ -764,7 +765,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'weasd not found' - else + else VarName='weasd' LayName='sfc' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -780,7 +781,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & dum2d(:,:,12),Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'tcdc_avelcl not found' - else + else VarName='tcdc_ave' LayName='low cld lay' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -796,7 +797,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & dum2d(:,:,13),Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'tcdc_avemcl not found' - else + else VarName='tcdc_ave' LayName='mid cld lay' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -812,7 +813,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & dum2d(:,:,14),Zreverse, & iope,ionproc,iocomms,error) if (error /= 0) print*,'tcdc_avehcl not found' - else + else VarName='tcdc_ave' LayName='high cld lay' call read_nemsio(ffile,im,jm,1,VarName,LayName, @@ -844,7 +845,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, jdum=jjdum(np) else -! find nearest neighbor +! find nearest neighbor rdum=rlon(np) if(rdum<0.)rdum=rdum+360. @@ -862,7 +863,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, exit else if(landwater(np) == lwmask(i+1,j))then idum=i+1 - jdum=j ! 2 + jdum=j ! 2 exit else if(landwater(np) == lwmask(i-1,j))then idum=i-1 @@ -1001,7 +1002,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, grids(np,1)=hgt(idum,jdum) grids(np,2)=pint(idum,jdum,1) - + sfc(5,np)=dum2d(idum,jdum,1) sfc(6,np)=dum2d(idum,jdum,6) sfc(17,np)=dum2d(idum,jdum,8) @@ -1018,10 +1019,10 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, CC There may be cases where convective precip is greater than total precip CC due to rounding and interpolation errors, correct it here -G.P. Lou: - if(sfc(11,np) .gt. sfc(12,np)) sfc(11,np)=sfc(12,np) + if(sfc(11,np) .gt. sfc(12,np)) sfc(11,np)=sfc(12,np) do k=1,levs - grids(np,k+2)=t3d(idum,jdum,k) + grids(np,k+2)=t3d(idum,jdum,k) grids(np,k+2+levs)=q3d(idum,jdum,k) grids(np,k+2+2*levs)=omega3d(idum,jdum,k) gridu(np,k)=uh(idum,jdum,k) @@ -1030,10 +1031,10 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, z1(np,k)=zint(idum,jdum,k+1) !! p1(np,k)=0.5*(pint(idum,jdum,k)+pint(idum,jdum,k+1)) !! z1(np,k)=0.5*(zint(idum,jdum,k)+zint(idum,jdum,k+1)) - + end do - end do - + end do + print*,'finish finding nearest neighbor for each station' do np = 1, npoint @@ -1048,7 +1049,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, !! if(recn_dzdt == 0 ) then !!DZDT do k = 1, levs do np = 1, npoint - omega(np,k) = grids(np,2+levs*2+k) + omega(np,k) = grids(np,2+levs*2+k) enddo enddo if(debugprint) @@ -1064,9 +1065,10 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! print *, "elevstn = ", elevstn(np) if(elevstn(np)==-999.) elevstn(np) = grids(np,1) psn(np) = ps(np) + psone = ps(np) call sigio_modpr(1,1,levs,nvcoord,idvc, & idsl,vcoord,iret, - & ps=psn(np)*1000,pd=pd3(np,1:levs)) + & ps=psone*1000,pd=pd3(np,1:levs)) grids(np,2) = log(psn(np)) if(np==11)print*,'station H,grud H,psn,ps,new pm', & elevstn(np),grids(np,1),psn(np),ps(np) @@ -1092,7 +1094,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, & pmsl(np),zp(np,1:levs),zp2(1:2)) enddo print *, 'call gslp pmsl= ', (pmsl(np),np=1,20) - if(recn_delz == -9999) then + if(recn_delz == -9999) then print*, 'using calculated height ' else print*, 'using model height m' @@ -1108,6 +1110,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! ! prepare buffer data ! + if(iope == 0) then do np = 1, npoint pi3(np,1)=psn(np)*1000 do k=1,levs @@ -1135,7 +1138,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! look for the layer above 500 mb for precip type computation ! if(pi3(np,k).ge.50000.) leveta = k - ppi = pi3(np,k) + ppi = pi3(np,k) t = grids(np,k+2) q = max(1.e-8,grids(np,2+k+levs)) u = gridu(np,k) @@ -1149,8 +1152,8 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, if (mod(k,2)>0) then data2((kk-1)*6+7) = p1(np,k) data2((kk-1)*6+8) = t - data2((kk-1)*6+9) = u - data2((kk-1)*6+10) = v + data2((kk-1)*6+9) = u + data2((kk-1)*6+10) = v data2((kk-1)*6+11) = q data2((kk-1)*6+12) = omega(np,k)*100. endif @@ -1160,16 +1163,16 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! process surface flux file fields ! !! data(8+nflx) = psfc * 100. ! SURFACE PRESSURE (PA) -!! data(7+nflx) = pmsl(np) +!! data(7+nflx) = pmsl(np) data2(8+nflx2) = psfc * 100. ! SURFACE PRESSURE (PA) - data2(7+nflx2) = pmsl(np) + data2(7+nflx2) = pmsl(np) !! dtemp = .0065 * (grids(np,1) - elevstn(np)) !! dtemp = .0100 * (grids(np,1) - elevstn(np)) !! sfc(37,np) = data(6+nflx) * .01 !! sfc(37,np) = data(7+nflx) * .01 -!! sfc(39,np) = zp2(2) !500 hPa height +!! sfc(39,np) = zp2(2) !500 hPa height sfc(37,np) = data2(7+nflx2) * .01 - sfc(39,np) = zp2(2) !500 hPa height + sfc(39,np) = zp2(2) !500 hPa height ! ! do height correction if there is no snow or if the temp is less than 0 ! G.P.LOU: @@ -1191,10 +1194,10 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, ! !G.P. Lou 20200501: !convert instantaneous surface latent heat net flux to surface -!evapolation 1 W m-2 = 0.0864 MJ m-2 day-1 +!evapolation 1 W m-2 = 0.0864 MJ m-2 day-1 ! and 1 mm day-1 = 2.45 MJ m-2 day-1 ! equivament to 0.0864/2.54 = 0.035265 -! equivament to 2.54/0.0864 = 28.3565 +! equivament to 2.54/0.0864 = 28.3565 if(debugprint) + print*,'evaporation (stn 000692)= ',sfc(17,np) !! data(9+nflx) = sfc(5,np) ! tsfc (K) @@ -1247,8 +1250,8 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, if(sfc(12,np).gt.0.) then !check for precip then calc precip type do k = 1, leveta+1 - pp = p1(np,k) - ppi = pi3(np,k) + pp = p1(np,k) + ppi = pi3(np,k) t = grids(np,k+2) q = max(0.,grids(np,2+k+levs)) u = gridu(np,k) @@ -1266,7 +1269,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, gq0(1,k) = q prsl(1,k) = pp prsi(1,k)=ppi - phii(1,k)=zp(np,k) !height in meters + phii(1,k)=zp(np,k) !height in meters enddo ! Use GFS routine calpreciptype.f to calculate precip type xlat=rlat(np) @@ -1305,6 +1308,7 @@ subroutine meteorg(npoint,rlat,rlon,istat,cstat,elevstn, !! write(nfile) data write(nfile) data2 enddo !End loop over stations np + endif call date_and_time(date,time,zone,clocking) ! print *,'13reading write data end= ', clocking print *,'13date, time, zone',date, time, zone diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh index 403c7364ca..876bf9456a 100755 --- a/sorc/link_fv3gfs.sh +++ b/sorc/link_fv3gfs.sh @@ -195,7 +195,22 @@ cd ${pwd}/../ush ||exit 8 #--link executables #------------------------------ +if [ ! -d $pwd/../exec ]; then mkdir $pwd/../exec ; fi cd $pwd/../exec + +[[ -s gaussian_sfcanl.exe ]] && rm -f gaussian_sfcanl.exe +$LINK ../sorc/install/bin/gaussian_sfcanl.x gaussian_sfcanl.exe +for workflowexec in fbwndgfs gfs_bufr regrid_nemsio supvit syndat_getjtbul \ + syndat_maksynrc syndat_qctropcy tocsbufr ; do + [[ -s $workflowexec ]] && rm -f $workflowexec + $LINK ../sorc/install/bin/${workflowexec}.x $workflowexec +done +for workflowexec in enkf_chgres_recenter.x enkf_chgres_recenter_nc.x fv3nc2nemsio.x \ + tave.x vint.x ; do + [[ -s $workflowexec ]] && rm -f $workflowexec + $LINK ../sorc/install/bin/$workflowexec . +done + [[ -s global_fv3gfs.x ]] && rm -f global_fv3gfs.x $LINK ../sorc/fv3gfs.fd/NEMS/exe/global_fv3gfs.x . if [ -d ../sorc/fv3gfs.fd/WW3/exec ]; then # Wave execs @@ -309,8 +324,10 @@ cd ${pwd}/../sorc || exit 8 if [ -d ${pwd}/gfs_wafs.fd ]; then $SLINK gfs_wafs.fd/sorc/wafs_awc_wafavn.fd wafs_awc_wafavn.fd $SLINK gfs_wafs.fd/sorc/wafs_blending.fd wafs_blending.fd + $SLINK gfs_wafs.fd/sorc/wafs_blending_0p25.fd wafs_blending_0p25.fd $SLINK gfs_wafs.fd/sorc/wafs_cnvgrib2.fd wafs_cnvgrib2.fd $SLINK gfs_wafs.fd/sorc/wafs_gcip.fd wafs_gcip.fd + $SLINK gfs_wafs.fd/sorc/wafs_grib2_0p25.fd wafs_grib2_0p25.fd $SLINK gfs_wafs.fd/sorc/wafs_makewafs.fd wafs_makewafs.fd $SLINK gfs_wafs.fd/sorc/wafs_setmissing.fd wafs_setmissing.fd fi @@ -326,6 +343,7 @@ cd $pwd/../parm/config [[ -s config.base ]] && rm -f config.base if [ $RUN_ENVIR = nco ] ; then cp -p config.base.nco.static config.base + cp -p config.resources.nco.static config.resources else cp -p config.base.emc.dyn config.base fi diff --git a/sorc/partial_build.sh b/sorc/partial_build.sh index 264d3c1410..46db31acb1 100755 --- a/sorc/partial_build.sh +++ b/sorc/partial_build.sh @@ -16,6 +16,7 @@ "Build_gfs_bufrsnd" \ "Build_fv3nc2nemsio" \ "Build_regrid_nemsio" \ + "Build_workflow_utils" \ "Build_gfs_util") # diff --git a/sorc/regrid_nemsio.fd/CMakeLists.txt b/sorc/regrid_nemsio.fd/CMakeLists.txt new file mode 100644 index 0000000000..068a7213a3 --- /dev/null +++ b/sorc/regrid_nemsio.fd/CMakeLists.txt @@ -0,0 +1,27 @@ +list(APPEND fortran_src +constants.f90 +fv3_interface.f90 +gfs_nems_interface.f90 +interpolation_interface.f90 +kinds.f90 +main.f90 +mpi_interface.f90 +namelist_def.f90 +netcdfio_interface.f90 +physcons.f90 +regrid_nemsio_interface.f90 +variable_interface.f90 +) + +set(exe_name regrid_nemsio.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + nemsio::nemsio + bacio::bacio_4 + sp::sp_d + w3nco::w3nco_d + NetCDF::NetCDF_Fortran + MPI::MPI_Fortran) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/supvit.fd/CMakeLists.txt b/sorc/supvit.fd/CMakeLists.txt new file mode 100644 index 0000000000..106fe3a7e5 --- /dev/null +++ b/sorc/supvit.fd/CMakeLists.txt @@ -0,0 +1,19 @@ +list(APPEND fortran_src + supvit_modules.f + supvit_main.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") +endif() + +set(exe_name supvit.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + w3emc::w3emc_d + w3nco::w3nco_d) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/syndat_getjtbul.fd/CMakeLists.txt b/sorc/syndat_getjtbul.fd/CMakeLists.txt new file mode 100644 index 0000000000..9659f0a275 --- /dev/null +++ b/sorc/syndat_getjtbul.fd/CMakeLists.txt @@ -0,0 +1,15 @@ +list(APPEND fortran_src + getjtbul.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume noold_ldout_format") +endif() + +set(exe_name syndat_getjtbul.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + w3nco::w3nco_4) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/syndat_maksynrc.fd/CMakeLists.txt b/sorc/syndat_maksynrc.fd/CMakeLists.txt new file mode 100644 index 0000000000..38893bbeb0 --- /dev/null +++ b/sorc/syndat_maksynrc.fd/CMakeLists.txt @@ -0,0 +1,15 @@ +list(APPEND fortran_src + maksynrc.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume noold_ldout_format") +endif() + +set(exe_name syndat_maksynrc.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + w3nco::w3nco_4) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/syndat_qctropcy.fd/CMakeLists.txt b/sorc/syndat_qctropcy.fd/CMakeLists.txt new file mode 100644 index 0000000000..b8814c29ca --- /dev/null +++ b/sorc/syndat_qctropcy.fd/CMakeLists.txt @@ -0,0 +1,17 @@ +list(APPEND fortran_src + qctropcy.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i8 -r8 -assume byterecl -assume noold_ldout_format") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-integer-8 -fdefault-real-8") +endif() + +set(exe_name syndat_qctropcy.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + w3nco::w3nco_8) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/syndat_qctropcy.fd/qctropcy.f b/sorc/syndat_qctropcy.fd/qctropcy.f index 6d6c4a09ce..e6bfadebd4 100755 --- a/sorc/syndat_qctropcy.fd/qctropcy.f +++ b/sorc/syndat_qctropcy.fd/qctropcy.f @@ -1160,7 +1160,7 @@ SUBROUTINE RSMCCK(IUNTHO,IUNTHA,IUNTAL,IUNTAN,IUNTCA,IUNTOK, PRINT '(a,a,a)', '==> Read in RECORD from tcvitals file -- ', $ ' contains a 4-digit year "',OVRREC(MAXOVR-NRECHO)(20:23),'"' PRINT *, ' ' - PRINT '(a,i,a,a)', + PRINT '(a,i2,a,a)', $ 'From unit ',iuntho,'; OVRREC(MAXOVR-NRECHO)-2: ', $ OVRREC(MAXOVR-NRECHO) PRINT *, ' ' diff --git a/sorc/tave.fd/CMakeLists.txt b/sorc/tave.fd/CMakeLists.txt new file mode 100644 index 0000000000..b24a91fe9a --- /dev/null +++ b/sorc/tave.fd/CMakeLists.txt @@ -0,0 +1,19 @@ +list(APPEND fortran_src + tave.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") +endif() + +set(exe_name tave.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + bacio::bacio_4 + w3nco::w3nco_d + g2::g2_d) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/tocsbufr.fd/CMakeLists.txt b/sorc/tocsbufr.fd/CMakeLists.txt new file mode 100644 index 0000000000..ed1dc8e6ca --- /dev/null +++ b/sorc/tocsbufr.fd/CMakeLists.txt @@ -0,0 +1,22 @@ +list(APPEND fortran_src + tocsbufr.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -convert big_endian -fp-model source") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian") +endif() + +set(exe_name tocsbufr.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + bacio::bacio_4 + sigio::sigio + sp::sp_4 + w3emc::w3emc_4 + w3nco::w3nco_4 + bufr::bufr_4_DA) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sorc/vint.fd/CMakeLists.txt b/sorc/vint.fd/CMakeLists.txt new file mode 100644 index 0000000000..21bf6901c8 --- /dev/null +++ b/sorc/vint.fd/CMakeLists.txt @@ -0,0 +1,19 @@ +list(APPEND fortran_src + vint.f +) + +if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8") +endif() + +set(exe_name vint.x) +add_executable(${exe_name} ${fortran_src}) +target_link_libraries( + ${exe_name} + bacio::bacio_4 + w3nco::w3nco_d + g2::g2_d) + +install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/ush/wave_grib2_sbs.sh b/ush/wave_grib2_sbs.sh index 7a3ee6f5d2..ec0255ba79 100755 --- a/ush/wave_grib2_sbs.sh +++ b/ush/wave_grib2_sbs.sh @@ -234,7 +234,8 @@ exit 4 fi - if [ "$SENDDBN" = 'YES' ] + # if [ "$SENDDBN" = 'YES' ] + if [[ "$SENDDBN" = 'YES' ]] && [[ ${outfile} != *global.0p50* ]] then set +x echo " Alerting GRIB file as $COMOUT/gridded/${outfile}" @@ -243,6 +244,8 @@ # $DBNROOT/bin/dbn_alert MODEL WAVE_GRIB_GB2 $job $COMOUT/gridded/${outfile} $DBNROOT/bin/dbn_alert MODEL ${alertName}_WAVE_GB2 $job $COMOUT/gridded/${outfile} $DBNROOT/bin/dbn_alert MODEL ${alertName}_WAVE_GB2_WIDX $job $COMOUT/gridded/${outfile}.idx + else + echo "${outfile} is global.0p50, not alert out" fi diff --git a/ush/wave_tar.sh b/ush/wave_tar.sh index 560493f912..358be51a92 100755 --- a/ush/wave_tar.sh +++ b/ush/wave_tar.sh @@ -206,7 +206,8 @@ exit 4 fi - if [ "$SENDDBN" = 'YES' -a $type != "ibp" ] + # if [ "$SENDDBN" = 'YES' -a $type != "ibp" ] + if [ "$SENDDBN" = 'YES' ] then set +x echo ' '