NOAA-GSL · christinaholtNOAA · Apr 18, 2022 · Apr 22, 2022 · Apr 22, 2022 · Apr 25, 2022
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,7 +3,7 @@
 
 # These owners will be the default owners for everything in the repo.
 #*       @defunkt
-*       @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA @ywangwof @chan-hoo @BenjaminBlake-NOAA @RatkoVasic-NOAA @panll @christinaholtNOAA @christopherwharrop-noaa @danielabdi-noaa @mark-a-potts @jkbk2004 @willmayfield @jwolff-ncar @dmwright526
+*       @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA @ywangwof @chan-hoo @panll @christinaholtNOAA @christopherwharrop-noaa @danielabdi-noaa @mark-a-potts @jkbk2004 @willmayfield @dmwright526 @gspetro-NOAA @natalie-perlin @EdwardSnyder-NOAA
 
 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners

diff --git a/.github/workflows/python_unittests.yaml b/.github/workflows/python_unittests.yaml
@@ -0,0 +1,27 @@
+name: Python unittests
+on: [push, pull_request]
+jobs:
+
+  python_unittests:
+    name: Python unittests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Install dependencies
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install python3 python3-pip netcdf-bin
+          sudo pip3 install pyyaml jinja2 f90nml
+          sudo pip3 install numpy matplotlib basemap
+
+      # Run python unittests
+      - name: Run python unittests
+        run: |
+          cd ush
+          python3 -m unittest -b python_utils/test_python_utils.py
+          python3 -m unittest -b *.py
+
diff --git a/modulefiles/tasks/cheyenne/run_vx.local b/modulefiles/tasks/cheyenne/run_vx.local
@@ -1,4 +1,2 @@
 #%Module
 module load pylib_regional_workflow
-module use /glade/p/ral/jntp/MET/MET_releases/modulefiles
-module load met/10.0.0
diff --git a/modulefiles/tasks/gaea/make_grid.local b/modulefiles/tasks/gaea/make_grid.local
@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/make_ics.local b/modulefiles/tasks/gaea/make_ics.local
@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/make_lbcs.local b/modulefiles/tasks/gaea/make_lbcs.local
@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/run_fcst.local b/modulefiles/tasks/gaea/run_fcst.local
@@ -0,0 +1,6 @@
+#%Module
+module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/run_vx.local b/modulefiles/tasks/gaea/run_vx.local
@@ -0,0 +1,5 @@
+#%Module
+
+module use -a /contrib/anaconda/modulefiles
+module load intel/18.0.5.274
+module load anaconda/latest
diff --git a/modulefiles/tasks/hera/get_obs.local b/modulefiles/tasks/hera/get_obs.local
@@ -7,7 +7,7 @@ module purge
 
 module load hpss
 
-module use -a /contrib/miniconda3/modulefiles
-module load miniconda3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 setenv SRW_ENV pygraf
diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow b/modulefiles/tasks/hera/miniconda_regional_workflow
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
-module load miniconda3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/hera/run_vx.local b/modulefiles/tasks/hera/run_vx.local
@@ -3,5 +3,3 @@
 module use -a /contrib/anaconda/modulefiles
 module load intel/18.0.5.274
 module load anaconda/latest
-module use -a /contrib/met/modulefiles/
-module load met/10.0.0
diff --git a/modulefiles/tasks/jet/miniconda_regional_workflow b/modulefiles/tasks/jet/miniconda_regional_workflow
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
-module load miniconda3
+module use /contrib/miniconda3/modulefiles
+module load miniconda3/4.5.12
 
 setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/run_vx.local b/modulefiles/tasks/jet/run_vx.local
@@ -0,0 +1,5 @@
+#%Module
+
+module use -a /contrib/anaconda/modulefiles
+module load intel/18.0.5.274
+module load anaconda/5.3.1
diff --git a/modulefiles/tasks/noaacloud/get_extrn_ics.local b/modulefiles/tasks/noaacloud/get_extrn_ics.local
@@ -0,0 +1,7 @@
+#%Module
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
+
diff --git a/modulefiles/tasks/noaacloud/get_extrn_lbcs.local b/modulefiles/tasks/noaacloud/get_extrn_lbcs.local
@@ -0,0 +1,6 @@
+#%Module
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/make_grid.local b/modulefiles/tasks/noaacloud/make_grid.local
@@ -0,0 +1,12 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/make_ics.local b/modulefiles/tasks/noaacloud/make_ics.local
@@ -0,0 +1,14 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+module load libpng
+module load jasper
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/make_lbcs.local b/modulefiles/tasks/noaacloud/make_lbcs.local
@@ -0,0 +1,14 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+module load libpng
+module load jasper
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/make_orog.local b/modulefiles/tasks/noaacloud/make_orog.local
@@ -0,0 +1,12 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/make_sfc_climo.local b/modulefiles/tasks/noaacloud/make_sfc_climo.local
@@ -0,0 +1,12 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/miniconda_regional_workflow b/modulefiles/tasks/noaacloud/miniconda_regional_workflow
@@ -0,0 +1,5 @@
+#%Module
+module use -a /contrib/GST/miniconda3/modulefiles
+module load miniconda3/4.10.3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/run_fcst.local b/modulefiles/tasks/noaacloud/run_fcst.local
@@ -0,0 +1,14 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+module load libpng
+module load jasper
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/noaacloud/run_post.local b/modulefiles/tasks/noaacloud/run_post.local
@@ -0,0 +1,14 @@
+#%Module
+
+module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
+module load stack-intel
+module load stack-intel-oneapi-mpi
+module load netcdf-c
+module load netcdf-fortran
+module load libpng
+module load jasper
+
+module load miniconda_regional_workflow
+module load rocoto
+prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/wcoss_dell_p3/run_vx.local b/modulefiles/tasks/wcoss_dell_p3/run_vx.local
@@ -1,6 +1,3 @@
 #%Module
 
 module unload netcdf
-
-module use /gpfs/dell2/emc/verification/noscrub/emc.metplus/modulefiles
-module load met/10.0.0
diff --git a/scripts/exregional_get_extrn_mdl_files.sh b/scripts/exregional_get_extrn_mdl_files.sh
@@ -108,7 +108,7 @@ elif [ "${ICS_OR_LBCS}" = "LBCS" ]; then
   input_file_path=${EXTRN_MDL_SOURCE_BASEDIR_LBCS:-$EXTRN_MDL_SYSBASEDIR_LBCS}
 fi
 
-data_stores="hpss aws"
+data_stores="${EXTRN_MDL_DATA_STORES}"
 
 yyyymmddhh=${extrn_mdl_cdate:0:10}
 yyyy=${yyyymmddhh:0:4}
@@ -141,7 +141,7 @@ if [ -n "${file_names:-}" ] ; then
 fi
 
 if [ -n "${input_file_path:-}" ] ; then
-  data_stores="disk hpss aws"
+  data_stores="disk $data_stores"
   additional_flags="$additional_flags \
   --input_file_path ${input_file_path}"
 fi

diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh
@@ -246,7 +246,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 # Set local variables needed in the call to the executable that generates
 # a GFDLgrid-type grid.
 #
-  nx_t6sg=$(( 2*GFDLgrid_RES ))
+  nx_t6sg=$(( 2*GFDLgrid_NUM_CELLS ))
   grid_name="${GRID_GEN_METHOD}"
 #
 # Call the executable that generates the grid file.  Note that this call
@@ -402,15 +402,15 @@ res_equiv=${res_equiv//$'\n'/}
 #-----------------------------------------------------------------------
 #
 if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
-  if [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "TRUE" ]; then
-    CRES="C${GFDLgrid_RES}"
+  if [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "TRUE" ]; then
+    CRES="C${GFDLgrid_NUM_CELLS}"
   else
     CRES="C${res_equiv}"
   fi
 elif [ "${GRID_GEN_METHOD}" = "ESGgrid" ]; then
   CRES="C${res_equiv}"
 fi
-set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "\"$CRES\""
+set_file_param "${GLOBAL_VAR_DEFNS_FP}" "CRES" "'$CRES'"
 #
 #-----------------------------------------------------------------------
 #

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -518,7 +518,6 @@ fi
 #
 settings="
 'config': {
- 'fix_dir_input_grid': ${FIXgsm},
  'fix_dir_target_grid': ${FIXLAM},
  'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
  'orog_dir_target_grid': ${FIXLAM},

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -442,7 +442,6 @@ list file has not specified for this external LBC model (EXTRN_MDL_NAME_LBCS):
 #
 settings="
 'config': {
- 'fix_dir_input_grid': ${FIXgsm},
  'fix_dir_target_grid': ${FIXLAM},
  'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc,
  'orog_dir_target_grid': ${FIXLAM},

diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
@@ -373,7 +373,7 @@ if [ "${GRID_GEN_METHOD}" = "GFDLgrid" ]; then
 #
 # Really depends on what EMC wants to do.
 
-  res="${GFDLgrid_RES}"
+  res="${GFDLgrid_NUM_CELLS}"
 #  stretch_fac="${GFDLgrid_STRETCH_FAC}"
   refine_ratio="${GFDLgrid_REFINE_RATIO}"
 

diff --git a/scripts/exregional_run_ensgridvx.sh b/scripts/exregional_run_ensgridvx.sh
@@ -133,6 +133,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS 
 export NUM_PAD
 export LOG_SUFFIX

diff --git a/scripts/exregional_run_ensgridvx_mean.sh b/scripts/exregional_run_ensgridvx_mean.sh
@@ -143,6 +143,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export INPUT_BASE
 export LOG_SUFFIX
 

diff --git a/scripts/exregional_run_ensgridvx_prob.sh b/scripts/exregional_run_ensgridvx_prob.sh
@@ -144,6 +144,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export LOG_SUFFIX
 
 #

diff --git a/scripts/exregional_run_enspointvx.sh b/scripts/exregional_run_enspointvx.sh
@@ -135,6 +135,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 export NUM_ENS_MEMBERS
 
 ${METPLUS_PATH}/ush/run_metplus.py \

diff --git a/scripts/exregional_run_enspointvx_mean.sh b/scripts/exregional_run_enspointvx_mean.sh
@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

diff --git a/scripts/exregional_run_enspointvx_prob.sh b/scripts/exregional_run_enspointvx_prob.sh
@@ -137,6 +137,7 @@ export METPLUS_CONF
 export MET_CONFIG
 export MODEL
 export NET
+export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -167,8 +167,8 @@ create_symlink_to_file target="$target" symlink="$symlink" \
 #target="${FIXLAM}/${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.halo${NH3}.nc"
 #if [ "${RUN_TASK_MAKE_SFC_CLIMO}" = "TRUE" ] && \
 #   [ "${GRID_GEN_METHOD}" = "GFDLgrid" ] && \
-#   [ "${GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES}" = "FALSE" ]; then
-#  symlink="C${GFDLgrid_RES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
+#   [ "${GFDLgrid_USE_NUM_CELLS_IN_FILENAMES}" = "FALSE" ]; then
+#  symlink="C${GFDLgrid_NUM_CELLS}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #else
 #  symlink="${CRES}${DOT_OR_USCORE}grid.tile${TILE_RGNL}.nc"
 #fi
@@ -514,7 +514,6 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
   yyyymmdd=${cdate:0:8}
   hh=${cdate:8:2}
   cyc=$hh
-  tmmark="tm00"
   fmn="00"
 
   if [ "${RUN_ENVIR}" = "nco" ]; then
@@ -539,15 +538,15 @@ if [ ${WRITE_DOPOST} = "TRUE" ]; then
     post_mn=${post_time:10:2}
     post_mn_or_null=""
     post_fn_suffix="GrbF${fhr_d}"
-    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${tmmark}.grib2"
+    post_renamed_fn_suffix="f${fhr}${post_mn_or_null}.${POST_OUTPUT_DOMAIN_NAME}.grib2"
 
     basetime=$( $DATE_UTIL --date "$yyyymmdd $hh" +%y%j%H%M )
     symlink_suffix="_${basetime}f${fhr}${post_mn}"
     fids=( "prslev" "natlev" )
     for fid in "${fids[@]}"; do
       FID=$(echo_uppercase $fid)
       post_orig_fn="${FID}.${post_fn_suffix}"
-      post_renamed_fn="${NET}.t${cyc}z.${fid}${post_renamed_fn_suffix}"
+      post_renamed_fn="${NET}.t${cyc}z.${fid}.${post_renamed_fn_suffix}"
       mv_vrfy ${run_dir}/${post_orig_fn} ${post_renamed_fn}
       ln_vrfy -fs ${post_renamed_fn} ${FID}${symlink_suffix}
     done