Merge branch 'develop' into ci_unit-tests

Author: TerrenceMcGuinness-NOAA

ci/cases/gfsv17/C384mx025_3DVarAOWCDA.yaml

@@ -0,0 +1,18 @@
+experiment:
+  system: gfs
+  mode: cycled
+
+arguments:
+  pslot: {{ 'pslot' | getenv }}
+  app: S2S
+  resdetatmos: 384
+  resdetocean: 0.25
+  nens: 0
+  gfs_cyc: 4
+  start: cold
+  comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
+  expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
+  idate: 2021063000
+  edate: 2021070306
+  icsdir: /scratch1/NCEPDEV/climate/Jessica.Meixner/cycling/IC_2021063000_V2
+  yaml: {{ HOMEgfs }}/ci/cases/gfsv17/ocnanal.yaml

ci/cases/gfsv17/ocnanal.yaml

@@ -0,0 +1,30 @@
+defaults:
+  !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
+
+base:
+  DOIAU: "YES"
+  DO_JEDIATMVAR: "NO"
+  DO_JEDIATMENS: "NO"
+  DO_JEDIOCNVAR: "YES"
+  DO_JEDISNOWDA: "NO"
+  DO_MERGENSST: "NO"
+  DOHYBVAR: "NO"
+  DO_FIT2OBS: "YES"
+  DO_VERFOZN: "YES"
+  DO_VERFRAD: "YES"
+  DO_VRFY_OCEANDA: "NO"
+  FHMAX_GFS: 240
+
+ocnanal:
+  SOCA_INPUT_FIX_DIR: /scratch2/NCEPDEV/ocean/Guillaume.Vernieres/data/static/1440x1080x75/soca
+  CASE_ANL: 'C24'
+  SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
+  SOCA_NINNER: 100
+  SABER_BLOCKS_YAML: ''
+  NICAS_RESOL: 1
+  NICAS_GRID_SIZE: 15000
+
+prepoceanobs:
+  SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml 
+  OBSPREP_YAML: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obsprep/obsprep_config.yaml
+  DMPDIR: /scratch1/NCEPDEV/da/common/

jobs/JGLOBAL_FORECAST

@@ -35,34 +35,51 @@ declare -rx gPDY="${GDATE:0:8}"
 declare -rx gcyc="${GDATE:8:2}"
 
 # Construct COM variables from templates (see config.com)
-YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_ATMOS_RESTART COM_ATMOS_INPUT COM_ATMOS_ANALYSIS \
-  COM_ICE_ANALYSIS COM_ATMOS_HISTORY COM_ATMOS_MASTER COM_TOP COM_CONF
+YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \
+  COMIN_ATMOS_INPUT:COM_ATMOS_INPUT_TMPL \
+  COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+  COMOUT_CONF:COM_CONF_TMPL \
+  COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL \
+  COMOUT_ATMOS_HISTORY:COM_ATMOS_HISTORY_TMPL \
+  COMOUT_ATMOS_MASTER:COM_ATMOS_MASTER_TMPL
 
 RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \
-  COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
+  COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
 if [[ "${DO_WAVE}" == "YES" ]]; then
-  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_WAVE_RESTART COM_WAVE_PREP COM_WAVE_HISTORY
+  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \
+    COMIN_WAVE_PREP:COM_WAVE_PREP_TMPL \
+    COMOUT_WAVE_RESTART:COM_WAVE_RESTART_TMPL \
+    COMOUT_WAVE_HISTORY:COM_WAVE_HISTORY_TMPL
   RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \
-    COM_WAVE_RESTART_PREV:COM_WAVE_RESTART_TMPL
+    COMIN_WAVE_RESTART_PREV:COM_WAVE_RESTART_TMPL
 fi
 
 if [[ "${DO_OCN}" == "YES" ]]; then
-  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_MED_RESTART COM_OCEAN_RESTART COM_OCEAN_INPUT \
-    COM_OCEAN_HISTORY COM_OCEAN_ANALYSIS
+  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \
+    COMIN_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \
+    COMIN_OCEAN_INPUT:COM_OCEAN_INPUT_TMPL \
+    COMOUT_MED_RESTART:COM_MED_RESTART_TMPL \
+    COMOUT_OCEAN_RESTART:COM_OCEAN_RESTART_TMPL \
+    COMOUT_OCEAN_HISTORY:COM_OCEAN_HISTORY_TMPL
   RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \
-    COM_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL \
-    COM_MED_RESTART_PREV:COM_MED_RESTART_TMPL
+    COMIN_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL \
+    COMIN_MED_RESTART_PREV:COM_MED_RESTART_TMPL
 fi
 
 if [[ "${DO_ICE}" == "YES" ]]; then
-  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_ICE_HISTORY COM_ICE_INPUT COM_ICE_RESTART
+  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \
+    COMIN_ICE_INPUT:COM_ICE_INPUT_TMPL \
+    COMIN_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL \
+    COMOUT_ICE_RESTART:COM_ICE_RESTART_TMPL \
+    COMOUT_ICE_HISTORY:COM_ICE_HISTORY_TMPL
   RUN="${rCDUMP}" YMD="${gPDY}" HH="${gcyc}" declare_from_tmpl -rx \
-    COM_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL
+    COMIN_ICE_RESTART_PREV:COM_ICE_RESTART_TMPL
 fi
 
 if [[ "${DO_AERO}" == "YES" ]]; then
-  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx COM_CHEM_HISTORY
+  YMD="${PDY}" HH="${cyc}" declare_from_tmpl -rx \
+    COMOUT_CHEM_HISTORY:COM_CHEM_HISTORY_TMPL
 fi
 
 
@@ -79,7 +96,7 @@ if [[ "${RUN}" =~ "enkf" ]] && [[ "${SENDDBN:-}" == YES ]]; then
   for (( fhr = FHOUT; fhr <= FHMAX; fhr + FHOUT )); do
     if (( fhr % 3 == 0 )); then
       fhr3=$(printf %03i "${fhr}")
-      "${DBNROOT}/bin/dbn_alert" MODEL GFS_ENKF "${job}" "${COM_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${fhr3}.nc"
+      "${DBNROOT}/bin/dbn_alert" MODEL GFS_ENKF "${job}" "${COMOUT_ATMOS_HISTORY}/${RUN}.t${cyc}z.sfcf${fhr3}.nc"
     fi
   done
 fi

parm/config/gefs/config.base

@@ -13,10 +13,12 @@ export RUN_ENVIR="emc"
 
 # Account, queue, etc.
 export ACCOUNT="@ACCOUNT@"
+export ACCOUNT_SERVICE="@ACCOUNT_SERVICE@"
 export QUEUE="@QUEUE@"
 export QUEUE_SERVICE="@QUEUE_SERVICE@"
 export PARTITION_BATCH="@PARTITION_BATCH@"
 export PARTITION_SERVICE="@PARTITION_SERVICE@"
+export RESERVATION="@RESERVATION@"
 
 # Project to use in mass store:
 export HPSS_PROJECT="@HPSS_PROJECT@"
@@ -163,7 +165,7 @@ case "${CASE}" in
         export waveGRD='glo_500'
         ;;
     "C96" | "C192")
-        export waveGRD='glo_200'
+        export waveGRD='glo_100'
         ;;
     "C384")
         export waveGRD='glo_025'

parm/config/gefs/config.ufs

@@ -15,7 +15,7 @@ if (( $# <= 1 )); then
     echo "--fv3 C48|C96|C192|C384|C768|C1152|C3072"
     echo "--mom6 500|100|025"
     echo "--cice6 500|100|025"
-    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025"
+    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|glo_100"
     echo "--gocart"
 
     exit 1
@@ -456,6 +456,10 @@ if [[ "${skip_ww3}" == "false" ]]; then
     "glo_025")
       ntasks_ww3=262
       ;;
+    "glo_100")
+      ntasks_ww3=20
+      nthreads_ww3=1
+      ;;
     "glo_200")
       ntasks_ww3=30
       nthreads_ww3=1

parm/config/gefs/config.wave

@@ -56,6 +56,12 @@ case "${waveGRD}" in
     export wavepostGRD='glo_025'
     export waveuoutpGRD=${waveGRD}
     ;;
+  "glo_100")
+    #Global regular lat/lon 1deg deg grid
+    export waveinterpGRD=''
+    export wavepostGRD='glo_100'
+    export waveuoutpGRD=${waveGRD}
+    ;;
   "glo_200")
     #Global regular lat/lon 2deg deg grid
     export waveinterpGRD=''

parm/config/gfs/config.base

@@ -13,10 +13,12 @@ export RUN_ENVIR="emc"
 
 # Account, queue, etc.
 export ACCOUNT="@ACCOUNT@"
+export ACCOUNT_SERVICE="@ACCOUNT_SERVICE@"
 export QUEUE="@QUEUE@"
 export QUEUE_SERVICE="@QUEUE_SERVICE@"
 export PARTITION_BATCH="@PARTITION_BATCH@"
 export PARTITION_SERVICE="@PARTITION_SERVICE@"
+export RESERVATION="@RESERVATION@"
 
 # Project to use in mass store:
 export HPSS_PROJECT="@HPSS_PROJECT@"

parm/config/gfs/config.ufs

@@ -15,7 +15,7 @@ if (( $# <= 1 )); then
     echo "--fv3 C48|C96|C192|C384|C768|C1152|C3072"
     echo "--mom6 500|100|025"
     echo "--cice6 500|100|025"
-    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|uglo_100km|uglo_m1g16"
+    echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_100|glo_200|glo_500|mx025|uglo_100km|uglo_m1g16"
     echo "--gocart"
 
     exit 1
@@ -561,6 +561,10 @@ if [[ "${skip_ww3}" == "false" ]]; then
     "glo_025")
       ntasks_ww3=262
       ;;
+    "glo_100")
+      ntasks_ww3=20
+      nthreads_ww3=1
+      ;;
     "glo_200")
       ntasks_ww3=30
       nthreads_ww3=1

parm/config/gfs/config.wave

@@ -56,6 +56,12 @@ case "${waveGRD}" in
     export wavepostGRD='glo_025'
     export waveuoutpGRD=${waveGRD}
     ;;
+  "glo_100")
+    #Global regular lat/lon 1deg deg grid
+    export waveinterpGRD=''
+    export wavepostGRD='glo_100'
+    export waveuoutpGRD=${waveGRD}
+    ;;
   "glo_200")
     #Global regular lat/lon 2deg deg grid
     export waveinterpGRD=''

parm/wave/ww3_grib2.glo_100.inp.tmpl

@@ -0,0 +1,9 @@
+$ WAVEWATCH-III gridded output input file 
+$ ----------------------------------------
+TIME DT NT
+N
+FLAGS
+$
+TIME  7 MODNR GRIDNR 0 0
+$
+$ end of input file

scripts/exgfs_wave_post_gridded_sbs.sh

@@ -287,6 +287,7 @@ source "${USHgfs}/preamble.sh"
               glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
               reg025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
               glo_025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
+              glo_100) GRDNAME='global' ; GRDRES=1p00 ; GRIDNR=255  ; MODNR=11 ;;
               glo_200) GRDNAME='global' ; GRDRES=2p00 ; GRIDNR=255  ; MODNR=11 ;;
               glo_500) GRDNAME='global' ; GRDRES=5p00 ; GRIDNR=255  ; MODNR=11 ;;
               glo_30mxt) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=11 ;;
@@ -321,7 +322,8 @@ source "${USHgfs}/preamble.sh"
               glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
               reg025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11   ;;
               glo_025) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
-              glo_200) GRDNAME='global' ; GRDRES=2p00 ; GRIDNR=255  ; MODNR=11 ;;
+              glo_100) GRDNAME='global' ; GRDRES=1p00 ; GRIDNR=255  ; MODNR=11 ;;
+	      glo_200) GRDNAME='global' ; GRDRES=2p00 ; GRIDNR=255  ; MODNR=11 ;;
               glo_500) GRDNAME='global' ; GRDRES=5p00 ; GRIDNR=255  ; MODNR=11 ;;
               gwes_30m) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=10 ;;
           esac

ush/forecast_det.sh

@@ -6,7 +6,7 @@ UFS_det(){
   echo "SUB ${FUNCNAME[0]}: Run type determination for UFS"
 
   # Determine if the current cycle is a warm start (based on the availability of restarts)
-  if [[ -f "${COM_ATMOS_RESTART_PREV}/${model_start_date_current_cycle:0:8}.${model_start_date_current_cycle:8:2}0000.coupler.res" ]]; then
+  if [[ -f "${COMIN_ATMOS_RESTART_PREV}/${model_start_date_current_cycle:0:8}.${model_start_date_current_cycle:8:2}0000.coupler.res" ]]; then
     warm_start=".true."
   fi 
 
@@ -16,8 +16,8 @@ UFS_det(){
     # Since restarts are not available from the previous cycle, this is likely a cold start
     # Ensure cold start ICs are present when warm start is not set
     # TODO: add checks for other cold start ICs as well
-    if [[ ! -f "${COM_ATMOS_INPUT}/gfs_ctrl.nc" ]]; then
-      echo "FATAL ERROR: Cold start ICs are missing from '${COM_ATMOS_INPUT}'"
+    if [[ ! -f "${COMIN_ATMOS_INPUT}/gfs_ctrl.nc" ]]; then
+      echo "FATAL ERROR: Cold start ICs are missing from '${COMIN_ATMOS_INPUT}'"
       exit 1
     fi