Merge remote-tracking branch 'origin/release/gfsv16.0.0_to_ops' into …

…wavemissingpoints
NOAA-EMC · Mar 31, 2021 · d804efe · d804efe
2 parents b3eec59 + b0b01c6
commit d804efe
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 327 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -43,7 +43,7 @@ protocol = git
 required = True
 
 [EMC_gfs_wafs]
-tag = gfs_wafs.v6.0.19
+tag = gfs_wafs.v6.0.21
 local_path = sorc/gfs_wafs.fd
 repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git
 protocol = git

diff --git a/modulefiles/gfs_bufr.wcoss_cray b/modulefiles/gfs_bufr.wcoss_cray
@@ -21,7 +21,7 @@ module load sigio-intel/2.1.0
 module load bacio-intel/2.0.1
 module load w3emc-intel/2.2.0
 module load w3nco-intel/2.0.6
-module load bufr-intel/11.0.1
+module load bufr-intel/11.3.0
 module load iobuf/2.0.7
 
 export myFC=ftn

diff --git a/modulefiles/gfs_bufr.wcoss_dell_p3 b/modulefiles/gfs_bufr.wcoss_dell_p3
diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3
diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static
diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -95,7 +95,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.19
+    git checkout gfs_wafs.v6.0.21
     cd ${topdir}
 else
     echo 'Skip.  Directory gfs_wafs.fd already exists.'

diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh
@@ -326,7 +326,6 @@ 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