Remove need for a ice_prod dependency check script

parm/config/gefs/config.fcst

@@ -270,6 +270,16 @@
 if (( OFFSET_START_HOUR != 0 )); then
     export reforecast="YES"
 fi
+
+if (( $(( ( cyc + FHMIN ) % FHOUT_ICE )) == 0 )); then
+  CICE_cdoavg=0 # Indicate that no averging needs to be done later
+else
+  FHOUT_ICE_BASE=${FHOUT_ICE}
+  FHOUT_ICE=6
+  FHOUTS_ICE=$(( FHOUT_ICE_BASE / FHOUT_ICE ))
+  CICE_cdoavg=1 # Indicate that averging needs to be done later
+fi
+
 # Remember config.efcs will over-ride these values for ensemble forecasts
 # if these variables are re-defined there.
 # Otherwise, the ensemble forecast will inherit from config.fcst

parm/config/gfs/config.fcst

@@ -311,6 +311,15 @@
 
 fi
 
+if (( $(( ( cyc + FHMIN ) % FHOUT_ICE )) == 0 )); then
+  CICE_cdoavg=0 # Indicate that no averging needs to be done later
+else
+  FHOUT_ICE_BASE=${FHOUT_ICE}
+  FHOUT_ICE=6
+  FHOUTS_ICE=$(( FHOUT_ICE_BASE / FHOUT_ICE ))
+  CICE_cdoavg=1 # Indicate that averging needs to be done later
+fi
+
 # Remember config.efcs will over-ride these values for ensemble forecasts
 # if these variables are re-defined there.
 # Otherwise, the ensemble forecast will inherit from config.fcst

scripts/exglobal_forecast.sh

@@ -159,6 +159,7 @@ FV3_out
 [[ ${cplflx} = .true. ]] && MOM6_out
 [[ ${cplflx} = .true. ]] && CMEPS_out
 [[ ${cplwav} = .true. ]] && WW3_out
+[[ ${cplice} = .true. ]] && CICE_avg
 [[ ${cplice} = .true. ]] && CICE_out
 [[ ${cplchm} = .true. ]] && GOCART_out
 [[ ${esmf_profile:-} = .true. ]] && CPL_out

ush/forecast_postdet.sh

@@ -652,6 +652,36 @@ CICE_out() {
 
 }
 
+CICE_avg() {
+  if (( CICE_cdoavg == 0 )); then
+    echo "SUB ${FUNCNAME[0]}: No further averaging needed for CICE"
+  else
+    echo "SUB ${FUNCNAME[0]}: Averaging output data for CICE"
+    CDO=/apps/prod/hpc-stack/intel-19.1.3.304/cdo/1.9.8/bin/cdo
+    fcnt=1
+    thefiles_fh=""
+    for fhr_avg in "${CICE_OUTPUT_FH[@]}";do
+      if (( fhr_avg == 0  )); then
+        continue
+      fi
+      if (( fcnt % FHOUTS_ICE == 0 ));then
+        FH3=$(printf %03i "${fhr_avg}")
+        thefiles_fh=$(seq "$(( fhr_avg - FHOUT_ICE + 6 ))" "6" "${fhr_avg}")
+        thefiles=""
+        for fh in ${thefiles_fh}; do
+          FH3_2=$(printf %03i "${fh}")
+          thefiles="${thefiles} ${COMOUT_ICE_HISTORY}/gefs.ice.t12z.6hr_avg.f${FH3_2}.nc"
+        done
+        intfile="${DATA}/CICE_OUTPUT/${RUN}.ice.t${cyc}z.24hr_aggregate.f${FH3}.nc"
+        avgfile="${COMOUT_ICE_HISTORY}/${RUN}.ice.t${cyc}z.24hr_avg.f${FH3}.nc"
+        ${CDO} mergetime "${thefiles}" "${intfile}"
+        ${CDO} -timmean "${intfile}" "${avgfile}"
+      fi
+      fcnt=$(( fcnt + 1 ))
+    done
+  fi
+}
+
 GOCART_rc() {
   echo "SUB ${FUNCNAME[0]}: Linking input data and copying config files for GOCART"
   # set input directory containing GOCART input data and configuration files

ush/forecast_predet.sh

@@ -636,15 +636,8 @@ CICE_predet(){
 
   # CICE does not have a concept of high frequency output like FV3
   # Convert output settings into an explicit list for CICE
-  if (( $(( ( cyc + FHMIN ) % FHOUT_ICE )) == 0 )); then
-    # shellcheck disable=SC2312
-    mapfile -t CICE_OUTPUT_FH < <(seq "${FHMIN}" "${FHOUT_ICE}" "${FHMAX}") || exit 10
-  else
-    CICE_OUTPUT_FH=("${FHMIN}")
-    # shellcheck disable=SC2312
-    mapfile -t -O "${#CICE_OUTPUT_FH[@]}" CICE_OUTPUT_FH < <(seq "$(( FHMIN + $(( ( cyc + FHMIN ) % FHOUT_ICE )) ))" "${FHOUT_ICE}" "${FHMAX}") || exit 10
-    CICE_OUTPUT_FH+=("${FHMAX}")
-  fi
+  # shellcheck disable=SC2312
+  mapfile -t CICE_OUTPUT_FH < <(seq "${FHMIN}" "${FHOUT_ICE}" "${FHMAX}") || exit 10
 
   # Fix files
   ${NCP} "${FIXgfs}/cice/${ICERES}/${CICE_GRID}" "${DATA}/"

ush/python/pygfs/task/oceanice_products.py

@@ -58,22 +58,10 @@ def __init__(self, config: Dict[str, Any]) -> None:
 
         valid_datetime = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.FORECAST_HOUR}H"))
 
+        forecast_hour = self.task_config.FORECAST_HOUR
         if self.task_config.COMPONENT == 'ice':
-            offset = int(self.task_config.current_cycle.strftime("%H")) % self.task_config.FHOUT_ICE_GFS
-            # For CICE cases where offset is not 0, forecast_hour needs to be adjusted based on the offset.
-            # TODO: Consider FHMIN when calculating offset.
-            if offset != 0:
-                forecast_hour = self.task_config.FORECAST_HOUR - int(self.task_config.current_cycle.strftime("%H"))
-                # For the first forecast hour, the interval may be different from the intervals of subsequent forecast hours
-                if forecast_hour <= self.task_config.FHOUT_ICE_GFS:
-                    interval = self.task_config.FHOUT_ICE_GFS - int(self.task_config.current_cycle.strftime("%H"))
-                else:
-                    interval = self.task_config.FHOUT_ICE_GFS
-            else:
-                forecast_hour = self.task_config.FORECAST_HOUR
-                interval = self.task_config.FHOUT_ICE_GFS
+            interval = self.task_config.FHOUT_ICE_GFS
         if self.task_config.COMPONENT == 'ocean':
-            forecast_hour = self.task_config.FORECAST_HOUR
             interval = self.task_config.FHOUT_OCN_GFS
 
         # TODO: This is a bit of a hack, but it works for now

workflow/rocoto/gefs_tasks.py

@@ -219,11 +219,6 @@ def _atmosoceaniceprod(self, component: str):
             dep_dict = {'type': 'metatask', 'name': 'fcst_mem#member#'}
             deps.append(rocoto.add_dependency(dep_dict))
             dependencies = rocoto.create_dependency(dep=deps, dep_condition='or')
-        elif component in ['ice']:
-            command = f"{self.HOMEgfs}/ush/check_ice_netcdf.sh @Y @m @d @H #fhr# &ROTDIR; #member# {fhout_ice_gfs}"
-            dep_dict = {'type': 'sh', 'command': command}
-            deps.append(rocoto.add_dependency(dep_dict))
-            dependencies = rocoto.create_dependency(dep=deps)
         else:
             dep_dict = {'type': 'data', 'data': data, 'age': 120}
             deps.append(rocoto.add_dependency(dep_dict))