Per #3006, add new pair_stat tool as a full copy of the point_stat to…

…ol with all instances of point_stat renamed as pair_stat.
dtcenter · hsoh-u · Nov 5, 2024 · Nov 7, 2024 · Nov 18, 2024 · Nov 18, 2024
commit b4741e78d13f94e17bec454d5147dbdfed0ccadc
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -301,7 +301,7 @@ jobs:
       matrix:
         include:
           - jobid: 'job1'
-            tests: 'point_stat stat_analysis_ps'
+            tests: 'point_stat pair_stat stat_analysis_ps'
           - jobid: 'job2'
             tests: 'grid_stat stat_analysis_gs'
           - jobid: 'job3'

diff --git a/config.h.in b/config.h.in
@@ -48,6 +48,9 @@
 /* "build modis" */
 #undef ENABLE_MODIS
 
+/* "build pair_stat" */
+#undef ENABLE_PAIR_STAT
+
 /* "build pb2nc" */
 #undef ENABLE_PB2NC
 

diff --git a/configure b/configure
@@ -711,6 +711,8 @@ ENABLE_WAVELET_STAT_FALSE
 ENABLE_WAVELET_STAT_TRUE
 ENABLE_STAT_ANALYSIS_FALSE
 ENABLE_STAT_ANALYSIS_TRUE
+ENABLE_PAIR_STAT_FALSE
+ENABLE_PAIR_STAT_TRUE
 ENABLE_POINT_STAT_FALSE
 ENABLE_POINT_STAT_TRUE
 ENABLE_PLOT_POINT_OBS_FALSE
@@ -913,6 +915,7 @@ enable_point2grid
 enable_shift_data_plane
 enable_plot_point_obs
 enable_point_stat
+enable_pair_stat
 enable_stat_analysis
 enable_wavelet_stat
 enable_series_analysis
@@ -1645,6 +1648,7 @@ Optional Features:
   --disable-plot_point_obs
                           Disable compilation of plot_point_obs
   --disable-point_stat    Disable compilation of point_stat
+  --disable-pair_stat     Disable compilation of pair_stat
   --disable-stat_analysis Disable compilation of stat_analysis
   --disable-wavelet_stat  Disable compilation of wavelet_stat
   --disable-series_analysis
@@ -6538,6 +6542,41 @@ else
 printf "%s\n" "$as_me: point_stat will not be compiled" >&6;}
 fi
 
+# pair_stat
+
+# Check whether --enable-pair_stat was given.
+if test ${enable_pair_stat+y}
+then :
+  enableval=$enable_pair_stat; case "${enableval}" in
+     yes | no ) ENABLE_PAIR_STAT="${enableval}" ;;
+     *) as_fn_error $? "bad value ${enableval} for --disable-pair_stat" "$LINENO" 5 ;;
+   esac
+else $as_nop
+  ENABLE_PAIR_STAT="yes"
+
+fi
+
+
+ if test "x$ENABLE_PAIR_STAT" = "xyes"; then
+  ENABLE_PAIR_STAT_TRUE=
+  ENABLE_PAIR_STAT_FALSE='#'
+else
+  ENABLE_PAIR_STAT_TRUE='#'
+  ENABLE_PAIR_STAT_FALSE=
+fi
+
+
+if test "x$ENABLE_PAIR_STAT" = "xyes"; then
+
+printf "%s\n" "#define ENABLE_PAIR_STAT /**/" >>confdefs.h
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pair_stat will be compiled" >&5
+printf "%s\n" "$as_me: pair_stat will be compiled" >&6;}
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pair_stat will not be compiled" >&5
+printf "%s\n" "$as_me: pair_stat will not be compiled" >&6;}
+fi
+
 # stat_analysis
 
 # Check whether --enable-stat_analysis was given.
@@ -10158,7 +10197,7 @@ fi
 
 # Create configured files
 
-ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/python/examples/Makefile scripts/python/met/Makefile scripts/python/pyembed/Makefile scripts/python/utility/Makefile scripts/python/tc_diag/Makefile scripts/python/tc_diag/atcf_tools/Makefile scripts/python/tc_diag/config/Makefile scripts/python/tc_diag/diag_lib/Makefile scripts/python/tc_diag/tc_diag_driver/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_wrf/Makefile src/libcode/vx_data2d_nc_cf/Makefile src/libcode/vx_data2d_ugrid/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile src/tools/tc_utils/tc_diag/Makefile"
+ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/python/examples/Makefile scripts/python/met/Makefile scripts/python/pyembed/Makefile scripts/python/utility/Makefile scripts/python/tc_diag/Makefile scripts/python/tc_diag/atcf_tools/Makefile scripts/python/tc_diag/config/Makefile scripts/python/tc_diag/diag_lib/Makefile scripts/python/tc_diag/tc_diag_driver/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_wrf/Makefile src/libcode/vx_data2d_nc_cf/Makefile src/libcode/vx_data2d_ugrid/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/pair_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile src/tools/tc_utils/tc_diag/Makefile"
 
 
 if test -n "$MET_DEVELOPMENT"; then
@@ -10391,6 +10430,10 @@ if test -z "${ENABLE_POINT_STAT_TRUE}" && test -z "${ENABLE_POINT_STAT_FALSE}";
   as_fn_error $? "conditional \"ENABLE_POINT_STAT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_PAIR_STAT_TRUE}" && test -z "${ENABLE_PAIR_STAT_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_PAIR_STAT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_STAT_ANALYSIS_TRUE}" && test -z "${ENABLE_STAT_ANALYSIS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_STAT_ANALYSIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11129,6 +11172,7 @@ do
     "src/tools/core/mode_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/mode_analysis/Makefile" ;;
     "src/tools/core/pcp_combine/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/pcp_combine/Makefile" ;;
     "src/tools/core/point_stat/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/point_stat/Makefile" ;;
+    "src/tools/core/pair_stat/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/pair_stat/Makefile" ;;
     "src/tools/core/series_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/series_analysis/Makefile" ;;
     "src/tools/core/stat_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/stat_analysis/Makefile" ;;
     "src/tools/core/wavelet_stat/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/core/wavelet_stat/Makefile" ;;

diff --git a/configure.ac b/configure.ac
@@ -898,6 +898,26 @@ else
   AC_MSG_NOTICE([point_stat will not be compiled])
 fi
 
+# pair_stat
+
+AC_ARG_ENABLE(pair_stat,
+	  [AS_HELP_STRING([--disable-pair_stat], [Disable compilation of pair_stat])],
+  [case "${enableval}" in
+     yes | no ) ENABLE_PAIR_STAT="${enableval}" ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --disable-pair_stat) ;;
+   esac],
+  [ENABLE_PAIR_STAT="yes"]
+)
+
+AM_CONDITIONAL([ENABLE_PAIR_STAT], [test "x$ENABLE_PAIR_STAT" = "xyes"])
+
+if test "x$ENABLE_PAIR_STAT" = "xyes"; then
+  AC_DEFINE([ENABLE_PAIR_STAT], [], ["build pair_stat"])
+  AC_MSG_NOTICE([pair_stat will be compiled])
+else
+  AC_MSG_NOTICE([pair_stat will not be compiled])
+fi
+
 # stat_analysis
 
 AC_ARG_ENABLE(stat_analysis,
@@ -1378,6 +1398,7 @@ AC_CONFIG_FILES([Makefile
                  src/tools/core/mode_analysis/Makefile
                  src/tools/core/pcp_combine/Makefile
                  src/tools/core/point_stat/Makefile
+                 src/tools/core/pair_stat/Makefile
                  src/tools/core/series_analysis/Makefile
                  src/tools/core/stat_analysis/Makefile
                  src/tools/core/wavelet_stat/Makefile

diff --git a/data/config/Makefile.am b/data/config/Makefile.am
@@ -34,6 +34,7 @@ config_DATA = \
 	MTDConfig_default \
 	PB2NCConfig_default \
 	PointStatConfig_default \
+	PairStatConfig_default \
 	SeriesAnalysisConfig_default \
 	STATAnalysisConfig_default \
 	STATAnalysisConfig_GO_Index \

diff --git a/data/config/Makefile.in b/data/config/Makefile.in
@@ -325,6 +325,7 @@ config_DATA = \
 	MTDConfig_default \
 	PB2NCConfig_default \
 	PointStatConfig_default \
+	PairStatConfig_default \
 	SeriesAnalysisConfig_default \
 	STATAnalysisConfig_default \
 	STATAnalysisConfig_GO_Index \