Adjust mem if-block and fix job list for JEDI

- Incorporate reviewer feedback and adjust first[last_mem]
if-block in master_gfs.yaml.j2 to only check if RUN=enkfgdas
when setting ensemble mem values and not check for NMEM_ENS>0
- Update task list when DO_JEDIATMENS=YES to include the
stage_ic job in the hybrid_after_eupd_tasks group instead of
the hybrid_tasks. Now the enkfgdasstage_ic job shows up in
the xml, it was missing before.

Refs NOAA-EMC#2475

parm/stage/master_gfs.yaml.j2

@@ -54,7 +54,7 @@
 
 # Set first/last mem for loop
 # ---------------------------
-{% if NMEM_ENS > 0 and RUN == "enkfgdas" %} # Ensemble RUN
+{% if RUN == "enkfgdas" %} # Ensemble RUN
   {% set first_mem = 1 %}
   {% set last_mem = NMEM_ENS %}
 {% else %} # Deterministic RUN

workflow/applications/gfs_cycled.py

@@ -165,9 +165,9 @@ def get_task_names(self):
             if self.do_jediatmens:
                 hybrid_tasks += ['atmensanlinit', 'atmensanlletkf', 'atmensanlfv3inc', 'atmensanlfinal', 'echgres']
             else:
-                hybrid_tasks += ['stage_ic', 'eobs', 'eupd', 'echgres']
+                hybrid_tasks += ['eobs', 'eupd', 'echgres']
                 hybrid_tasks += ['ediag'] if self.lobsdiag_forenkf else ['eomg']
-            hybrid_after_eupd_tasks += ['ecen', 'esfc', 'efcs', 'epos', 'earc', 'cleanup']
+            hybrid_after_eupd_tasks += ['stage_ic', 'ecen', 'esfc', 'efcs', 'epos', 'earc', 'cleanup']
 
         # Collect all "gdas" cycle tasks
         gdas_tasks = gdas_gfs_common_tasks_before_fcst.copy()