diff --git a/README.md b/README.md
index 897622067f1..d06083139e6 100644
--- a/README.md
+++ b/README.md
@@ -56,12 +56,17 @@ generate a 3-day run case (test_3d) starting from 2016040100. From the /workflow
 ```
 mkdir -p $EXPROOT
 (Note that $EXPROOT is the experiment directory that has been set in the user.yaml file.)
-./setup_case.sh -p HERA coupled_free_forecast test_3d
+./setup_case.sh -p HERA $CASE test2d
 
 or
 
-./setup_case.sh -p HERA ../cases/coupled_free_forecast.yaml test_3d
+./setup_case.sh -p HERA ../cases/$CASE.yaml test2d
 
+where $CASE is one of the following:
+- prototype_5: Used for UFS S2S Prototype 5 (Runs 35 day cases with atm-ocn-ice-wav coupling)
+- coupled_free_forecast: 2 day tests for atm-ocn-ice coupling 
+- coupled_free_forecast_wave: 2 day test for atm-ocn-ice-wav coupling (same as p5 except shorter) 
+- atm_free_forecast:  Run the atm only case with same ICs as coupled tests 
 
 For Orion: 
 First make sure you have python loaded: 
diff --git a/jobs/JGLOBAL_FORECAST b/jobs/JGLOBAL_FORECAST
index e9ad054024c..5c548973864 100755
--- a/jobs/JGLOBAL_FORECAST
+++ b/jobs/JGLOBAL_FORECAST
@@ -32,6 +32,8 @@ status=$?
 ##############################################
 export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
diff --git a/jobs/JGLOBAL_FORECAST_MEDCOLD b/jobs/JGLOBAL_FORECAST_MEDCOLD
index f7b7737d8b9..4a7fc74c527 100755
--- a/jobs/JGLOBAL_FORECAST_MEDCOLD
+++ b/jobs/JGLOBAL_FORECAST_MEDCOLD
@@ -32,6 +32,9 @@ status=$?
 ##############################################
 export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
+
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
 export DATA=${DATA:-${DATAROOT}/${jobid:?}}
 mkdir -p $DATA
 cd $DATA
diff --git a/jobs/rocoto/coupled_ic.sh b/jobs/rocoto/coupled_ic.sh
index 8e954db8187..f7eb548d9a1 100755
--- a/jobs/rocoto/coupled_ic.sh
+++ b/jobs/rocoto/coupled_ic.sh
@@ -20,6 +20,9 @@ set -x
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
+
 ###############################################################
 # Source relevant configs
 configs="base fv3ic wave"
diff --git a/jobs/rocoto/ocnpost.sh b/jobs/rocoto/ocnpost.sh
index 183fd252814..d99a6420074 100755
--- a/jobs/rocoto/ocnpost.sh
+++ b/jobs/rocoto/ocnpost.sh
@@ -40,6 +40,9 @@ export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
 export jobid=${jobid:-"${outid}.o${pid}"}
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
+
 export DATA="$DATAROOT/${job}.${pid}"
 # DATA dir not used for now.
 
diff --git a/jobs/rocoto/post.sh b/jobs/rocoto/post.sh
index 8325360becb..4595a842bce 100755
--- a/jobs/rocoto/post.sh
+++ b/jobs/rocoto/post.sh
@@ -20,6 +20,8 @@ else
     restart_file=$ROTDIR/${CDUMP}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.logf
 fi
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
 
 #---------------------------------------------------------------
 for fhr in $fhrlst; do
diff --git a/jobs/rocoto/waveinit.sh b/jobs/rocoto/waveinit.sh
index 2111727d6ee..132a359f110 100755
--- a/jobs/rocoto/waveinit.sh
+++ b/jobs/rocoto/waveinit.sh
@@ -7,6 +7,9 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
+
 ###############################################################
 echo
 echo "=============== START TO RUN WAVE INIT ==============="
diff --git a/jobs/rocoto/wavepostsbs.sh b/jobs/rocoto/wavepostsbs.sh
index 751bb9e8c48..0e327a204d4 100755
--- a/jobs/rocoto/wavepostsbs.sh
+++ b/jobs/rocoto/wavepostsbs.sh
@@ -7,6 +7,9 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
+
 ###############################################################
 echo
 echo "=============== START TO RUN WAVE POST_SBS ==============="
diff --git a/jobs/rocoto/waveprep.sh b/jobs/rocoto/waveprep.sh
index faef5533d9b..81cfe7eceab 100755
--- a/jobs/rocoto/waveprep.sh
+++ b/jobs/rocoto/waveprep.sh
@@ -7,6 +7,9 @@ echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ==============="
 status=$?
 [[ $status -ne 0 ]] && exit $status
 
+export DATAROOT="$RUNDIR/$CDATE/$CDUMP"
+[[ ! -d $DATAROOT ]] && mkdir -p $DATAROOT
+
 ###############################################################
 echo
 echo "=============== START TO RUN WAVE PREP ==============="
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index 3b4acb0e268..d2791d540ec 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -497,7 +497,7 @@ if [ $SEND = "YES" ]; then
   fi
 fi
         
-$NCP -p $DATA/input.nml $COMOUT/
+$NCP $DATA/input.nml $ROTDIR/${CDUMP}.${PDY}/${cyc}/
 
 echo "SUB ${FUNCNAME[0]}: Output data for FV3 copied"
 }
@@ -570,7 +570,8 @@ WW3_nml()
 WW3_out()
 {
 	echo "SUB ${FUNCNAME[0]}: Copying output data for WW3"
-	# soft link commands insert here
+        $NCP $DATA/ww3_multi.inp $ROTDIR/${COMPONENTwave}.${PDY}/${cyc}/
+        $NCP $DATA/mod_def.* $ROTDIR/${COMPONENTwave}.${PDY}/${cyc}/
 }
 
 MOM6_postdet()
diff --git a/ush/nems.configure.med_atm_ocn_ice.IN b/ush/nems.configure.med_atm_ocn_ice.IN
index 973a49cecfd..afaea2bb0f0 100755
--- a/ush/nems.configure.med_atm_ocn_ice.IN
+++ b/ush/nems.configure.med_atm_ocn_ice.IN
@@ -42,7 +42,10 @@ ICE_attributes::
   DumpFields = @[DumpFields]
   ProfileMemory = false
   OverwriteSlice = true
-  dbug_flag = 0 
+  mesh_ice = @[MESHICE]
+  stop_n = @[FHMAX]
+  stop_option = nhours
+  stop_ymd = -999
 ::
 
 # CMEPS warm run sequence
@@ -95,4 +98,6 @@ ALLCOMP_attributes::
       restart_n = @[restart_interval_hours]
       restart_option = nhours
       restart_ymd = -999
+      dbug_flag = 0
+      use_coldstart = .true.
 ::
diff --git a/ush/nems.configure.medcold_atm_ocn_ice.IN b/ush/nems.configure.medcold_atm_ocn_ice.IN
index e74920d7098..5c9e736c429 100644
--- a/ush/nems.configure.medcold_atm_ocn_ice.IN
+++ b/ush/nems.configure.medcold_atm_ocn_ice.IN
@@ -42,7 +42,10 @@ ICE_attributes::
   DumpFields = @[DumpFields]
   ProfileMemory = false
   OverwriteSlice = true
-  dbug_flag = 0  
+  mesh_ice = @[MESHICE]
+  stop_n = @[FHMAX]
+  stop_option = nhours
+  stop_ymd = -999
 ::
 
 # CMEPS cold run sequence
@@ -95,4 +98,5 @@ ALLCOMP_attributes::
       restart_n = 1
       restart_option = nhours
       restart_ymd = -999
+      dbug_flag = 0
 ::
diff --git a/ush/parsing_namelists_CICE.sh b/ush/parsing_namelists_CICE.sh
index 66edff52519..98b8d1ba287 100644
--- a/ush/parsing_namelists_CICE.sh
+++ b/ush/parsing_namelists_CICE.sh
@@ -375,17 +375,17 @@ cat > ice_in <<eof
    f_VGRDi         = .false.
    f_VGRDs         = .false.
    f_VGRDb         = .false.
-   f_VGRDa         = .true.
+   f_VGRDa         = .false.
    f_bounds        = .false.
    f_aice          = 'mdhxx' 
    f_hi            = 'mdhxx'
    f_hs            = 'mdhxx' 
    f_Tsfc          = 'mdhxx' 
-   f_sice          = 'mdhxx' 
+   f_sice          = 'x' 
    f_uvel          = 'mdhxx' 
    f_vvel          = 'mdhxx'
-   f_uatm          = 'mdhxx'
-   f_vatm          = 'mdhxx'
+   f_uatm          = 'x'
+   f_vatm          = 'x'
    f_fswdn         = 'mdhxx' 
    f_flwdn         = 'mdhxx'
    f_snowfrac      = 'x'
@@ -395,26 +395,26 @@ cat > ice_in <<eof
    f_rain_ai       = 'x' 
    f_sst           = 'mdhxx' 
    f_sss           = 'mdhxx' 
-   f_uocn          = 'mdhxx' 
-   f_vocn          = 'mdhxx' 
-   f_frzmlt        = 'mdhxx'
+   f_uocn          = 'x' 
+   f_vocn          = 'x' 
+   f_frzmlt        = 'x'
    f_fswfac        = 'mdhxx'
    f_fswint_ai     = 'x'
    f_fswabs        = 'mdhxx' 
    f_fswabs_ai     = 'x' 
    f_albsni        = 'mdhxx' 
-   f_alvdr         = 'mdhxx'
-   f_alidr         = 'mdhxx'
-   f_alvdf         = 'mdhxx'
-   f_alidf         = 'mdhxx'
+   f_alvdr         = 'x'
+   f_alidr         = 'x'
+   f_alvdf         = 'x'
+   f_alidf         = 'x'
    f_alvdr_ai      = 'x'
    f_alidr_ai      = 'x'
    f_alvdf_ai      = 'x'
    f_alidf_ai      = 'x'
-   f_albice        = 'mdhxx'
-   f_albsno        = 'mdhxx'
-   f_albpnd        = 'mdhxx'
-   f_coszen        = 'mdhxx'
+   f_albice        = 'x'
+   f_albsno        = 'x'
+   f_albpnd        = 'x'
+   f_coszen        = 'x'
    f_flat          = 'mdhxx' 
    f_flat_ai       = 'x' 
    f_fsens         = 'mdhxx' 
@@ -428,21 +428,21 @@ cat > ice_in <<eof
    f_Tref          = 'mdhxx' 
    f_Qref          = 'mdhxx'
    f_congel        = 'mdhxx' 
-   f_frazil        = 'mdhxx' 
-   f_snoice        = 'mdhxx' 
-   f_dsnow         = 'mdhxx' 
-   f_melts         = 'mdhxx'
+   f_frazil        = 'x' 
+   f_snoice        = 'x' 
+   f_dsnow         = 'x' 
+   f_melts         = 'x'
    f_meltt         = 'mdhxx'
    f_meltb         = 'mdhxx'
    f_meltl         = 'mdhxx'
-   f_fresh         = 'mdhxx'
+   f_fresh         = 'x'
    f_fresh_ai      = 'x'
-   f_fsalt         = 'mdhxx'
+   f_fsalt         = 'x'
    f_fsalt_ai      = 'x'
-   f_fbot          = 'mdhxx'
-   f_fhocn         = 'mdhxx' 
+   f_fbot          = 'x'
+   f_fhocn         = 'x' 
    f_fhocn_ai      = 'x' 
-   f_fswthru       = 'mdhxx' 
+   f_fswthru       = 'x' 
    f_fswthru_ai    = 'x' 
    f_fsurf_ai      = 'x'
    f_fcondtop_ai   = 'x'
@@ -453,22 +453,22 @@ cat > ice_in <<eof
    f_strtlty       = 'x' 
    f_strcorx       = 'x' 
    f_strcory       = 'x' 
-   f_strocnx       = 'mdhxx' 
-   f_strocny       = 'mdhxx' 
+   f_strocnx       = 'x' 
+   f_strocny       = 'x' 
    f_strintx       = 'x' 
    f_strinty       = 'x'
    f_taubx         = 'x'
    f_tauby         = 'x'
    f_strength      = 'x'
-   f_divu          = 'x'
-   f_shear         = 'x'
+   f_divu          = 'mdhxx'
+   f_shear         = 'mdhxx'
    f_sig1          = 'x' 
    f_sig2          = 'x'
    f_sigP          = 'x' 
-   f_dvidtt        = 'x' 
-   f_dvidtd        = 'x' 
-   f_daidtt        = 'x'
-   f_daidtd        = 'x' 
+   f_dvidtt        = 'mdhxx' 
+   f_dvidtd        = 'mdhxx' 
+   f_daidtt        = 'mdhxx'
+   f_daidtd        = 'mdhxx' 
    f_dagedtt       = 'x'
    f_dagedtd       = 'x'
    f_mlt_onset     = 'mdhxx'
diff --git a/workflow/cases/atm_free_forecast.yaml b/workflow/cases/atm_free_forecast.yaml
new file mode 100644
index 00000000000..600e069044c
--- /dev/null
+++ b/workflow/cases/atm_free_forecast.yaml
@@ -0,0 +1,52 @@
+case:
+  places:
+    workflow_file: layout/free_forecast_gfs.yaml
+    #BASE_CPLIC: /scratch2/NCEPDEV/climate/climpara/S2S/IC
+
+  settings: 
+    SDATE: 2013-04-01t00:00:00
+    EDATE: 2013-04-01t00:00:00
+
+    cplflx: .false.
+    print_esmf: .true.
+    nems_temp: 'atm'
+    nems_temp_cold: 'atm'
+    mom6ic_prepared: .false.
+    KEEPDATA: NO
+    ic_source: coupled_ic
+
+  nsst:
+    NST_MODEL: 0
+
+  output_settings:
+    FHOUT_GFS: 6
+    FHMIN_GFS: 0
+    FHMAX_GFS: 48
+    FHMAX_HF_GFS: 0
+    FHOUT_HF_GFS: -1
+
+  fv3_gfs_settings:
+    CASE: C384
+    LEVS: 65
+    DELTIM: 450
+    SEEDLET: 10
+    CCPP_SUITE: FV3_GFS_v15p2_coupled
+    nst_anl: no
+    DO_SKEB: false
+    DO_SHUM: false
+    DO_SPPT: false
+    layout:
+       x: 6
+       y: 8
+       nth: 2
+       WGRP: 1
+       WGRP_NTASKS: 24
+       WRTIOBUF: "32M"
+    cdmbgwd: "1.0,1.2"
+
+  ice_settings:
+    ICEPETS: 48
+
+  post:
+    downset: 2
+    GOESF: no
diff --git a/workflow/cases/coupled_free_forecast.yaml b/workflow/cases/coupled_free_forecast.yaml
index f0af5bf0ab8..2025df90b32 100644
--- a/workflow/cases/coupled_free_forecast.yaml
+++ b/workflow/cases/coupled_free_forecast.yaml
@@ -13,6 +13,7 @@ case:
     nems_temp_cold: 'medcold_atm_ocn_ice'
     mom6ic_prepared: .false.
     KEEPDATA: NO
+    ic_source: coupled_ic
 
   nsst:
     NST_MODEL: 0
@@ -37,15 +38,15 @@ case:
     DO_SPPT: false
     layout:
        x: 6
-       y: 8
-       nth: 2
+       y: 12
+       nth: 1
        WGRP: 1
        WGRP_NTASKS: 24
        WRTIOBUF: "32M"
     cdmbgwd: "1.0,1.2"
 
   ocn_settings:
-    OCNPETS: 120
+    OCNPETS: 240
 
   ice_settings:
     ICEPETS: 48
diff --git a/workflow/cases/coupled_free_forecast_wave.yaml b/workflow/cases/coupled_free_forecast_wave.yaml
index da8a054fb18..32a81385be0 100644
--- a/workflow/cases/coupled_free_forecast_wave.yaml
+++ b/workflow/cases/coupled_free_forecast_wave.yaml
@@ -14,7 +14,7 @@ case:
     nems_temp: 'med_atm_ocn_ice_wav'
     nems_temp_cold: 'medcold_atm_ocn_ice_wav'
     mom6ic_prepared: .false.
-    KEEPDATA: YES
+    KEEPDATA: NO
 
   nsst:
     NST_MODEL: 0
@@ -39,21 +39,21 @@ case:
     DO_SPPT: false
     layout:
        x: 6
-       y: 8
-       nth: 2
+       y: 12
+       nth: 1
        WGRP: 1
        WGRP_NTASKS: 24
        WRTIOBUF: "32M"
     cdmbgwd: "1.0,1.2"
 
   ocn_settings:
-    OCNPETS: 120
+    OCNPETS: 240
 
   ice_settings:
     ICEPETS: 48
 
   wave_settings: 
-    WAVPETS: 40
+    WAVPETS: 136
 
   post:
     downset: 2
diff --git a/workflow/cases/prototype_5.yaml b/workflow/cases/prototype_5.yaml
new file mode 100644
index 00000000000..4d4ec3bd342
--- /dev/null
+++ b/workflow/cases/prototype_5.yaml
@@ -0,0 +1,60 @@
+case:
+  places:
+    workflow_file: layout/free_forecast_gfs.yaml
+    #BASE_CPLIC: /scratch2/NCEPDEV/climate/climpara/S2S/IC
+
+  settings: 
+    SDATE: 2013-04-01t00:00:00
+    EDATE: 2013-04-01t00:00:00
+
+    cplwav: .true.
+    cplwav2atm: .true.
+    cplflx: .true.
+    print_esmf: .true.
+    nems_temp: 'med_atm_ocn_ice_wav'
+    nems_temp_cold: 'medcold_atm_ocn_ice_wav'
+    mom6ic_prepared: .false.
+    KEEPDATA: NO
+
+  nsst:
+    NST_MODEL: 0
+
+  output_settings:
+    OCN_INTERVAL: 24
+    FHOUT_GFS: 6
+    FHMIN_GFS: 0
+    FHMAX_GFS: 840
+    FHMAX_HF_GFS: 0
+    FHOUT_HF_GFS: -1
+
+  fv3_gfs_settings:
+    CASE: C384
+    LEVS: 65
+    DELTIM: 450
+    SEEDLET: 10
+    CCPP_SUITE: FV3_GFS_v15p2_coupled
+    nst_anl: no
+    DO_SKEB: false
+    DO_SHUM: false
+    DO_SPPT: false
+    layout:
+       x: 6
+       y: 12
+       nth: 1
+       WGRP: 1
+       WGRP_NTASKS: 24
+       WRTIOBUF: "32M"
+    cdmbgwd: "1.0,1.2"
+
+  ocn_settings:
+    OCNPETS: 240
+
+  ice_settings:
+    ICEPETS: 48
+
+  wave_settings: 
+    WAVPETS: 136
+
+  post:
+    downset: 2
+    GOESF: no
diff --git a/workflow/config/base.yaml b/workflow/config/base.yaml
index 47eeca7610b..f4fbaf2a1e8 100644
--- a/workflow/config/base.yaml
+++ b/workflow/config/base.yaml
@@ -101,7 +101,7 @@ config_base:
     export NMV="/bin/mv"
     export NLN="/bin/ln -sf"
     export VERBOSE="YES"
-    export KEEPDATA="{doc.settings.KEEPDATA}"
+    export KEEPDATA="{tools.YES_NO(doc.settings.KEEPDATA)}"
     export CHGRP_CMD="{doc.platform.CHGRP_RSTPROD_COMMAND}"
     export NEMSIOGET="$HOMEgfs/exec/nemsio_get"
 
@@ -118,7 +118,7 @@ config_base:
     export ROTDIR="{doc.places.ROTDIR}"
     export ROTDIR_DUMP="YES"
     export DUMP_SUFFIX="{doc.settings.DUMP_SUFFIX}"
-    export RUNDIR="{doc.places.DATAROOT}"
+    export RUNDIR="{doc.places.RUNDIR}"
     export ARCDIR="$NOSCRUB/archive/$PSLOT"
     export ICSDIR="{doc.places.ICSDIR}"
     export ATARDIR="{doc.archiving.ATARDIR}"
diff --git a/workflow/defaults/places.yaml b/workflow/defaults/places.yaml
index 819a54583ad..d1e7df89665 100644
--- a/workflow/defaults/places.yaml
+++ b/workflow/defaults/places.yaml
@@ -15,6 +15,7 @@ default_places: &default_places
 
   EXPDIR: !expand "{doc.platform.EXPROOT}/{doc.names.experiment}"
   ROTDIR: !expand "{doc.platform.COMROOT}/{doc.names.experiment}"
+  RUNDIR: !expand "{doc.platform.DATAROOT}/{doc.names.experiment}"
   ICSDIR: !expand "{ROTDIR}/FV3ICS"
   BASE_CPLIC: !calc doc.platform.BASE_CPLIC
   DATAROOT: !expand "{doc.platform.DATAROOT}/{doc.names.experiment}"
diff --git a/workflow/defaults/settings.yaml b/workflow/defaults/settings.yaml
index 2f606030fab..6cc11fd270b 100644
--- a/workflow/defaults/settings.yaml
+++ b/workflow/defaults/settings.yaml
@@ -58,6 +58,9 @@ default_settings: &default_settings
       do: .true.
     - otherwise: .false.
 
+  ic_source: coupled_ic  # choices: coupled_ic, fv3_ic; default: coupled_ic. This option controls which
+                         # script will be used for IC preparation: coupled_ic.sh or fv3_ic.sh
+
   mom6ic_prepared: .false. # If set True, User need to manually copy mom6ic files into ROTIDR
 
   DOIAU: NO
diff --git a/workflow/defaults/wave.yaml b/workflow/defaults/wave.yaml
index 063276cfa6b..f95b91ec924 100644
--- a/workflow/defaults/wave.yaml
+++ b/workflow/defaults/wave.yaml
@@ -2,7 +2,7 @@ wave_defaults: &wave_defaults
    MOD: ww3
    CPL_WAVIC: CFSR
    WAVPETS: !FirstTrue
-     - when: !calc doc.settings.cplwav
+     - when: !calc doc.settings.cplwav==".true."
        do: 24
      - otherwise: 0
    COMPONENTRSTwave: gdaswave
diff --git a/workflow/layout/free_forecast_gfs.yaml b/workflow/layout/free_forecast_gfs.yaml
index 5064b1de80d..abafc158a7f 100644
--- a/workflow/layout/free_forecast_gfs.yaml
+++ b/workflow/layout/free_forecast_gfs.yaml
@@ -16,7 +16,7 @@ suite: !Cycle
       <<: *service_task_template
       RUN: 'gfs'
 #      Disable: !calc doc.settings.get("IC_CDUMP","")
-      Disable: !calc doc.settings.get("IC_CDUMP","") or doc.settings.cpl=='.true.'
+      Disable: !calc doc.settings.get("IC_CDUMP","") or doc.settings.cpl=='.true.' or doc.settings.ic_source=='coupled_ic'
       resources: !calc partition.resources.run_getic
       J_JOB: rocoto/getic.sh
       ecf_module_commands: "# getics.sh will load modules instead"
@@ -26,7 +26,7 @@ suite: !Cycle
       <<: *exclusive_task_template
       RUN: 'gfs'
 #      Disable: !calc not doc.settings.chgres_and_convert_ics
-      Disable: !calc doc.settings.chgres_and_convert_ics=='.false.' or doc.settings.cpl=='.true.'
+      Disable: !calc doc.settings.chgres_and_convert_ics=='.false.' or doc.settings.cpl=='.true.' or doc.settings.ic_source=='coupled_ic'
       Trigger: !Depend jgfs_emc_getics
       resources: !calc partition.resources.run_fv3ic
       J_JOB: rocoto/crow_fv3ic.sh
@@ -36,7 +36,7 @@ suite: !Cycle
     jgfs_emc_mom6ic: !Task
       <<: *exclusive_task_template
       RUN: 'gfs'
-      Disable: !calc doc.settings.cplflx=='.false.' or not doc.settings.chgres_and_convert_ics
+      Disable: !calc doc.settings.cplflx=='.false.' and not doc.settings.chgres_and_convert_ics and doc.settings.ic_source=='fv3_ic'
       Trigger: !Depend jgfs_emc_getics
       resources: !calc partition.resources.run_fv3ic
       J_JOB: rocoto/coupled_ic.sh
@@ -161,7 +161,7 @@ suite: !Cycle
 
     ocnpost: !TaskArray
       RUN: !calc up.RUN
-      Disable: !calc not doc.settings.cplflx
+      Disable: !calc doc.settings.cplflx==".false."
       Dimensions:
         fhr: !calc doc.output_settings.ocnpost_hours
       jgfs_ocnpost_fhr_el: !TaskElement