Fix 06z gfs_sfcanl jobs failing due to a bug in CCPP

dev/test/nccmp.sh

@@ -4,9 +4,11 @@ HOMEgfs=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}")")" && git rev-par
 declare -rx HOMEgfs
 
 source "${HOMEgfs}/dev/ush/load_modules.sh" run
+set +eu
 module load "nccmp/${nccmp_ver:-"1.9.0.1"}"
 
 file1=${1:?}
 file2=${2:?}
 
 nccmp -d -S -f -B --warn=format "${file1}" "${file2}"
+echo $?

dev/workflow/rocoto/gfs_tasks.py

@@ -2217,6 +2217,19 @@ def _arch_tars_deps(self):
                         dep_dict = {'type': 'metatask', 'name': f'{self.run}_gempakgrb2spec'}
                         deps.append(rocoto.add_dependency(dep_dict))
 
+        if self.options['do_awips'] and self.run in ['gfs']:
+
+            dep_dict = {'type': 'metatask', 'name': f'{self.run}_awips_20km_1p0deg'}
+            deps.append(rocoto.add_dependency(dep_dict))
+            dep_dict = {'type': 'task', 'name': f'{self.run}_fbwind'}
+            deps.append(rocoto.add_dependency(dep_dict))
+
+            if self.options['do_wave']:
+                dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsbulls'}
+                deps.append(rocoto.add_dependency(dep_dict))
+                dep_dict = {'type': 'task', 'name': f'{self.run}_waveawipsgridded'}
+                deps.append(rocoto.add_dependency(dep_dict))
+
         if self.options['do_metp'] and self.run in ['gfs']:
             deps2 = []
             # taskvalid only handles regular tasks, so just check the first metp job exists

ush/parsing_ufs_configure.sh

@@ -69,6 +69,9 @@ UFS_configure() {
         local MED_history_n=1000000
 
         local histaux_enabled=".false."
+        local MOM6_OUTPUT_DIR="./MOM6_OUTPUT"
+        local MOM6_RESTART_DIR="./MOM6_RESTART"
+        local MOM6_HISTFREQ_N=${FHOUT_OCN:-6}
     fi
 
     if [[ "${cplice}" = ".true." ]]; then