Merge branch 'develop' into jenkins_node.env

NOAA-EMC · Jan 3, 2025 · 9ca0619 · 9ca0619
2 parents 6c686b7 + da9d717
commit 9ca0619
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/parm/archive/enkf_restartb_grp.yaml.j2 b/parm/archive/enkf_restartb_grp.yaml.j2
@@ -38,5 +38,5 @@ enkf_restartb_grp:
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.coupler.res"
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.fv_core.res.nc"
         {% endfor %}
-        {% endfor %}
         {% endif %}
+        {% endfor %}
diff --git a/sorc/build_all.sh b/sorc/build_all.sh
@@ -104,8 +104,8 @@ _gefs_exec="gefs_model.x"
 _sfs_exec="sfs_model.x"
 build_opts=(
     ["ufs_gfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_gfs_exec}"
-    ["ufs_gefs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_gefs_exec}"
-    ["ufs_sfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -e ${_sfs_exec}"
+    ["ufs_gefs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -w -e ${_gefs_exec}"
+    ["ufs_sfs"]="${wave_opt} ${_build_ufs_opt} ${_verbose_opt} ${_build_debug} -y -e ${_sfs_exec}"
     ["upp"]="${_build_debug}"
     ["ww3_gfs"]="${_verbose_opt} ${_build_debug}"
     ["ww3_gefs"]="-w ${_verbose_opt} ${_build_debug}"

diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py
@@ -317,9 +317,9 @@ def get_task_names(self):
                     task_names[run].append('echgres') if 'gdas' in run else 0
                     task_names[run] += ['ediag'] if options['lobsdiag_forenkf'] else ['eomg']
                     task_names[run].append('esnowanl') if options['do_jedisnowda'] and 'gdas' in run else 0
-                    task_names[run].append('efcs') if 'gdas' in run else 0
-                    task_names[run].append('epos') if 'gdas' in run else 0
 
+                task_names[run].append('efcs') if 'gdas' in run else 0
+                task_names[run].append('epos') if 'gdas' in run else 0
                 task_names[run] += ['stage_ic', 'ecen', 'esfc', 'earc', 'cleanup']
 
         return task_names