Merging head of NOAA-EMC develop

jobs/JREGIONAL_GET_EXTRN_MDL_FILES

@@ -206,7 +206,7 @@ cd_vrfy "${extrn_mdl_staging_dir}"
 get_extrn_mdl_file_dir_info \
   extrn_mdl_name="${EXTRN_MDL_NAME}" \
   anl_or_fcst="${anl_or_fcst}" \
-  cdate_FV3SAR="${CDATE}" \
+  cdate_FV3LAM="${CDATE}" \
   time_offset_hrs="${time_offset_hrs}" \
   varname_extrn_mdl_cdate="extrn_mdl_cdate" \
   varname_extrn_mdl_lbc_spec_fhrs="extrn_mdl_lbc_spec_fhrs" \

jobs/JREGIONAL_MAKE_GRID

@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------
 #
 # This script generates grid and orography files in NetCDF format that
-# are required as inputs for running the FV3SAR model (i.e. the FV3 mo-
+# are required as inputs for running the FV3-LAM model (i.e. the FV3 mo-
 # del on a regional domain).  It in turn calls three other scripts whose
 # file names are specified in the variables grid_gen_scr, orog_gen_scr,
 # and orog_fltr_scr and then calls the executable defined in the varia-
@@ -28,7 +28,7 @@
 #       large enough such that the "shave" steps later below (which take
 #       this file as input and generate grid files with thinner halos)
 #       have a wide enough starting halo to work with.  More specifical-
-#       ly, the FV3SAR model needs as inputs two grid files: one with a
+#       ly, the FV3-LAM model needs as inputs two grid files: one with a
 #       halo that is 3 cells and another with a halo that is 4 cells 
 #       wide.  Thus, the halo in the grid file that the grid_gen_scr 
 #       script generates must be greater than 4 since otherwise, the
@@ -38,7 +38,7 @@
 #       name denotes number of cells, the "h" is used to indicate that
 #       it refers to a halo region, the "w" is used to indicate that it
 #       refers to a wide halo (i.e. wider than the 3-cell and 4-cell ha-
-#       los that the FV3SAR model requires as inputs, and the "T7" is
+#       los that the FV3-LAM model requires as inputs, and the "T7" is
 #       used to indicate that the cell count is on tile 7.
 #
 # 2) orog_gen_scr:
@@ -63,7 +63,7 @@
 #       generated by script orog_gen_scr (and the grid file generated by 
 #       grid_gen_scr).
 #
-#    b) In analogy with the input grid files, the FV3SAR model needs as
+#    b) In analogy with the input grid files, the FV3-LAM model needs as
 #       input two (filtered) orography files -- one with no halo cells
 #       and another with 3.  These are obtained later below by "shaving"
 #       off layers of halo cells from the (filtered) orography file ge-

jobs/JREGIONAL_RUN_POST

@@ -4,7 +4,7 @@
 #-----------------------------------------------------------------------
 #
 # This script runs the post-processor (UPP) on the NetCDF output files
-# of the write component of the FV3SAR model.
+# of the write component of the FV3-LAM model.
 #
 #-----------------------------------------------------------------------
 #
@@ -108,16 +108,6 @@ digits:
   fhr = \"${fhr}\""
 fi
 #
-# Add check to make sure fhr contains exactly two digits.  This restriction
-# needs to be removed at some point.
-#
-fhr=$( printf "%s" "${fhr}" | sed -n -r -e "s/^([0-9]{2})$/\1/p" )
-if [ -z "$fhr" ]; then
-  print_err_msg_exit "\
-Currently, the forecast hour (fhr) must consist of exactly two digits:
-  fhr = \"${fhr}\""
-fi
-#
 #-----------------------------------------------------------------------
 #
 # Call the ex-script for this J-job and pass to it the necessary varia-

scripts/exregional_get_extrn_mdl_files.sh

@@ -214,6 +214,10 @@ if [ "${num_files_found_on_disk}" -eq "${num_files_to_copy}" ]; then
 else
   data_src="HPSS"
 fi
+
+if [ ${NOMADS} == "TRUE" ]; then
+  data_src="online"
+fi
 #
 #-----------------------------------------------------------------------
 #
@@ -631,7 +635,7 @@ file unzip_log_fn in that directory for details:
 # of each external model file.  If any are missing, then the corresponding 
 # files are not in the zip file and thus cannot be extracted.  In that 
 # case, print out a message and exit the script because initial condition 
-# and surface field files for the FV3SAR cannot be generated without all 
+# and surface field files for the FV3-LAM cannot be generated without all 
 # the external model files.
 #
 #-----------------------------------------------------------------------
@@ -690,7 +694,7 @@ details:
     print_info_msg "
 ========================================================================
 External model files needed for generating initial condition and surface 
-fields for the FV3SAR successfully fetched from HPSS!!!
+fields for the FV3-LAM successfully fetched from HPSS!!!
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"
@@ -701,7 +705,7 @@ In directory:    \"${scrfunc_dir}\"
     print_info_msg "
 ========================================================================
 External model files needed for generating lateral boundary conditions
-on the halo of the FV3SAR's regional grid successfully fetched from 
+on the halo of the FV3-LAM's regional grid successfully fetched from 
 HPSS!!!
 
 Exiting script:  \"${scrfunc_fn}\"
@@ -710,6 +714,38 @@ In directory:    \"${scrfunc_dir}\"
 
   fi
 
+elif [ "${data_src}" = "online" ]; then
+    print_info_msg "
+========================================================================
+getting data from online nomads data sources
+========================================================================"
+
+#
+#-----------------------------------------------------------------------
+#
+# Set extrn_mdl_fps to the full paths within the archive files of the
+# external model output files.
+#
+#-----------------------------------------------------------------------
+#
+  prefix=${extrn_mdl_arcvrel_dir:+${extrn_mdl_arcvrel_dir}/}
+  extrn_mdl_fps=( "${extrn_mdl_fns_on_disk[@]/#/$prefix}" )
+
+  extrn_mdl_fps_str="( "$( printf "\"%s\" " "${extrn_mdl_fps[@]}" )")"
+
+  print_info_msg " 
+Getting external model files from nomads:
+  extrn_mdl_fps= ${extrn_mdl_fps_str}"
+
+  num_files_to_extract="${#extrn_mdl_fps[@]}"
+  wget_LOG_FN="log.wget.txt"
+  for (( nfile=0; nfile<${num_files_to_extract}; nfile++ )); do
+    cp ../../../${extrn_mdl_fps[$nfile]} . || \
+    print_err_msg_exit "\
+    onlie file ${extrn_mdl_fps[$nfile]} not found."
+  done
+
+
 fi
 #
 #-----------------------------------------------------------------------
@@ -732,6 +768,8 @@ if [ "${data_src}" = "disk" ]; then
   extrn_mdl_fns_str="( "$( printf "\"%s\" " "${extrn_mdl_fns_on_disk[@]}" )")"
 elif [ "${data_src}" = "HPSS" ]; then
   extrn_mdl_fns_str="( "$( printf "\"%s\" " "${extrn_mdl_fns_in_arcv[@]}" )")"
+elif [ "${data_src}" = "online" ]; then
+  extrn_mdl_fns_str="( "$( printf "\"%s\" " "${extrn_mdl_fns_on_disk[@]}" )")"
 fi
 
 settings="\

scripts/exregional_make_grid.sh

@@ -189,7 +189,7 @@ mkdir_vrfy -p "$tmpdir"
 # GRID_DIR.  Note that the file for tile 7 will include a halo of width
 # NHW cells.
 #
-# Since tiles 1 through 6 are not needed to run the FV3SAR model and are
+# Since tiles 1 through 6 are not needed to run the FV3-LAM model and are
 # not used later on in any other preprocessing steps, it is not clear
 # why they are generated.  It might be because it is not possible to di-
 # rectly generate a standalone regional grid using the make_hgrid uti-
@@ -283,7 +283,7 @@ mkdir_vrfy -p "$tmpdir"
 #
 if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
   exec_fn="make_hgrid"
-elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then
+elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then
   exec_fn="regional_grid"
 fi
 
@@ -343,11 +343,11 @@ nonzero exit code.
 #
   grid_fn="${grid_name}.tile${TILE_RGNL}.nc"
 #
-# Generate a JPgrid-type of grid.
+# Generate a ESGgrid-type of grid.
 #
-elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then
+elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then
 #
-# Create the namelist file read in by the JPgrid-type grid generation
+# Create the namelist file read in by the ESGgrid-type grid generation
 # code in the temporary subdirectory.
 #
   rgnl_grid_nml_fp="$tmpdir/${RGNL_GRID_NML_FN}"
@@ -372,9 +372,9 @@ generation executable (exec_fp):
     'dely': ${DEL_ANGLE_Y_SG},
     'lx': ${NEG_NX_OF_DOM_WITH_WIDE_HALO},
     'ly': ${NEG_NY_OF_DOM_WITH_WIDE_HALO},
-    'a': ${JPgrid_ALPHA_PARAM},
-    'k': ${JPgrid_KAPPA_PARAM},
- }
+    'a': ${ESGgrid_ALPHA_PARAM},
+    'k': ${ESGgrid_KAPPA_PARAM},
+}
 "
 #
 # Call the python script to create the namelist file.
@@ -393,7 +393,7 @@ $settings"
 #
   $APRUN ${exec_fp} ${rgnl_grid_nml_fp} || \
     print_err_msg_exit "\
-Call to executable (exec_fp) that generates a JPgrid-type regional grid
+Call to executable (exec_fp) that generates a ESGgrid-type regional grid
 returned with nonzero exit code:
   exec_fp = \"${exec_fp}\"" 
 #
@@ -461,7 +461,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
   else
     CRES="C${res_equiv}"
   fi
-elif [ "${GRID_GEN_METHOD}" = "JPgrid" ]; then
+elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then
   CRES="C${res_equiv}"
 fi
 set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "\"$CRES\""
@@ -482,22 +482,22 @@ mv_vrfy "${grid_fp_orig}" "${grid_fp}"
 #
 # If there are pre-existing orography or climatology files that we will
 # be using (i.e. if RUN_TASK_MAKE_OROG or RUN_TASK_MAKE_SURF_CLIMO is set
-# to "FALSE", in which case RES_IN_FIXSAR_FILENAMES will not be set to a
+# to "FALSE", in which case RES_IN_FIXLAM_FILENAMES will not be set to a
 # null string), check that the grid resolution contained in the variable
 # CRES set above matches the resolution appearing in the names of the 
 # preexisting orography and/or surface climatology files.
 #
 #-----------------------------------------------------------------------
 #
-if [ ! -z "${RES_IN_FIXSAR_FILENAMES}" ]; then
+if [ ! -z "${RES_IN_FIXLAM_FILENAMES}" ]; then
   res="${CRES:1}"
-  if [ "$res" -ne "${RES_IN_FIXSAR_FILENAMES}" ]; then
+  if [ "$res" -ne "${RES_IN_FIXLAM_FILENAMES}" ]; then
     print_err_msg_exit "\
 The resolution (res) calculated for the grid does not match the resolution 
-(RES_IN_FIXSAR_FILENAMES) appearing in the names of the orography and/or
+(RES_IN_FIXLAM_FILENAMES) appearing in the names of the orography and/or
 surface climatology files:
   res = \"$res\"
-  RES_IN_FIXSAR_FILENAMES = \"${RES_IN_FIXSAR_FILENAMES}\""
+  RES_IN_FIXLAM_FILENAMES = \"${RES_IN_FIXLAM_FILENAMES}\""
   fi
 fi
 #
@@ -635,7 +635,7 @@ halo failed."
 #
 #-----------------------------------------------------------------------
 #
-# Create symlinks in the FIXsar directory to the grid and mosaic files 
+# Create symlinks in the FIXLAM directory to the grid and mosaic files 
 # generated above in the GRID_DIR directory.
 #
 #-----------------------------------------------------------------------
@@ -654,7 +654,7 @@ failed."
 # paths to the surface climatology files.  These files will either already 
 # be avaialable in a user-specified directory (SFC_CLIMO_DIR) or will be
 # generated by the MAKE_SFC_CLIMO_TN task.  They (or symlinks to them) 
-# will be placed (or wll already exist) in the FIXsar directory.
+# will be placed (or wll already exist) in the FIXLAM directory.
 #
 # Also, if running ensemble forecasts, call a function (set_FV3nml_stoch_params) 
 # to create a new FV3 namelist file for each ensemble member that contains