Per #2036, just some whitespace cleanup and removing a commented out …

…function from a header file.
dtcenter · Oct 16, 2022 · f4ab66a · f4ab66a
1 parent b210aac
commit f4ab66a
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 14 deletions.
diff --git a/internal/test_unit/tc_pairs_cmds.txt b/internal/test_unit/tc_pairs_cmds.txt
@@ -0,0 +1,90 @@
+export LEAD_REQ=''
+export VALID_INC=''
+export WRITE_VALID=''
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -adeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/adeck/*2010.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2010.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_ALAL2010 \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2010 \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_ALAL2010.log \
+      -v 2
+unset LEAD_REQ
+unset VALID_INC
+unset WRITE_VALID
+
+export INTERP12='FILL'
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -adeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/adeck/*2013.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2013.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_INTERP12 \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/al022013_interp12_fill \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_INTERP12_FILL.log \
+      -v 3
+unset INTERP12
+
+export INTERP12='REPLACE'
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -adeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/adeck/*2013.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2013.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_INTERP12 \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/al022013_interp12_replace \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_INTERP12_REPLACE.log \
+      -v 3
+unset INTERP12
+
+export WRITE_VALID=''
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -edeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/edeck/*2015*.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2015*.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_PROBRIRW \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2015 \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_PROBRIRW.log \
+      -v 3
+unset WRITE_VALID
+
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -edeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/edeck/*2015*.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2015*.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_BASIN_MAP \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2015_BASIN_MAP \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_BASIN_MAP.log \
+      -v 3
+
+export LEAD_REQ='"96","108"'
+export VALID_INC=''
+export WRITE_VALID=''
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -adeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/adeck/*2010.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2010.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_ALAL2010 \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2010_LEAD_REQ \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_LEAD_REQ.log \
+      -v 2
+unset LEAD_REQ
+unset VALID_INC
+unset WRITE_VALID
+
+export LEAD_REQ=''
+export VALID_INC='"20100814_12", "20100815_00"'
+export WRITE_VALID='"20100815_00"'
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -adeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/adeck/*2010.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2010.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_ALAL2010 \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2010_WRITE_VALID \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_WRITE_VALID.log \
+      -v 2
+unset LEAD_REQ
+unset VALID_INC
+unset WRITE_VALID
+
+export WRITE_VALID='"20150512"'
+/Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/../../share/met/../../bin/tc_pairs \
+      -edeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/edeck/*2015*.dat \
+      -bdeck /Volumes/d1/projects/MET/MET_unit_test/MET_test_input/tc_data/bdeck/*2015*.dat \
+      -config /Volumes/d1/projects/MET/MET_development/MET-develop/internal/test_unit/config/TCPairsConfig_PROBRIRW \
+      -out /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/alal2015_WRITE_VALID \
+      -log /Volumes/d1/projects/MET/MET_unit_test/MET_test_output/tc_pairs/tc_pairs_WRITE_VALID_PROBRIRW.log \
+      -v 3
+unset WRITE_VALID
+
diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.am b/internal/test_util/libcode/vx_nc_util/Makefile.am
@@ -42,7 +42,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in
@@ -343,7 +343,7 @@ test_pressure_levels_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/libcode/vx_tc_util/track_info.cc b/src/libcode/vx_tc_util/track_info.cc
@@ -957,10 +957,10 @@ TrackInfo consensus(const TrackInfoArray &tracks,
          pvmax.add(tracks.Track[j][i_pnt].v_max());
          pmslp.add(tracks.Track[j][i_pnt].mslp());
       }
-      
+
       // Check for missing required member and the minimum number of points
       if(skip == true || pcnt < req) continue;
-      
+
       // Compute the average point
       pavg = psum;
       if(!is_bad_data(pavg.v_max())) pavg.set_v_max(psum.v_max()/pcnt);

diff --git a/src/libcode/vx_tc_util/track_info.h b/src/libcode/vx_tc_util/track_info.h
@@ -248,8 +248,9 @@ inline int TrackInfoArray::n() const { return(Track.size()); }
 ////////////////////////////////////////////////////////////////////////
 
 extern TrackInfo consensus(const TrackInfoArray &, const ConcatString &, int, const StringArray &);
-extern void compute_gc_dist_stdev(const double lat, const double lon, const NumArray &lats, const NumArray &lons, double &spread, double &mean);
-//extern double compute_gc_dist_stdev(const double lat, const double lon, const NumArray &lats, const NumArray &lons);
+extern void compute_gc_dist_stdev(const double lat, const double lon,
+                                  const NumArray &lats, const NumArray &lons,
+                                  double &spread, double &mean);
 extern bool has_storm_id(const StringArray &, const ConcatString &basin,
                          const ConcatString &cyclone, unixtime init);
 extern void latlon_to_xytk_err(double alat, double alon,

diff --git a/src/libcode/vx_tc_util/track_point.h b/src/libcode/vx_tc_util/track_point.h
@@ -130,12 +130,12 @@ class TrackPoint {
       // Location
       double        Lat;        //  degrees, + north, - south
       double        Lon;        //  degrees, + west, - east
-      
+
       // Intensity
       double        Vmax;       //  knots
       double        MSLP;       //  millibars
       CycloneLevel  Level;
-      
+
       // Pressure of the last closed isobar (900 - 1050 mb)
       double        RadP;
 

diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am
@@ -34,7 +34,7 @@ rmw_analysis_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in
@@ -341,7 +341,7 @@ rmw_analysis_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am
@@ -35,7 +35,7 @@ tc_rmw_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in
@@ -344,7 +344,7 @@ tc_rmw_LDADD = -lvx_stat_out \
 	-lvx_config \
 	-lvx_gsl_prob \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am
@@ -39,7 +39,7 @@ tc_stat_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_pb_util \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \

diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in
@@ -348,7 +348,7 @@ tc_stat_LDADD = -lvx_stat_out \
 	-lvx_gsl_prob \
 	-lvx_pb_util \
 	-lvx_cal \
-        -lvx_nav \
+	-lvx_nav \
 	-lvx_util_math \
 	-lvx_util \
 	-lvx_math \