Merge remote-tracking branch 'origin/develop' into ss160

.gitignore

@@ -91,6 +91,11 @@ parm/post/postxconfig-NT-GFS.txt
 parm/post/postxconfig-NT-gefs-aerosol.txt
 parm/post/postxconfig-NT-gefs-chem.txt
 parm/ufs/noahmptable.tbl
+parm/ufs/model_configure.IN
+parm/ufs/MOM_input_*.IN
+parm/ufs/MOM6_data_table.IN
+parm/ufs/ice_in.IN
+parm/ufs/ufs.configure.*.IN
 parm/wafs
 
 # Ignore sorc and logs folders from externals

ci/cases/weekly/C384_S2SWA.yaml

@@ -6,7 +6,7 @@ arguments:
   pslot: {{ 'pslot' | getenv }}
   app: S2SWA
   resdetatmos: 384
-  resdetocean: 0.5
+  resdetocean: 0.25
   comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
   idate: 2016070100

env/HERA.env

@@ -18,6 +18,8 @@ export npe_node_max=40
 export launcher="srun -l --export=ALL"
 export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 
+#export POSTAMBLE_CMD='report-mem'
+
 # Configure MPI environment
 #export I_MPI_ADJUST_ALLREDUCE=5
 #export MPI_BUFS_PER_PROC=2048

jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT

@@ -3,7 +3,7 @@ source "${HOMEgfs}/ush/preamble.sh"
 export WIPE_DATA="NO"
 
 export DATA="${DATAROOT}/${RUN}ocnanal_${cyc}"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalrun" -c "base ocnanal ocnanalrun"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalbmat" -c "base ocnanal ocnanalbmat"
 
 
 ##############################################

jobs/JGLOBAL_ARCHIVE

@@ -19,7 +19,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
   COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_RESTART COM_OCEAN_XSECT COM_OCEAN_2D COM_OCEAN_3D \
   COM_OCEAN_ANALYSIS \
   COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION \
-  COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON
+  COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON COM_CONF
 
 for grid in "0p25" "0p50" "1p00"; do
   YMD=${PDY} HH=${cyc} GRID=${grid} generate_com -rx "COM_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"

parm/config/gefs/config.atmos_products

@@ -0,0 +1,28 @@
+#! /usr/bin/env bash
+
+########## config.atmos_products ##########
+# atmosphere grib2 products specific
+
+echo "BEGIN: config.atmos_products"
+
+# Get task specific resources
+. "${EXPDIR}/config.resources" atmos_products
+
+# No. of forecast hours to process in a single job
+export NFHRS_PER_GROUP=3
+
+# Scripts used by this job
+export INTERP_ATMOS_MASTERSH="${HOMEgfs}/ush/interp_atmos_master.sh"
+export INTERP_ATMOS_SFLUXSH="${HOMEgfs}/ush/interp_atmos_sflux.sh"
+
+export downset=2
+export FHOUT_PGBS=${FHOUT_GFS:-3}  # Output frequency of supplemental gfs pgb file at 1.0 and 0.5 deg
+export FLXGF="NO"  # Create interpolated sflux.1p00 file
+
+# paramlist files for the different forecast hours and downsets
+export paramlista="${HOMEgfs}/parm/product/gefs.0p25.fFFF.paramlist.a.txt"
+export paramlista_anl="${HOMEgfs}/parm/product/gefs.0p25.anl.paramlist.a.txt"
+export paramlista_f000="${HOMEgfs}/parm/product/gefs.0p25.f000.paramlist.a.txt"
+export paramlistb="${HOMEgfs}/parm/product/gefs.0p25.fFFF.paramlist.b.txt"
+
+echo "END: config.atmos_products"

parm/config/gefs/config.base.emc.dyn

@@ -218,6 +218,7 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4:
 
 # GFS output and frequency
 export FHMIN_GFS=0
+export FHMIN=${FHMIN_GFS}
 
 export FHMAX_GFS_00=120
 export FHMAX_GFS_06=120
@@ -270,7 +271,7 @@ export NMEM_ENS=@NMEM_ENS@
 
 # set default member number memdir for control
 # this will be overwritten for the perturbed members
-export ENSMEM="000"
+export ENSMEM=${ENSMEM:-"000"}
 export MEMDIR="mem${ENSMEM}"
 
 export DOIAU="NO"  # While we are not doing IAU, we may want to warm start w/ IAU in the future

parm/config/gefs/config.fcst

@@ -231,20 +231,6 @@ export FSICL="0"
 export FSICS="0"
 
 #---------------------------------------------------------------------
-
-# ideflate: netcdf zlib lossless compression (0-9): 0 no compression
-# nbits: netcdf lossy compression level (0-32): 0 lossless
-export ideflate=1
-export nbits=14
-export ishuffle=0
-# compression for RESTART files written by FMS
-export shuffle=1
-export deflate_level=1
-
-#---------------------------------------------------------------------
-# Disable the use of coupler.res; get model start time from model_configure
-export USE_COUPLER_RES="NO"
-
 # Write more variables to output
 export DIAG_TABLE="${HOMEgfs}/parm/ufs/fv3/diag_table"