Update develop-ref after #2021 (#2025)

Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu> Co-authored-by: johnhg <johnhg@ucar.edu> Co-authored-by: Seth Linden <linden@kiowa.rap.ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu> Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu> Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Seth Linden <linden@ucar.edu> Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: John Halley Gotway <johnhg@seneca.rap.ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> Co-authored-by: mo-mglover <78152252+mo-mglover@users.noreply.github.com>
dtcenter · Jan 25, 2022 · 4375e05 · 4375e05
1 parent f0855df
commit 4375e05
Show file tree

Hide file tree

Showing 56 changed files with 247 additions and 265 deletions.
diff --git a/met/docs/Users_Guide/release-notes.rst b/met/docs/Users_Guide/release-notes.rst
@@ -10,21 +10,21 @@ MET Version 10.1.0-beta5 release notes (20220114)
 
 * Enhancements:
 
-   * **Enhance GridStat to use OpenMP for efficient computation of neighborhood statistics by setting $OMP_NUM_THREADS** (`#1926 <https://github.com/dtcenter/MET/issues/>`_).
-   * **Enhance EnsembleStat and GenEnsProd to read all ensemble members from a single input file** (`#1695 <https://github.com/dtcenter/MET/issues/>`_).
-   * **Enhance TCGen to verify NHC tropical weather outlook shapefiles** (`#1810 <https://github.com/dtcenter/MET/issues/>`_).
-   * **Refine logic to prevent rounding shapefile points to the nearest grid point (affects GenVxMask -type shape masks)** (`#1810 <https://github.com/dtcenter/MET/issues/>`_).
-   * Enhance MADIS2NC to handle the 2016 updates to its format (`#1936 <https://github.com/dtcenter/MET/issues/>`_).
-   * Modify the interpretation of the message_type_group_map values to support the use of regular expressions (`#1974 <https://github.com/dtcenter/MET/issues/>`_).
-   * Address findings from the Cppcheck code analysis tool (`#1996 <https://github.com/dtcenter/MET/issues/>`_).
-   * Sort files read from directories to provide consistent behavior across platforms (`#1989 <https://github.com/dtcenter/MET/issues/>`_).
+   * **Enhance GridStat to use OpenMP for efficient computation of neighborhood statistics by setting $OMP_NUM_THREADS** (`#1926 <https://github.com/dtcenter/MET/issues/1926>`_).
+   * **Enhance EnsembleStat and GenEnsProd to read all ensemble members from a single input file** (`#1695 <https://github.com/dtcenter/MET/issues/1695>`_).
+   * **Enhance TCGen to verify NHC tropical weather outlook shapefiles** (`#1810 <https://github.com/dtcenter/MET/issues/1810>`_).
+   * **Refine logic to prevent rounding shapefile points to the nearest grid point (affects GenVxMask -type shape masks)** (`#1810 <https://github.com/dtcenter/MET/issues/1810>`_).
+   * Enhance MADIS2NC to handle the 2016 updates to its format (`#1936 <https://github.com/dtcenter/MET/issues/1936>`_).
+   * Modify the interpretation of the message_type_group_map values to support the use of regular expressions (`#1974 <https://github.com/dtcenter/MET/issues/1974>`_).
+   * Address findings from the Cppcheck code analysis tool (`#1996 <https://github.com/dtcenter/MET/issues/1996>`_).
+   * Sort files read from directories to provide consistent behavior across platforms (`#1989 <https://github.com/dtcenter/MET/issues/1989>`_).
 
 * Bugfixes:
 
-   * **Fix MTD to compute the CDIST_TRAVELLED value correctly** (`#1976 <https://github.com/dtcenter/MET/issues/>`_).
-   * Fix PointStat and GridStat to write VCNT output even if no VL1L2 or VAL1L2 output is requested (`#1991 <https://github.com/dtcenter/MET/issues/>`_).
-   * Fix GenVxMask to handle named grids and grid specification strings for -type grid (`#1993 <https://github.com/dtcenter/MET/issues/>`_).
-   * Fix IODA2NC to handle the same input file being provided multiple times (`#1965 <https://github.com/dtcenter/MET/issues/>`_).
+   * **Fix MTD to compute the CDIST_TRAVELLED value correctly** (`#1976 <https://github.com/dtcenter/MET/issues/1976>`_).
+   * Fix PointStat and GridStat to write VCNT output even if no VL1L2 or VAL1L2 output is requested (`#1991 <https://github.com/dtcenter/MET/issues/1991>`_).
+   * Fix GenVxMask to handle named grids and grid specification strings for -type grid (`#1993 <https://github.com/dtcenter/MET/issues/1993>`_).
+   * Fix IODA2NC to handle the same input file being provided multiple times (`#1965 <https://github.com/dtcenter/MET/issues/1965>`_).
 
 MET Version 10.1.0-beta4 release notes (20211117)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/scripts/regression/test_nightly.sh b/scripts/regression/test_nightly.sh
@@ -21,7 +21,7 @@
 #=======================================================================
 
 # Constants
-EMAIL_LIST="johnhg@ucar.edu hsoh@ucar.edu jpresto@ucar.edu linden@ucar.edu"
+EMAIL_LIST="johnhg@ucar.edu hsoh@ucar.edu jpresto@ucar.edu linden@ucar.edu mccabe@ucar.edu"
 KEEP_DAYS=5
 
 # Usage statement

diff --git a/test/bin/unit_test.sh b/test/bin/unit_test.sh
@@ -19,6 +19,11 @@ else
   echo "export MET_TEST_OUTPUT=${MET_TEST_OUTPUT}"
 fi
 
+# if MET_TEST_MET_PYTHON_EXE is not set, use default value
+if [[ -z "${MET_TEST_MET_PYTHON_EXE}" ]] ; then
+  export MET_TEST_MET_PYTHON_EXE=/usr/local/python3/bin/python3
+fi
+
 PERL_UNIT_OPTS=""
 for arg in $@; do
   [ $arg == "-memchk" -o $arg == "memchk" ] && PERL_UNIT_OPTS="$PERL_UNIT_OPTS -memchk"
@@ -67,7 +72,7 @@ UNIT_XML="unit_ascii2nc.xml \
           unit_shift_data_plane.xml \
           unit_mtd.xml \
           unit_climatology.xml \
-          unit_test_grib_tables.xml \
+          unit_grib_tables.xml \
           unit_grid_weight.xml \
           unit_netcdf.xml \
           unit_hira.xml \

diff --git a/test/config/PlotModeFieldConfig b/test/config/PlotModeFieldConfig
@@ -9,7 +9,7 @@
 
 plot_info = {
 
-   output_directory = "${MET_TEST_OUTPUT}/plot_mode_field";
+   output_directory = "${MET_TEST_OUTPUT}/mode_graphics";
 
    size = 4;
 

diff --git a/test/xml/unit_aeronet.xml b/test/xml/unit_aeronet.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>

diff --git a/test/xml/unit_airnow.xml b/test/xml/unit_airnow.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>

diff --git a/test/xml/unit_ascii2nc.xml b/test/xml/unit_ascii2nc.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -68,23 +70,23 @@
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
       &DATA_DIR_OBS;/ascii/qc_out_2012-09-07_00:00:00.GRM_P+FCST \
-      &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc \
+      &OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc \
       -v 1
     </param>
     <output>
-      <point_nc>&OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P+FCST.nc</point_nc>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/qc_out_2012-09-07_00:00:00.GRM_P_FCST.nc</point_nc>
     </output>
   </test>
 
   <test name="ascii2nc_LITTLE_R_BAD_RECORD">
     <exec>&MET_BIN;/ascii2nc</exec>
     <param> \
       &DATA_DIR_OBS;/ascii/OBS:2015080700_bad_record \
-      &OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc \
+      &OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc \
       -v 1
     </param>
     <output>
-      <point_nc>&OUTPUT_DIR;/ascii2nc/OBS:2015080700_bad_record.nc</point_nc>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/OBS_2015080700_bad_record.nc</point_nc>
     </output>
   </test>
 

diff --git a/test/xml/unit_climatology.xml b/test/xml/unit_climatology.xml
@@ -11,12 +11,13 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: unit_pb2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
-  <!-- Depends on unit_pb2nc.xml -->
   <test name="climatology_POINT_STAT_GFS_2.5DEG">
     <exec>&MET_BIN;/point_stat</exec>
     <env>

diff --git a/test/xml/unit_duplicate_flag.xml b/test/xml/unit_duplicate_flag.xml
@@ -10,9 +10,9 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
-<met_test>
+<!-- Requires: unit_ascii2nc.xml -->
 
-  <!--  Depends on unit_ascii2nc to generate dup_test.nc obs file -->
+<met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>false</exit_on_fail>
@@ -27,11 +27,11 @@
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
       &OUTPUT_DIR;/ascii2nc/dup_test.nc \
       &CONFIG_DIR;/PointStatConfig_dup \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/duplicate_flag -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_NONE_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 
@@ -45,11 +45,11 @@
       &DATA_DIR_MODEL;/grib2/nam/nam_2012040900_F012.grib2 \
       &OUTPUT_DIR;/ascii2nc/dup_test.nc \
       &CONFIG_DIR;/PointStatConfig_dup \
-      -outdir &OUTPUT_DIR;/point_stat -v 3
+      -outdir &OUTPUT_DIR;/duplicate_flag -v 3
     </param>   
     <output>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/point_stat/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/duplicate_flag/point_stat_DUP_UNIQUE_120000L_20120409_120000V_mpr.txt</stat>
     </output>
   </test>
 

diff --git a/test/xml/unit_ensemble_stat.xml b/test/xml/unit_ensemble_stat.xml
@@ -10,6 +10,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: unit_ascii2nc.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -18,7 +20,6 @@
 
   <!--                                    -->
   <!--  ensemble_stat                     -->
-  <!--  depends on unit_ascii2nc.xml      -->
   <!--                                    -->
 
   <!--  Pass input ensemble files on the command line - one missing.  -->
@@ -216,7 +217,7 @@
 
   <!--  Add observation error perturbations.  -->
 
-  <test name="ensemble_stat_OBS_ERROR">
+  <test name="ensemble_stat_OBSERR">
     <exec>echo "&DATA_DIR_MODEL;/grib1/arw-fer-gep1/arw-fer-gep1_2012040912_F024.grib \
                 &DATA_DIR_MODEL;/grib1/arw-fer-gep5/arw-fer-gep5_2012040912_F024.grib \
                 &DATA_DIR_MODEL;/grib1/arw-sch-gep2/arw-sch-gep2_2012040912_F024.grib \
@@ -226,10 +227,10 @@
                 > &OUTPUT_DIR;/ensemble_stat/input_file_list; \
           &MET_BIN;/ensemble_stat</exec>
     <env>
-      <pair><name>DESC</name>           <value>OBS_ERROR</value></pair>
+      <pair><name>DESC</name>           <value>OBSERR</value></pair>
       <pair><name>OBS_ERROR_FLAG</name> <value>TRUE</value></pair>
       <pair><name>SKIP_CONST</name>     <value>TRUE</value></pair>
-      <pair><name>OUTPUT_PREFIX</name>  <value>OBS_ERROR</value></pair>
+      <pair><name>OUTPUT_PREFIX</name>  <value>OBSERR</value></pair>
     </env>
     <param> \
       &OUTPUT_DIR;/ensemble_stat/input_file_list \
@@ -239,14 +240,14 @@
       -outdir &OUTPUT_DIR;/ensemble_stat -v 1
     </param>
     <output>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V.stat</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ecnt.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_rhist.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_phist.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.txt</stat>
-      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ssvar.txt</stat>
-      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_ens.nc</grid_nc>
-      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBS_ERROR_20120410_120000V_orank.nc</grid_nc>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V.stat</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ecnt.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_rhist.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_phist.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.txt</stat>
+      <stat>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ssvar.txt</stat>
+      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_ens.nc</grid_nc>
+      <grid_nc>&OUTPUT_DIR;/ensemble_stat/ensemble_stat_OBSERR_20120410_120000V_orank.nc</grid_nc>
     </output>
   </test>
 

diff --git a/test/xml/unit_gaussian.xml b/test/xml/unit_gaussian.xml
@@ -8,6 +8,8 @@
   <!ENTITY DATA_DIR_GAUSS "&INPUT_DIR;/gaussian">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
@@ -25,5 +27,4 @@
     </output>
   </test>
 
-
 </met_test>
diff --git a/test/xml/unit_gen_ens_prod.xml b/test/xml/unit_gen_ens_prod.xml
@@ -10,14 +10,15 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>
   <exit_on_fail>true</exit_on_fail>
 
   <!--                                    -->
   <!--  gen_ens_prod                      -->
-  <!--  no dependencies                   -->
   <!--                                    -->
 
   <!--  Use -ens twice to include the control as a member.  -->
@@ -120,7 +121,7 @@
     <param> \
         -ens    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -config &CONFIG_DIR;/GenEnsProdConfig_single_file_grib \
-        -ctrl    &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
+        -ctrl   &DATA_DIR_MODEL;/grib2/gefs/enspost_grb2.t00z.prmsl \
         -out    &OUTPUT_DIR;/gen_ens_prod/gen_ens_prod_SINGLE_FILE_GRIB_WITH_CTRL.nc \
         -v 2
     </param>

diff --git a/test/xml/unit_gen_vx_mask.xml b/test/xml/unit_gen_vx_mask.xml
@@ -12,6 +12,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <!--                                                                  -->

diff --git a/test/xml/unit_test_grib_tables.xml → test/xml/unit_grib_tables.xml b/test/xml/unit_test_grib_tables.xml → test/xml/unit_grib_tables.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE met_test [
-        <!ENTITY MET_BIN        "${MET_BASE}/../../bin">
-        <!ENTITY TEST_DIR       "${MET_TEST_BASE}">
-        <!ENTITY INPUT_DIR      "${MET_TEST_INPUT}">
-        <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
+  <!ENTITY MET_BIN        "${MET_BASE}/../../bin">
+  <!ENTITY TEST_DIR       "${MET_TEST_BASE}">
+  <!ENTITY INPUT_DIR      "${MET_TEST_INPUT}">
+  <!ENTITY OUTPUT_DIR     "${MET_TEST_OUTPUT}">
 
-        <!ENTITY CONFIG_DIR     "&TEST_DIR;/config">
-        <!ENTITY DATA_DIR_MODEL "&INPUT_DIR;/model_data">
-        <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
-        ]>
+  <!ENTITY CONFIG_DIR     "&TEST_DIR;/config">
+  <!ENTITY DATA_DIR_MODEL "&INPUT_DIR;/model_data">
+  <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
+]>
+
+<!-- Requires: None -->
 
 <met_test>
 

diff --git a/test/xml/unit_grid_diag.xml b/test/xml/unit_grid_diag.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_OBS   "&INPUT_DIR;/obs_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>

diff --git a/test/xml/unit_grid_stat.xml b/test/xml/unit_grid_stat.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: unit_pcp_combine.xml -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>

diff --git a/test/xml/unit_grid_weight.xml b/test/xml/unit_grid_weight.xml
@@ -11,6 +11,8 @@
   <!ENTITY DATA_DIR_CLIMO "&INPUT_DIR;/climatology_data">
 ]>
 
+<!-- Requires: None -->
+
 <met_test>
 
   <test_dir>&TEST_DIR;</test_dir>