Merge branch 'develop' into cpld_s2sw_wavice

tests/default_vars.sh

@@ -695,48 +695,53 @@ export_fv3 ()
  export CA_SGS=.false.
  export CA_GLOBAL=.false.
 
-#waves
-export WW3_RSTDTHR=12
-export WW3_DT_2_RST="$(printf "%02d" $(( ${WW3_RSTDTHR}*3600 )))"
-export WW3_OUTDTHR=1
-export WW3_DTFLD="$(printf "%02d" $(( ${WW3_OUTDTHR}*3600 )))"
-export WW3_DTPNT="$(printf "%02d" $(( ${WW3_OUTDTHR}*3600 )))"
-export DTRST=0
-export RSTTYPE=T
-export GOFILETYPE=1
-export POFILETYPE=1
-export WW3_OUTPARS="WND HS FP DP PHS PTP PDIR"
-export CPLILINE='$'
-export ICELINE='$'
-export WINDLINE='$'
-export CURRLINE='$'
-export NFGRIDS=0
-export NMGRIDS=1
-export WW3GRIDLINE="'glo_1deg' 'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no' 1 1 0.00 1.00 F"
-export FUNIPNT=T
-export IOSRV=1
-export FPNTPROC=T
-export FGRDPROC=T
-export UNIPOINTS='points'
-export FLAGMASKCOMP=' F'
-export FLAGMASKOUT=' F'
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000"
-export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000"
-export OUT_BEG=$RUN_BEG
-export OUT_END=$RUN_END
-export RST_BEG=$RUN_BEG
-export RST_2_BEG=$RUN_BEG
-export RST_END=$RUN_END
-export RST_2_END=$RUN_END
-export WW3_CUR='F'
-export WW3_ICE='F'
-export WW3_IC1='F'
-export WW3_IC5='F'
-export wav_coupling_to_cice=false
-# ATMW
-export WW3_MULTIGRID=true
-export WW3_MODDEF=mod_def.glo_1deg
-export MESH_WAV=mesh.glo_1deg.nc
+ #waves
+ export WW3_RSTDTHR=12
+ WW3_DT_2_RST="$(printf "%02d" $(( WW3_RSTDTHR*3600 )))"
+ export WW3_DT_2_RST
+ export WW3_OUTDTHR=1
+ WW3_DTFLD="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+ export WW3_DTFLD
+ WW3_DTPNT="$(printf "%02d" $(( WW3_OUTDTHR*3600 )))"
+ export WW3_DTPNT
+ export DTRST=0
+ export RSTTYPE=T
+ export GOFILETYPE=1
+ export POFILETYPE=1
+ export WW3_OUTPARS="WND HS FP DP PHS PTP PDIR"
+ export CPLILINE='$'
+ export ICELINE='$'
+ export WINDLINE='$'
+ export CURRLINE='$'
+ export NFGRIDS=0
+ export NMGRIDS=1
+ export WW3GRIDLINE="'glo_1deg' 'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no' 1 1 0.00 1.00 F"
+ export FUNIPNT=T
+ export IOSRV=1
+ export FPNTPROC=T
+ export FGRDPROC=T
+ export UNIPOINTS='points'
+ export FLAGMASKCOMP=' F'
+ export FLAGMASKOUT=' F'
+ RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR )))0000"
+ export RUN_BEG
+ RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( SHOUR )))0000"
+ export RUN_END
+ export OUT_BEG=${RUN_BEG}
+ export OUT_END=${RUN_END}
+ export RST_BEG=${RUN_BEG}
+ export RST_2_BEG=${RUN_BEG}
+ export RST_END=${RUN_END}
+ export RST_2_END=${RUN_END}
+ export WW3_CUR='F'
+ export WW3_ICE='F'
+ export WW3_IC1='F'
+ export WW3_IC5='F'
+ export wav_coupling_to_cice=false
+ # ATMW
+ export WW3_MULTIGRID=true
+ export WW3_MODDEF=mod_def.glo_1deg
+ export MESH_WAV=mesh.glo_1deg.nc
 
  # ATMA
  export AOD_FRQ=060000
@@ -786,35 +791,39 @@ export_cice6() {
  export CICE_HISTORY_DEFLATE=0
  export CICE_HISTORY_PREC=4
 
-export CICE_DUMPFREQ=d
-export CICE_DUMPFREQ_N=1000
-export CICE_DIAGFREQ=`expr $FHMAX \* 3600 / $DT_CICE`
-export CICE_HISTFREQ_N="0, 0, 6, 1, 1"
-export CICE_HIST_AVG=.true.
-export CICE_HISTORY_DIR=./history/
-export CICE_INCOND_DIR=./history/
-export CICE_GRID=grid_cice_NEMS_mx${OCNRES}.nc
-export CICE_MASK=kmtu_cice_NEMS_mx${OCNRES}.nc
-export CICE_GRIDATM=A
-export CICE_GRIDOCN=A
-export CICE_GRIDICE=B
-export CICE_TR_POND_LVL=.true.
-export CICE_RESTART_POND_LVL=.false.
-# setting to true will allow Frazil FW and Salt to be included in fluxes sent to ocean
-export CICE_FRAZIL_FWSALT=.true.
-export CICE_KTHERM=2
-export CICE_TFREEZE_OPTION=mushy
-#Wave-ice coupling variables
-export CICE_nfsd=1
-export CICE_tr_fsd=.false.
-export CICE_restart_fsd=.false.
-export CICE_wave_spec_type=none
-# SlenderX2
-export CICE_NPROC=$ICE_tasks
-export np2=`expr $CICE_NPROC / 2`
-export CICE_BLCKX=`expr $NX_GLB / $np2`
-export CICE_BLCKY=`expr $NY_GLB / 2`
-export CICE_DECOMP=slenderX2
+ export CICE_DUMPFREQ=d
+ export CICE_DUMPFREQ_N=1000
+ CICE_DIAGFREQ=$(( (FHMAX*3600)/DT_CICE ))
+ export CICE_DIAGFREQ
+ export CICE_HISTFREQ_N="0, 0, 6, 1, 1"
+ export CICE_HIST_AVG=.true.
+ export CICE_HISTORY_DIR=./history/
+ export CICE_INCOND_DIR=./history/
+ export CICE_GRID=grid_cice_NEMS_mx${OCNRES}.nc
+ export CICE_MASK=kmtu_cice_NEMS_mx${OCNRES}.nc
+ export CICE_GRIDATM=A
+ export CICE_GRIDOCN=A
+ export CICE_GRIDICE=B
+ export CICE_TR_POND_LVL=.true.
+ export CICE_RESTART_POND_LVL=.false.
+ # setting to true will allow Frazil FW and Salt to be included in fluxes sent to ocean
+ export CICE_FRAZIL_FWSALT=.true.
+ export CICE_KTHERM=2
+ export CICE_TFREEZE_OPTION=mushy
+ #Wave-ice coupling variables
+ export CICE_nfsd=1
+ export CICE_tr_fsd=.false.
+ export CICE_restart_fsd=.false.
+ export CICE_wave_spec_type=none
+ # SlenderX2
+ export CICE_NPROC=${ICE_tasks}
+ np2=$((CICE_NPROC/2))
+ CICE_BLCKX=$((NX_GLB/np2))
+ CICE_BLCKY=$((NY_GLB/2))
+ export np2
+ export CICE_BLCKX
+ export CICE_BLCKY
+ export CICE_DECOMP=slenderX2
 }
 
 # Defaults for the MOM6 model namelist, mx100