Update to use latest code for feature/coupled-crow

README.md

@@ -7,15 +7,9 @@ cd coupled-workflow
 git checkout feature/coupled-crow
 git submodule update --init --recursive     #Update submodules 
 cd sorc
-```
-For coupled:
-```
 sh checkout.sh -c                           #Check out forecast model with COUPLED=YES
 ```
-For aerosols:
-```
-sh checkout.sh -a                           #Check out forecast model with active aerosols
-```
+
 ## Compile code needed to run prototype and link fixed files and executable programs:
 For coupled (UFS APP=S2SW):
 ```

sorc/checkout.sh

@@ -41,7 +41,7 @@ else
   if [[ ! -d ufs_coupled.fd ]] ; then
     git clone https://github.com/ufs-community/ufs-weather-model ufs_coupled.fd >> ${topdir}/checkout-ufs_coupled.log 2>&1
     cd ufs_coupled.fd
-    git checkout 22613e8
+    git checkout 9bbb6d466368d46797e2c72a9d08955fda39cf33 
     git submodule update --init --recursive
     cd ${topdir} 
   else

ush/forecast_postdet.sh

@@ -807,8 +807,8 @@ CICE_postdet() {
 	cice_hist_avg=${cice_hist_avg:-".true."}
 
 	FRAZIL_FWSALT=${FRAZIL_FWSALT:-".true."}
-	ktherm=${ktherm:-1}
-	tfrz_option=${tfrz_option:-"linear_salt"}
+	ktherm=${ktherm:-2}
+	tfrz_option=${tfrz_option:-"mushy"}
 	tr_pond_lvl=${tr_pond_lvl:-".true."} # Use level melt ponds tr_pond_lvl=true
 
 	# restart_pond_lvl (if tr_pond_lvl=true):

ush/nems_configure.sh

@@ -47,6 +47,11 @@ CHMPETS=${CHMPETS:-${ATMPETS}}
 
 USE_MOMMESH=${USE_MOMMESH:-"true"}
 
+if [[ $OCNRES = "100" ]];  then 
+  EPS_IMESH='2.5e-1'
+else 
+  EPS_IMESH='1.0e-1'
+fi
 
 rm -f $DATA/nems.configure
 
@@ -83,7 +88,7 @@ if [ $cplflx = .true. ]; then
 	sed -i -e "s;@\[coupling_interval_fast_sec\];$CPL_FAST;g" tmp1
         sed -i -e "s;@\[RESTART_N\];$restart_interval_nems;g" tmp1
   sed -i -e "s;@\[use_mommesh\];$USE_MOMMESH;g" tmp1
-  sed -i -e "s;@\[eps_imesh\];$ICERESdec;g" tmp1
+  sed -i -e "s;@\[eps_imesh\];$EPS_IMESH;g" tmp1
 fi
 if [ $cplwav = .true. ]; then
 	sed -i -e "s;@\[wav_model\];ww3;g" tmp1

ush/parsing_model_configure_FV3.sh

@@ -19,29 +19,20 @@ fi
 
 rm -f model_configure
 cat >> model_configure <<EOF
-total_member:            $ENS_NUM
 print_esmf:              ${print_esmf:-.true.}
-PE_MEMBER01:             $NTASKS_TOT
 start_year:              ${tPDY:0:4}
 start_month:             ${tPDY:4:2}
 start_day:               ${tPDY:6:2}
 start_hour:              ${tcyc}
 start_minute:            0
 start_second:            0
-fhrot:                   ${IAU_FHROT:-0}
 nhours_fcst:             $FHMAX
-RUN_CONTINUE:            ${RUN_CONTINUE:-".false."}
-ENS_SPS:                 ${ENS_SPS:-".false."}
+fhrot:                   ${IAU_FHROT:-0}
 
 dt_atmos:                $DELTIM
-output_1st_tstep_rst:    .false.
 calendar:                ${calendar:-'julian'}
-cpl:                     ${cpl:-".false."}
-memuse_verbose:          ${memuse_verbose:-".false."}
-atmos_nthreads:          $NTHREADS_FV3
-use_hyper_thread:        ${hyperthread:-".false."}
-ncores_per_node:         $cores_per_node
 restart_interval:        $restart_interval
+output_1st_tstep_rst:    .false.
 
 quilting:                $QUILTING
 write_groups:            ${WRITE_GROUP:-1}
@@ -59,8 +50,6 @@ jchunk3d:                ${jchunk3d:-0}
 kchunk3d:                ${kchunk3d:-0}
 ideflate:                ${ideflate:-1}
 nbits:                   ${nbits:-14}
-write_nemsioflip:        $WRITE_NEMSIOFLIP
-write_fsyncflag:         $WRITE_FSYNCFLAG
 imo:                     $LONB_IMO
 jmo:                     $LATB_JMO
 

ush/parsing_namelists_FV3.sh

@@ -55,11 +55,6 @@ cat > input.nml <<EOF
   chksum_debug = $chksum_debug
   dycore_only = $dycore_only
   ccpp_suite = $CCPP_SUITE
-  fdiag = $FDIAG
-  fhmax = $FHMAX
-  fhout = $FHOUT
-  fhmaxhf = $FHMAX_HF     ! CROW configured
-  fhouthf = $FHOUT_HF     ! CROW configured
   $atmos_model_nml
 /
 
@@ -94,20 +89,20 @@ cat > input.nml <<EOF
   npy = $npy
   ntiles = $ntiles
   npz = $npz
-  dz_min =  ${dz_min:-"6"}    ! CROW configured
-  psm_bc = ${psm_bc:-"1"}    ! CROW configured
+  dz_min =  ${dz_min:-"6"}    
+  psm_bc = ${psm_bc:-"1"}    
   grid_type = -1
   make_nh = $make_nh 
   fv_debug = ${fv_debug:-".false."}
   range_warn = ${range_warn:-".true."}
   reset_eta = .false.
-  n_sponge = ${n_sponge:-"10"}    ! CROW configured
+  n_sponge = ${n_sponge:-"10"}    
   nudge_qv = ${nudge_qv:-".true."}
   nudge_dz = ${nudge_dz:-".false."}
   tau = ${tau:-10.}
   rf_cutoff = ${rf_cutoff:-"7.5e2"}
-  d2_bg_k1 = ${d2_bg_k1:-"0.15"}    ! CROW configured
-  d2_bg_k2 = ${d2_bg_k2:-"0.02"}    ! CROW configured
+  d2_bg_k1 = ${d2_bg_k1:-"0.15"}    
+  d2_bg_k2 = ${d2_bg_k2:-"0.02"}    
   kord_tm = ${kord_tm:-"-9"}
   kord_mt = ${kord_mt:-"9"}
   kord_wz = ${kord_wz:-"9"}
@@ -120,15 +115,15 @@ cat > input.nml <<EOF
   p_fac = 0.1
   k_split = $k_split
   n_split = $n_split
-  nwat = ${nwat:-2}		! CROW configured
+  nwat = ${nwat:-2}		
   na_init = $na_init
   d_ext = 0.
-  dnats = ${dnats:-0}		! CROW configured
+  dnats = ${dnats:-0}		
   fv_sg_adj = ${fv_sg_adj:-"450"}
   d2_bg = 0.
-  nord = ${nord:-3}		! CROW configured
-  dddmp = ${dddmp:-0.1}		! CROW configured
-  d4_bg = ${d4_bg:-0.15}	! CROW configured
+  nord = ${nord:-3}		
+  dddmp = ${dddmp:-0.1}		
+  d4_bg = ${d4_bg:-0.15}	
   vtdm4 = $vtdm4
   delt_max = ${delt_max:-"0.002"}
   ke_bg = 0.
@@ -140,15 +135,15 @@ cat > input.nml <<EOF
   mountain = $mountain
   ncep_ic = $ncep_ic
   d_con = $d_con
-  hord_mt = $hord_mt		! CROW configured
-  hord_vt = $hord_xx		! CROW configured
-  hord_tm = $hord_xx		! CROW configured
-  hord_dp = -$hord_xx		! CROW configured
+  hord_mt = $hord_mt		
+  hord_vt = $hord_xx		
+  hord_tm = $hord_xx		
+  hord_dp = -$hord_xx		
   hord_tr = ${hord_tr:-"8"}	
   adjust_dry_mass = ${adjust_dry_mass:-".true."}
   dry_mass=${dry_mass:-98320.0}
   consv_te = $consv_te
-  do_sat_adj = ${do_sat_adj:-".false."}	! CROW configured
+  do_sat_adj = ${do_sat_adj:-".false."}	
   consv_am = .false.
   fill = .true.
   dwind_2d = .false.
@@ -173,12 +168,12 @@ cat > input.nml <<EOF
 
 &gfs_physics_nml
   fhzero       = $FHZER
-  h2o_phys     = ${h2o_phys:-".true."}	! CROW configured
+  h2o_phys     = ${h2o_phys:-".true."}	
   ldiag3d      = ${ldiag3d:-".false."}
-  fhcyc        = $FHCYC			! CROW configured
+  fhcyc        = $FHCYC			
   use_ufo      = ${use_ufo:-".true."}
   pre_rad      = ${pre_rad:-".false."}
-  imp_physics  = ${imp_physics:-"99"}	! CROW configured
+  imp_physics  = ${imp_physics:-"99"}	
 EOF
 
 case "${CCPP_SUITE:-}" in
@@ -191,18 +186,18 @@ EOF
   "FV3_GSD_v0")
   cat >> input.nml << EOF
   iovr         = ${iovr:-"3"}
-  ltaerosol    = ${ltaerosol:-".F."}    ! In config.fcst
-  lradar       = ${lradar:-".F."}	! In config.fcst
-  ttendlim     = ${ttendlim:-0.005}	! In config.fcst
+  ltaerosol    = ${ltaerosol:-".F."}    
+  lradar       = ${lradar:-".F."}	
+  ttendlim     = ${ttendlim:-0.005}	
   oz_phys      = ${oz_phys:-".false."}
   oz_phys_2015 = ${oz_phys_2015:-".true."}
   lsoil_lsm    = ${lsoil_lsm:-"4"}
   do_mynnedmf  = ${do_mynnedmf:-".false."}
   do_mynnsfclay = ${do_mynnsfclay:-".false."}
-  icloud_bl    = ${icloud_bl:-"1"}	! In config.fcst
-  bl_mynn_edmf = ${bl_mynn_edmf:-"1"}	! In config.fcst
-  bl_mynn_tkeadvect=${bl_mynn_tkeadvect:-".true."}	! In config.fcst
-  bl_mynn_edmf_mom=${bl_mynn_edmf_mom:-"1"}	! In config.fcst
+  icloud_bl    = ${icloud_bl:-"1"}	
+  bl_mynn_edmf = ${bl_mynn_edmf:-"1"}	
+  bl_mynn_tkeadvect=${bl_mynn_tkeadvect:-".true."}	
+  bl_mynn_edmf_mom=${bl_mynn_edmf_mom:-"1"}	
   min_lakeice  = ${min_lakeice:-"0.15"}
   min_seaice   = ${min_seaice:-"0.15"}
 EOF
@@ -248,32 +243,32 @@ cat >> input.nml <<EOF
   pdfcld       = ${pdfcld:-".false."}
   fhswr        = ${FHSWR:-"3600."}
   fhlwr        = ${FHLWR:-"3600."}
-  ialb         = ${IALB:-"1"}           ! In config.fcst
-  iems         = ${IEMS:-"1"}           ! In config.fcst
-  iaer         = $IAER			! In config.fcst
-  icliq_sw     = ${icliq_sw:-"2"}	! In config.fcst
-  ico2         = $ICO2			! In config.fcst
-  isubc_sw     = ${isubc_sw:-"2"}	! In config.fcst
-  isubc_lw     = ${isubc_lw:-"2"}	! In config.fcst
-  isol         = ${ISOL:-"2"}		! In config.fcst
+  ialb         = ${IALB:-"1"}           
+  iems         = ${IEMS:-"1"}           
+  iaer         = $IAER			
+  icliq_sw     = ${icliq_sw:-"2"}	
+  ico2         = $ICO2			
+  isubc_sw     = ${isubc_sw:-"2"}	
+  isubc_lw     = ${isubc_lw:-"2"}	
+  isol         = ${ISOL:-"2"}		
   lwhtr        = ${lwhtr:-".true."}
   swhtr        = ${swhtr:-".true."}
   cnvgwd       = ${cnvgwd:-".true."}
   shal_cnv     = ${shal_cnv:-".true."}
-  cal_pre      = ${cal_pre:-".true."}	! CROW configured
+  cal_pre      = ${cal_pre:-".true."}	
   redrag       = ${redrag:-".true."}
   dspheat      = ${dspheat:-".true."}
   hybedmf      = ${hybedmf:-".false."}
   satmedmf     = ${satmedmf:-".true."}
   isatmedmf    = ${isatmedmf:-"1"}
   lheatstrg    = ${lheatstrg:-".true."}
   lseaspray    = ${lseaspray:-".true."}
-  random_clds  = ${random_clds:-".true."} ! CROW configured
+  random_clds  = ${random_clds:-".true."} 
   trans_trac   = ${trans_trac:-".true."}
   cnvcld       = ${cnvcld:-".true."}
   imfshalcnv   = ${imfshalcnv:-"2"}
   imfdeepcnv   = ${imfdeepcnv:-"2"}
-  cdmbgwd      = ${cdmbgwd:-"3.5,0.25"}   ! CROW configured
+  cdmbgwd      = ${cdmbgwd:-"3.5,0.25"}   
   prslrd0      = ${prslrd0:-"0."}
   ivegsrc      = ${ivegsrc:-"1"}
   isot         = ${isot:-"1"}
@@ -293,12 +288,12 @@ cat >> input.nml <<EOF
   iopt_stc     = ${iopt_stc:-"1"}
   debug        = ${gfs_phys_debug:-".false."}
   nstf_name    = $nstf_name
-  nst_anl      = $nst_anl            ! In Workflow
+  nst_anl      = $nst_anl            
   psautco      = ${psautco:-"0.0008,0.0005"}
   prautco      = ${prautco:-"0.00015,0.00015"}
   lgfdlmprad   = ${lgfdlmprad:-".false."}
   effr_in      = ${effr_in:-".false."}
-  cplwav       = ${cplwav:-".false."}              ! CROW configured
+  cplwav       = ${cplwav:-".false."}              
   ldiag_ugwp   = ${ldiag_ugwp:-".false."}
   do_sppt      = ${DO_SPPT:-".false."}
   do_shum      = ${DO_SHUM:-".false."}
@@ -311,7 +306,7 @@ if [ $cpl = .true. ]; then
   cat >> input.nml << EOF
   cplchm       = ${cplchem:-".false."}
   cplflx       = $cplflx
-  cplwav2atm   = ${cplwav2atm}          ! CROW configured
+  cplwav2atm   = ${cplwav2atm}          
 EOF
 fi
 

workflow/cases/coupled_free_forecast_wave.yaml

@@ -39,11 +39,11 @@ case:
   fv3_gfs_settings:
     CASE: C384
     LEVS: 128
-    DELTIM: 225
+    DELTIM: 300
     min_lakeice: 0.15
     min_seaice: 1.0e-11
     SEEDLET: 10
-    CCPP_SUITE: FV3_GFS_v16_coupled_nsstNoahmpUGWPv1
+    CCPP_SUITE: 'FV3_GFS_v16_coupled_nsstNoahmpUGWPv1'
     CPL_ATMIC: GEFSwithNOAHMP
     nst_anl: yes
     psm_bc: 1

workflow/cases/prototype7.yaml

@@ -39,11 +39,11 @@ case:
   fv3_gfs_settings:
     CASE: C384
     LEVS: 128
-    DELTIM: 225
+    DELTIM: 300
     min_lakeice: 0.15
     min_seaice: 1.0e-11
     SEEDLET: 10
-    CCPP_SUITE: FV3_GFS_v16_coupled_nsstNoahmpUGWPv1
+    CCPP_SUITE: 'FV3_GFS_v16_coupled_nsstNoahmpUGWPv1'
     CPL_ATMIC: GEFSwithNOAHMP
     nst_anl: yes
     psm_bc: 1

workflow/schema/ocn.yaml

@@ -9,7 +9,7 @@ ocn_settings_template: !Template &ocn_settings_template
     description: "model selection for ocean"
   OCNRES:
     type: string
-    allowed: [ '025', '050' ]
+    allowed: [ '025', '050', '100' ]
   CPL_OCNIC:
     type: string
     allowed: [ 'CFSR', 'CPC3Dvar' ]