Bring in g-w changes PR

tests/tests/cpld_control_gefs

@@ -50,11 +50,13 @@ export LIST_FILES="sfcf012.nc \
                    RESTART/ufs.cpld.cpl.r.2021-03-25-64800.nc"
 
 export ATMRES=C384 #needed for default_vars
+export DT_ATMOS=300
 
 export_fv3
-export_cpl
 export_ugwpv1
+export_cpl
 
+#IC
 export SYEAR=2021
 export SMONTH=03
 export SDAY=25
@@ -65,17 +67,19 @@ export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $((
 
 export BMIC=.true.
 
+#Simulation length and output
 export DAYS=0.5
 export FHMAX=12
 export RESTART_N=3
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH="3 -1"
 export FHZERO=3
+export WRITE_DOPOST=.true.
 
+#tasks
 export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
 export WRTTASK_PER_GROUP=$(( WPG_cpl_bmrk * THRD_cpl_bmrk ))
-export WRITE_DOPOST=.true.
 
 export OCN_tasks=${OCN_tasks_cpl_bmrk}
 export ICE_tasks=${ICE_tasks_cpl_bmrk}
@@ -89,7 +93,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
 export wav_omp_num_threads=$WAV_thrds_cpl_bmrk
 
 # atm/ocn/ice resolution
-export ATMRES=C384 #over-written in export_cpl
 export NPX=385
 export NPY=385
 export IMO=1536
@@ -118,18 +121,16 @@ export MESH_WAV=mesh.${WW3_DOMAIN}.nc
 export WW3_MODDEF=mod_def.${WW3_DOMAIN}
 
 # set component and coupling timesteps
-export DT_ATMOS=300
+#export DT_ATMOS=300
 export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
 export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
-
-# ufs.configure
 export coupling_interval_slow_sec=${DT_THERM_MOM6}
 export coupling_interval_fast_sec=${DT_ATMOS}
 
-# resolution dependent files
+# resolution dependent "fix" files
 #atm
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"
@@ -156,6 +157,7 @@ export MOM6_DIAG_COORD_DEF_Z_FILE=interpolate_zgrid_26L.nc
 #
 
 #IAUs
+export HIDE_IAU=' '
 export READ_INCREMENT=.true.
 export RES_LATLON_DYNAMICS="'fv3_increment.nc'"
 export IAU_INC_FILES="'fv3_increment.nc'"
@@ -173,6 +175,11 @@ export ODA_UINC_VAR="'u_pert'"
 export ODA_VINC_VAR="'v_pert'"
 
 #stochastic physics
+export HIDE_SPPT=' '
+export HIDE_SKEB=' '
+export HIDE_SHUM=' '
+export HIDE_OCNSPPT=' '
+export HIDE_EPBL=' '
 export STOCHINI=.true.
 export DO_SPPT=.true.
 export DO_SHUM=.false.
@@ -217,7 +224,7 @@ export CICE_RUNTYPE=continue
 export CICE_USE_RESTART_TIME=.true.
 export MOM6_RESTART_SETTING=r
 
-#from ep5rt_ic/input.nml
+#settings from ep5rt_ic/input.nml
 export NSTF_NAME=2,0,0,0,0
 export CDMBWD="5.0,5.0,1.0,1.0"
 export K_SPLIT=2
@@ -235,6 +242,7 @@ export IAER=2011
 export DOGP_CLDOPTICS_LUT=.false.
 export DOGP_LWSCAT=.false.
 
+#model configurations
 export FV3_RUN=cpld_control_run.IN
 export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 export FIELD_TABLE=field_table_gefsv13