diff --git a/parm/config/gefs/config.extractvars b/parm/config/gefs/config.extractvars
index 706fe18450..cc93fcf5e0 100644
--- a/parm/config/gefs/config.extractvars
+++ b/parm/config/gefs/config.extractvars
@@ -9,12 +9,12 @@ echo "BEGIN: config.extractvars"
 
 export COMPRSCMD=${COMPRSCMD:-bzip2}
 
-export compress_ocn=0 #1: Compress extracted ocean product, 0: Do not compress extracted ocean product
-export compress_ice=0 #1: Compress extracted ice product, 0: Do not compress extracted ice product
+export compress_ocn=1 #1: Compress extracted ocean product, 0: Do not compress extracted ocean product
+export compress_ice=1 #1: Compress extracted ice product, 0: Do not compress extracted ice product
 
-export ocnres="5p00" # Resolution of ocean products
-export iceres="5p00" # Resolution of ice products
-export wavres="5p00" # Resolution of wave products
+export ocnres="1p00" # Resolution of ocean products
+export iceres="native" # Resolution of ice products
+export wavres="0p25" # Resolution of wave products
 
 export depthvar_name="z_l" # Name of depth variable in NetCDF ocean products
 export zmin="0." # Minimum depth to extract from NetCDF ocean products
diff --git a/parm/config/gefs/config.fcst b/parm/config/gefs/config.fcst
index e6dc335b79..407e48496e 100644
--- a/parm/config/gefs/config.fcst
+++ b/parm/config/gefs/config.fcst
@@ -247,7 +247,11 @@ export FSICS="0"
 
 #---------------------------------------------------------------------
 # Write more variables to output
-export DIAG_TABLE="${PARMgfs}/ufs/fv3/diag_table"
+if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+  export DIAG_TABLE="${PARMgfs}/ufs/fv3/diag_table_replay"
+else
+  export DIAG_TABLE="${PARMgfs}/ufs/fv3/diag_table"
+fi
 
 # Write gfs restart files to rerun fcst from any break point
 export restart_interval=${restart_interval_gfs:-12}
diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
index 8c3ba88940..297bc08c05 100644
--- a/parm/config/gefs/config.resources
+++ b/parm/config/gefs/config.resources
@@ -272,7 +272,7 @@ case ${step} in
     export walltime_gefs="00:30:00"
     export ntasks_gefs=1
     export threads_per_task_gefs=1
-    export tasks_per_node_gefs="${ntasks}"
+    export tasks_per_node_gefs="${ntasks_gefs}"
     export walltime_gfs="${walltime_gefs}"
     export ntasks_gfs="${ntasks_gefs}"
     export threads_per_tasks_gfs="${threads_per_task_gefs}"
diff --git a/parm/post/oceanice_products_gefs.yaml b/parm/post/oceanice_products_gefs.yaml
index 74c0f0653b..fea88df2bb 100644
--- a/parm/post/oceanice_products_gefs.yaml
+++ b/parm/post/oceanice_products_gefs.yaml
@@ -39,14 +39,15 @@ ocean:
       - ["{{ COM_OCEAN_HISTORY }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.{{ interval }}hr_avg.f{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/ocean.nc"]
   data_out:
     mkdir:
-      - "{{ COM_OCEAN_NETCDF }}"
+      - "{{ COM_OCEAN_NETCDF }}/native"
       {% for grid in product_grids %}
+      - "{{ COM_OCEAN_NETCDF }}/{{ grid }}"
       - "{{ COM_OCEAN_GRIB }}/{{ grid }}"
       {% endfor %}
     copy:
-      - ["{{ DATA }}/ocean_subset.nc", "{{ COM_OCEAN_NETCDF }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.native.f{{ '%03d' % forecast_hour }}.nc"]
+      - ["{{ DATA }}/ocean_subset.nc", "{{ COM_OCEAN_NETCDF }}/native/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.native.f{{ '%03d' % forecast_hour }}.nc"]
       {% for grid in product_grids %}
-      - ["{{ DATA }}/ocean.{{ grid }}.nc", "{{ COM_OCEAN_NETCDF }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.{{ grid }}.f{{ '%03d' % forecast_hour }}.nc"]
+      - ["{{ DATA }}/ocean.{{ grid }}.nc", "{{ COM_OCEAN_NETCDF }}/{{ grid }}/{{ RUN }}.ocean.t{{ current_cycle | strftime('%H') }}z.{{ grid }}.f{{ '%03d' % forecast_hour }}.nc"]
       {% endfor %}
 
 ice:
@@ -62,12 +63,13 @@ ice:
       - ["{{ COM_ICE_HISTORY }}/{{ RUN }}.ice.t{{ current_cycle | strftime('%H') }}z.{{ interval }}hr_avg.f{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/ice.nc"]
   data_out:
     mkdir:
-      - "{{ COM_ICE_NETCDF }}"
+      - "{{ COM_ICE_NETCDF }}/native"
       {% for grid in product_grids %}
+      - "{{ COM_ICE_NETCDF }}/{{ grid }}"
       - "{{ COM_ICE_GRIB }}/{{ grid }}"
       {% endfor %}
     copy:
-      - ["{{ DATA }}/ice_subset.nc", "{{ COM_ICE_NETCDF }}/{{ RUN }}.ice.t{{ current_cycle | strftime('%H') }}z.native.f{{ '%03d' % forecast_hour }}.nc"]
+      - ["{{ DATA }}/ice_subset.nc", "{{ COM_ICE_NETCDF }}/native/{{ RUN }}.ice.t{{ current_cycle | strftime('%H') }}z.native.f{{ '%03d' % forecast_hour }}.nc"]
       {% for grid in product_grids %}
-      - ["{{ DATA }}/ice.{{ grid }}.nc", "{{ COM_ICE_NETCDF }}/{{ RUN }}.ice.t{{ current_cycle | strftime('%H') }}z.{{ grid }}.f{{ '%03d' % forecast_hour }}.nc"]
+      - ["{{ DATA }}/ice.{{ grid }}.nc", "{{ COM_ICE_NETCDF }}/{{ grid }}/{{ RUN }}.ice.t{{ current_cycle | strftime('%H') }}z.{{ grid }}.f{{ '%03d' % forecast_hour }}.nc"]
       {% endfor %}
diff --git a/parm/ufs/fv3/diag_table_replay b/parm/ufs/fv3/diag_table_replay
new file mode 100644
index 0000000000..01f2cf9794
--- /dev/null
+++ b/parm/ufs/fv3/diag_table_replay
@@ -0,0 +1,337 @@
+"fv3_history",    0,  "hours",  1,  "hours",  "time"
+"fv3_history2d",  0,  "hours",  1,  "hours",  "time"
+"@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", @[FHOUT_OCN],  "hours",  1,  "hours",  "time",  @[FHOUT_OCN],  "hours",  "@[SYEAR] @[SMONTH] @[SDAY] @[CHOUR_offset] 0 0", @[FHOUT_OCN], "hours" 
+"@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", @[FHOUT_OCN],  "hours",  1,  "hours",  "time",  @[FHOUT_OCN],  "hours",  "@[SYEAR1] @[SMONTH1] @[SDAY1] @[CHOUR1] 0 0"
+
+##############
+# Ocean fields first lead time
+##############
+# static fields
+"ocean_model", "geolon",      "geolon",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolat",      "geolat",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolon_c",    "geolon_c",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolat_c",    "geolat_c",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolon_u",    "geolon_u",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolat_u",    "geolat_u",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolon_v",    "geolon_v",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "geolat_v",    "geolat_v",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+#"ocean_model", "depth_ocean", "depth_ocean", "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+#"ocean_model", "wet",         "wet",         "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "wet_c",       "wet_c",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "wet_u",       "wet_u",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "wet_v",       "wet_v",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "sin_rot",     "sin_rot",     "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+"ocean_model", "cos_rot",     "cos_rot",     "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+
+# ocean output TSUV and others
+"ocean_model", "SSH",        "SSH",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "SST",        "SST",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "SSS",        "SSS",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "speed",      "speed",     "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "SSU",        "SSU",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "SSV",        "SSV",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "frazil",     "frazil",    "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "ePBL_h_ML",  "ePBL",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "MLD_003",    "MLD_003",   "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "MLD_0125",   "MLD_0125",  "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model", "tob",        "tob",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+
+# Z-Space Fields Provided for CMIP6 (CMOR Names):
+"ocean_model_z", "uo",       "uo",        "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model_z", "vo",       "vo",        "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model_z", "so",       "so",        "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+"ocean_model_z", "temp",     "temp",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+
+# forcing
+"ocean_model", "taux",      "taux",          "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "tauy",      "tauy",          "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "latent",    "latent",        "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "sensible",  "sensible",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "SW",        "SW",            "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "LW",        "LW",            "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "evap",      "evap",          "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "lprec",     "lprec",         "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "lrunoff",   "lrunoff",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+#"ocean_model", "frunoff",   "frunoff",       "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "fprec",     "fprec",         "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "LwLatSens", "LwLatSens",     "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+"ocean_model", "Heat_PmE",  "Heat_PmE",      "@[MOM6_OUTPUT_DIR]/ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
+
+##############
+# Ocean fields second lead time and after
+#############
+# static fields
+ocean_model, "geolon",      "geolon",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolat",      "geolat",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolon_c",    "geolon_c",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolat_c",    "geolat_c",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolon_u",    "geolon_u",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolat_u",    "geolat_u",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolon_v",    "geolon_v",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "geolat_v",    "geolat_v",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+#"ocean_model", "depth_ocean", "depth_ocean", "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+#"ocean_model", "wet",         "wet",         "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "wet_c",       "wet_c",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "wet_u",       "wet_u",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "wet_v",       "wet_v",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "sin_rot",     "sin_rot",     "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+ocean_model, "cos_rot",     "cos_rot",     "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr", "all", .false., "none", 2
+
+# ocean output TSUV and others
+ocean_model, "SSH",        "SSH",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "SST",        "SST",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "SSS",        "SSS",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "speed",      "speed",     "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "SSU",        "SSU",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "SSV",        "SSV",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "frazil",     "frazil",    "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "ePBL_h_ML",  "ePBL",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "MLD_003",    "MLD_003",   "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "MLD_0125",   "MLD_0125",  "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model, "tob",        "tob",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+
+# Z-Space Fields Provided for CMIP6 (CMOR Names):
+ocean_model_z, "uo",       "uo",        "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model_z, "vo",       "vo",        "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model_z, "so",       "so",        "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+ocean_model_z, "temp",     "temp",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr",  "all",  .true.,  "none",  2
+
+# forcing
+ocean_model, "taux",      "taux",          "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "tauy",      "tauy",          "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "latent",    "latent",        "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "sensible",  "sensible",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "SW",        "SW",            "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "LW",        "LW",            "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "evap",      "evap",          "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "lprec",     "lprec",         "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "lrunoff",   "lrunoff",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+#"ocean_model", "frunoff",   "frunoff",       "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "fprec",     "fprec",         "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "LwLatSens", "LwLatSens",     "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+ocean_model, "Heat_PmE",  "Heat_PmE",      "@[MOM6_OUTPUT_DIR]/ocn_lead1%4yr%2mo%2dy%2hr","all",.true.,"none",2
+
+###################
+# Atmosphere fields
+###################
+"gfs_dyn",     "ucomp",       "ugrd",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "vcomp",       "vgrd",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "sphum",       "spfh",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "temp",        "tmp",          "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "liq_wat",     "clwmr",        "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ice_wat",     "icmr",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "snowwat",     "snmr",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "rainwat",     "rwmr",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "graupel",     "grle",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ice_nc",      "nccice",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "rain_nc",     "nconrd",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "o3mr",        "o3mr",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "cld_amt",     "cld_amt",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delp",        "dpres",        "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delz",        "delz",         "fv3_history",    "all",  .false.,  "none",  2
+#"gfs_dyn",     "pfhy",        "preshy",       "fv3_history",    "all",  .false.,  "none",  2
+#"gfs_dyn",     "pfnh",        "presnh",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "w",           "dzdt",         "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ps",          "pressfc",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "hs",          "hgtsfc",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "refl_10cm",   "refl_10cm",    "fv3_history",    "all",  .false.,  "none",  2
+
+"gfs_phys",    "cldfra",        "cldfra",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzr",          "frzr",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzrb",         "frzrb",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozr",         "frozr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozrb",        "frozrb",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowp",        "tsnowp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowpb",       "tsnowpb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rhonewsn",      "rhonewsn",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ALBDO_ave",     "albdo_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cnvprcp_ave",   "cprat_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cnvprcpb_ave",  "cpratb_ave",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "totprcp_ave",   "prate_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "totprcpb_ave",  "prateb_ave",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "DLWRF",         "dlwrf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "DLWRFI",        "dlwrf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ULWRF",         "ulwrf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ULWRFI",        "ulwrf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "DSWRF",         "dswrf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "DSWRFI",        "dswrf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "USWRF",         "uswrf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "USWRFI",        "uswrf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "DSWRFtoa",      "dswrf_avetoa",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "USWRFtoa",      "uswrf_avetoa",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ULWRFtoa",      "ulwrf_avetoa",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "gflux_ave",     "gflux_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "hpbl",          "hpbl",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "lhtfl_ave",     "lhtfl_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "shtfl_ave",     "shtfl_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pwat",          "pwat",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "soilm",         "soilm",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDC_aveclm",   "tcdc_aveclm",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDC_avebndcl", "tcdc_avebndcl", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDC_avelcl",   "tcdc_avelcl",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDC_avemcl",   "tcdc_avemcl",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDC_avehcl",   "tcdc_avehcl",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TCDCcnvcl",     "tcdccnvcl",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avelct",   "pres_avelct",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avelcb",   "pres_avelcb",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avemct",   "pres_avemct",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avemcb",   "pres_avemcb",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avehct",   "pres_avehct",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PRES_avehcb",   "pres_avehcb",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PREScnvclt",    "prescnvclt",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "PREScnvclb",    "prescnvclb",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TEMP_avehct",   "tmp_avehct",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TEMP_avemct",   "tmp_avemct",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "TEMP_avelct",   "tmp_avelct",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "u-gwd_ave",     "u-gwd_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "v-gwd_ave",     "v-gwd_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dusfc",         "uflx_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "dvsfc",         "vflx_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "acond",         "acond",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cduvb_ave",     "cduvb_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cpofp",         "cpofp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "duvb_ave",      "duvb_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdlf_ave",     "csdlf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_ave",     "csusf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_avetoa",  "csusftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdsf_ave",     "csdsf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_ave",     "csulf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_avetoa",  "csulftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cwork_ave",     "cwork_aveclm",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evbs_ave",      "evbs_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evcw_ave",      "evcw_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "fldcp",         "fldcp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "hgt_hyblev1",   "hgt_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfh_hyblev1",  "spfh_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ugrd_hyblev1",  "ugrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vgrd_hyblev1",  "vgrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmp_hyblev1",   "tmp_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "gfluxi",        "gflux",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "lhtfl",         "lhtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "shtfl",         "shtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr",         "pevpr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr_ave",     "pevpr_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sbsno_ave",     "sbsno_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sfexc",         "sfexc",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snohf",         "snohf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snowc_ave",     "snowc_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmax2m",     "spfhmax_max2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmin2m",     "spfhmin_min2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmax2m",      "tmax_max2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmin2m",      "tmin_min2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ssrun_acc",     "ssrun_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sunsd_acc",     "sunsd_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "watr_acc",      "watr_acc",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "wilt",          "wilt",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vbdsf_ave",     "vbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vddsf_ave",     "vddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nbdsf_ave",     "nbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nddsf_ave",     "nddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "trans_ave",     "trans_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "psurf",         "pressfc",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "u10m",          "ugrd10m",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "v10m",          "vgrd10m",       "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_phys",    "pahi",          "pahi",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pah_ave",       "pah_ave",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ecan_acc",      "ecan_acc",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "etran_acc",     "etran_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "edir_acc",      "edir_acc",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "wa_acc",        "wa_acc",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "lfrac",         "lfrac",         "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_sfc",     "crain",         "crain",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tprcp",         "tprcp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rainc",         "cnvprcp",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hgtsfc",        "orog",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "weasd",         "weasd",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "f10m",          "f10m",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "q2m",           "spfh2m",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "t2m",           "tmp2m",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tsfc",          "tmpsfc",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vtype",         "vtype",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "stype",         "sotyp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slmsksfc",      "land",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vfracsfc",      "veg",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "zorlsfc",       "sfcr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "uustar",        "fricv",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt1",        "soilt1"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt2",        "soilt2"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt3",        "soilt3"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt4",        "soilt4"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw1",        "soilw1"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw2",        "soilw2"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw3",        "soilw3"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw4",        "soilw4"        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_1",         "soill1",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_2",         "soill2",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_3",         "soill3",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_4",         "soill4",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slope",         "sltyp",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnsf",         "alnsf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnwf",         "alnwf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvsf",         "alvsf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvwf",         "alvwf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "canopy",        "cnwat",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facsf",         "facsf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facwf",         "facwf",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffhh",          "ffhh",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffmm",          "ffmm",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "fice",          "icec",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hice",          "icetk",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snoalb",        "snoalb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmax",        "shdmax",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmin",        "shdmin",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snowd",         "snod",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tg3",           "tg3",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tisfc",         "tisfc",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tref",          "tref",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "z_c",           "zc",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_0",           "c0",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_d",           "cd",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_0",           "w0",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_d",           "wd",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xt",            "xt",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xz",            "xz",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "dt_cool",       "dtcool",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xs",            "xs",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xu",            "xu",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xv",            "xv",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xtts",          "xtts",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xzts",          "xzts",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "d_conv",        "dconv",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "qrain",         "qrain",        "fv3_history2d",  "all",  .false.,  "none",  2
+
+#=============================================================================================
+#
+#====> This file can be used with diag_manager/v2.0a (or higher) <====
+#
+#
+#  FORMATS FOR FILE ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"file_name", output_freq, "output_units", format, "time_units", "long_name",
+#
+#
+#output_freq:  > 0  output frequency in "output_units"
+#              = 0  output frequency every time step
+#              =-1  output frequency at end of run
+#
+#output_units = units used for output frequency
+#               (years, months, days, minutes, hours, seconds)
+#
+#time_units   = units used to label the time axis
+#               (days, minutes, hours, seconds)
+#
+#
+#  FORMAT FOR FIELD ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"module_name", "field_name", "output_name", "file_name" "time_sampling", time_avg, "other_opts", packing
+#
+#time_avg = .true. or .false.
+#
+#packing  = 1  double precision
+#         = 2  float
+#         = 4  packed 16-bit integers
+#         = 8  packed 1-byte (not tested?)
diff --git a/ush/atmos_extractvars.sh b/ush/atmos_extractvars.sh
index 70e86b2f4e..5fea8497c6 100755
--- a/ush/atmos_extractvars.sh
+++ b/ush/atmos_extractvars.sh
@@ -31,7 +31,16 @@ for outtype in "f2d" "f3d"; do
   outdirpre="${subdata}/${outtype}"
   [[ -d "${outdirpre}" ]] || mkdir -p "${outdirpre}"
 
-  nh=${FHMIN}
+  if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+    if [[ "${outtype}" == "f2d" ]]; then
+      nh=${OFFSET_START_HOUR}
+    elif [[ "${outtype}" == "f3d" ]]; then
+      nh=${FHOUT_GFS}
+    fi
+  else
+    nh=${FHMIN}
+  fi
+
   while (( nh <= FHMAX_GFS )); do
     fnh=$(printf "%3.3d" "${nh}")
 
@@ -45,11 +54,15 @@ for outtype in "f2d" "f3d"; do
       outres="1p00"
     fi
 
-    if (( nh <= FHMAX_HF_GFS )); then
-      outfreq=${FHOUT_HF_GFS}
-    else
-      outfreq=${FHOUT_GFS}
-    fi                                      
+    if [[ "${outtype}" == "f2d" ]]; then
+      if (( nh < FHMAX_HF_GFS )); then
+        outfreq=${FHOUT_HF_GFS}
+      else
+        outfreq=${FHOUT_GFS}
+      fi
+    elif [[ "${outtype}" == "f3d" ]]; then
+     outfreq=${FHOUT_GFS}
+    fi
 
     com_var="COMIN_ATMOS_GRIB_${outres}"
     infile1="${!com_var}/${RUN}.t${cyc}z.pgrb2.${outres}.f${fnh}"
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index e659d2ce80..8af9054972 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -206,11 +206,24 @@ EOF
     for fhr in ${FV3_OUTPUT_FH}; do
       FH3=$(printf %03i "${fhr}")
       FH2=$(printf %02i "${fhr}")
-      ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atmf${FH3}.nc" "atmf${FH3}.nc"
-      ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${FH3}.nc"
-      ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${FH3}"
-      ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${FH3}.nc"
-      ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${FH3}.nc"
+      # When replaying, the time format outputted by model in filename is HH-MM-SS
+      # because first fhr is a decimal number
+      if [[ ${REPLAY_ICS:-NO} == "YES" ]] && (( fhr >= OFFSET_START_HOUR )); then
+        local hhmmss_substring=${FV3_OUTPUT_FH_hhmmss/" ${FH3}-"*/} # Extract substring that contains all lead times up to the one space before target lead HHH-MM-SS
+        local hhmmss_substring_len=$(( ${#hhmmss_substring} + 1 )) # Get the size of the substring and add 1 to account for space
+        local f_hhmmss=${FV3_OUTPUT_FH_hhmmss:${hhmmss_substring_len}:9} # extract HHH-MM-SS for target lead time
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atmf${FH3}.nc" "atmf${f_hhmmss}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${f_hhmmss}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${f_hhmmss}"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${f_hhmmss}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${f_hhmmss}.nc"
+      else
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atmf${FH3}.nc" "atmf${FH3}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${FH3}.nc" "sfcf${FH3}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.atm.logf${FH3}.txt" "log.atm.f${FH3}"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_atmf${FH3}.nc" "cubed_sphere_grid_atmf${FH3}.nc"
+        ${NLN} "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.cubed_sphere_grid_sfcf${FH3}.nc" "cubed_sphere_grid_sfcf${FH3}.nc"
+      fi
       if [[ "${WRITE_DOPOST}" == ".true." ]]; then
         ${NLN} "${COMOUT_ATMOS_MASTER}/${RUN}.t${cyc}z.master.grb2f${FH3}" "GFSPRS.GrbF${FH2}"
         ${NLN} "${COMOUT_ATMOS_MASTER}/${RUN}.t${cyc}z.sfluxgrbf${FH3}.grib2" "GFSFLX.GrbF${FH2}"
@@ -454,10 +467,19 @@ MOM6_postdet() {
       (( midpoint = last_fhr + interval/2 ))
 
       vdate=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${fhr} hours" +%Y%m%d%H)
-      vdate_mid=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${midpoint} hours" +%Y%m%d%H)
+      #If OFFSET_START_HOUR is greater than 0, OFFSET_START_HOUR should be added to the midpoint for first lead time
+      if (( OFFSET_START_HOUR > 0 )) &&  (( fhr == FHOUT_OCN ));then
+        vdate_mid=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + $(( midpoint + OFFSET_START_HOUR )) hours" +%Y%m%d%H)
+      else
+        vdate_mid=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${midpoint} hours" +%Y%m%d%H)
+      fi
 
       # Native model output uses window midpoint in the filename, but we are mapping that to the end of the period for COM
-      source_file="ocn_${vdate_mid:0:4}_${vdate_mid:4:2}_${vdate_mid:6:2}_${vdate_mid:8:2}.nc"
+      if (( OFFSET_START_HOUR > 0 )) &&  (( fhr == FHOUT_OCN ));then
+        source_file="ocn_lead1_${vdate_mid:0:4}_${vdate_mid:4:2}_${vdate_mid:6:2}_${vdate_mid:8:2}.nc"
+      else
+        source_file="ocn_${vdate_mid:0:4}_${vdate_mid:4:2}_${vdate_mid:6:2}_${vdate_mid:8:2}.nc"
+      fi
       dest_file="${RUN}.ocean.t${cyc}z.${interval}hr_avg.f${fhr3}.nc"
       ${NLN} "${COMOUT_OCEAN_HISTORY}/${dest_file}" "${DATA}/MOM6_OUTPUT/${source_file}"
 
diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh
index 6b72f574d8..d1a332716a 100755
--- a/ush/forecast_predet.sh
+++ b/ush/forecast_predet.sh
@@ -146,6 +146,7 @@ FV3_predet(){
   fi
 
   # Convert output settings into an explicit list for FV3
+  # Create an FV3 fhr list to be used in the filenames
   FV3_OUTPUT_FH=""
   local fhr=${FHMIN}
   if (( FHOUT_HF > 0 && FHMAX_HF > 0 )); then
@@ -154,6 +155,35 @@ FV3_predet(){
   fi
   FV3_OUTPUT_FH="${FV3_OUTPUT_FH} $(seq -s ' ' "${fhr}" "${FHOUT}" "${FHMAX}")"
 
+  # Create an FV3 fhr list to be used in the namelist
+  # The FV3 fhr list for the namelist and the FV3 fhr list for the filenames
+  # are only different when REPLAY_ICS is set to YES
+  if [[ "${REPLAY_ICS:-NO}" == "YES"  ]]; then
+    local FV3_OUTPUT_FH_s
+    FV3_OUTPUT_FH_NML="$(echo "scale=5; ${OFFSET_START_HOUR}+(${DELTIM}/3600)" | bc -l)"
+    FV3_OUTPUT_FH_s=$(( OFFSET_START_HOUR * 3600 + DELTIM ))
+    local fhr=${FHOUT}
+    if (( FHOUT_HF > 0 && FHMAX_HF > 0 )); then
+      FV3_OUTPUT_FH_NML="${FV3_OUTPUT_FH_NML} $(seq -s ' ' "$(( OFFSET_START_HOUR + FHOUT_HF ))" "${FHOUT_HF}" "${FHMAX_HF}")"
+      FV3_OUTPUT_FH_s="${FV3_OUTPUT_FH_s} $(seq -s ' ' "$(( OFFSET_START_HOUR * 3600 + FHOUT_HF * 3600 ))" "$(( FHOUT_HF * 3600 ))" "$(( FHMAX_HF * 3600 ))")"
+      fhr=${FHMAX_HF}
+    fi
+    FV3_OUTPUT_FH_NML="${FV3_OUTPUT_FH_NML} $(seq -s ' ' "${fhr}" "${FHOUT}" "${FHMAX}")"
+    FV3_OUTPUT_FH_s="${FV3_OUTPUT_FH_s} $(seq -s ' ' "$(( fhr * 3600 ))" "$(( FHOUT * 3600 ))" "$(( FHMAX * 3600 ))")"
+    local hh mm ss s_total
+    FV3_OUTPUT_FH_hhmmss=""
+    for s_total in ${FV3_OUTPUT_FH_s}; do
+      # Convert seconds to HHH:MM:SS
+      (( ss = s_total, mm = ss / 60, ss %= 60, hh = mm / 60, mm %= 60 )) || true
+      FV3_OUTPUT_FH_hhmmss="${FV3_OUTPUT_FH_hhmmss} $(printf "%03d-%02d-%02d" "${hh}" "${mm}" "${ss}")"
+    done
+    # Create a string from an array
+  else # If non-replay ICs are being used
+    # The FV3 fhr list for the namelist and the FV3 fhr list for the filenames
+    # are identical when REPLAY_ICS is set to NO
+    FV3_OUTPUT_FH_NML="${FV3_OUTPUT_FH}"
+  fi
+
   # Other options
   PREFIX_ATMINC=${PREFIX_ATMINC:-""} # allow ensemble to use recentered increment
 
diff --git a/ush/ocnice_extractvars.sh b/ush/ocnice_extractvars.sh
index f0660bb6ec..51276172b9 100755
--- a/ush/ocnice_extractvars.sh
+++ b/ush/ocnice_extractvars.sh
@@ -25,11 +25,11 @@ for (( nh = FHMIN_GFS; nh <= FHMAX_GFS; nh = nh + fhout_ocnice )); do
   fnh=$(printf "%3.3d" "${nh}")
 
   if [[ ${component_name} == "ocn" ]]; then
-    infile=${COMIN_OCEAN_NETCDF}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc
+    infile=${COMIN_OCEAN_NETCDF}/${datares}/${RUN}.ocean.t${cyc}z.${datares}.f${fnh}.nc
     # For ocean products, add an argument to extract a subset of levels
     otherargs=(-d "${depthvar_name},""${zmin},""${zmax}")
   elif [[ ${component_name} == "ice" ]]; then
-    infile=${COMIN_ICE_NETCDF}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc
+    infile=${COMIN_ICE_NETCDF}/${datares}/${RUN}.ice.t${cyc}z.${datares}.f${fnh}.nc
     otherargs=()
   fi
   outfile=${subdata}/${RUN}.${component_name}.t${cyc}z.${datares}.f${fnh}.nc
diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh
index d2dd434fff..7e8e065d26 100755
--- a/ush/parsing_model_configure_FV3.sh
+++ b/ush/parsing_model_configure_FV3.sh
@@ -48,7 +48,7 @@ local JCHUNK3D=$((2*restile))
 local KCHUNK3D=1
 local IMO=${LONB_IMO}
 local JMO=${LATB_JMO}
-local OUTPUT_FH=${FV3_OUTPUT_FH}
+local OUTPUT_FH=${FV3_OUTPUT_FH_NML}
 local IAU_OFFSET=${IAU_OFFSET:-0}
 
 # Ensure the template exists
diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index 6101c2f5e1..60f44a721a 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -42,6 +42,18 @@ local SDAY=${current_cycle:6:2}
 local CHOUR=${current_cycle:8:2}
 local MOM6_OUTPUT_DIR="./MOM6_OUTPUT"
 
+if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+  local current_cycle_p1 
+  current_cycle_p1=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${FHOUT_OCN} hours" +%Y%m%d%H)
+  local current_cycle_offset
+  current_cycle_offset=$(date --utc -d "${current_cycle:0:8} ${current_cycle:8:2} + ${OFFSET_START_HOUR} hours" +%Y%m%d%H)
+  local SYEAR1=${current_cycle_p1:0:4}
+  local SMONTH1=${current_cycle_p1:4:2}
+  local SDAY1=${current_cycle_p1:6:2}
+  local CHOUR1=${current_cycle_p1:8:2}
+  local CHOUR_offset=${current_cycle_offset:8:2}
+fi
+
 atparse < "${template}" >> "diag_table"