Bugfix #2412 develop climo

docs/Users_Guide/config_options.rst

@@ -1318,8 +1318,9 @@ of several entires defining the climatology file names and fields to be used.
 
 * The "hour_interval" entry is an integer specifying the spacing in hours of
   the climatology data for each day. This should be set between 0 and 24,
-  with 6 and 12 being common choices. Use "NA" if the timing of the
-  climatology data should not be checked.
+  with 6 and 12 being common choices. For example, use 6 for climatology data
+  with 4 times per day, such as 00Z, 06Z, 12Z, and 18Z. Use "NA" if the timing
+  of the climatology data should not be checked.
 
 * The "day_interval" and "hour_interval" entries replace the deprecated
   entries "match_month", "match_day", and "time_step".

internal/test_unit/config/GridStatConfig_climo_wrap_year

@@ -0,0 +1,266 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Grid-Stat configuration file.
+//
+// For additional information, please see the MET User's Guide.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Output model name to be written
+//
+model = "GFSANL";
+
+//
+// Output description to be written
+// May be set separately in each "obs.field" entry
+//
+desc = "NA";
+
+//
+// Output observation type to be written
+//
+obtype = "GFSANL";
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Verification grid
+//
+regrid = {
+   to_grid    = NONE;
+   method     = NEAREST;
+   width      = 1;
+   vld_thresh = 0.5;
+   shape      = SQUARE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// May be set separately in each "field" entry
+//
+censor_thresh       = [];
+censor_val          = [];
+mpr_column          = [];
+mpr_thresh          = [];
+cat_thresh          = [];
+cnt_thresh          = [ NA ];
+cnt_logic           = UNION;
+wind_thresh         = [ NA ];
+wind_logic          = UNION;
+eclv_points         = 0.05;
+nc_pairs_var_name   = "";
+nc_pairs_var_suffix = "";
+hss_ec_value        = NA;
+rank_corr_flag      = FALSE;
+
+//
+// Forecast and observation fields to be verified
+//
+fcst = {
+
+   name  = "TMP";
+   level = "P500";
+
+   field = [
+      { set_attr_init = "20201225_12"; set_attr_valid = "20201225_12"; nc_pairs_var_suffix = "20201225_12"; },
+      { set_attr_init = "20210105_12"; set_attr_valid = "20210105_12"; nc_pairs_var_suffix = "20210105_12"; },
+      { set_attr_init = "20201225_03"; set_attr_valid = "20201225_03"; nc_pairs_var_suffix = "20201225_03"; },
+      { set_attr_init = "20201225_21"; set_attr_valid = "20201225_21"; nc_pairs_var_suffix = "20201225_21"; }
+   ];
+}
+obs = fcst;
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Climatology data
+//
+climo_mean = {
+
+   field = [
+      { name = "TMP"; level = "P500"; },
+      { name = "TMP"; level = "P500"; },
+      { name = "TMP"; level = "P500"; },
+      { name = "TMP"; level = "P500"; }
+   ];
+
+   file_name = [ ${CLIMO_MEAN_FILE_LIST} ];
+
+   regrid = {
+      method     = BILIN;
+      width      = 2;
+      vld_thresh = 0.5;
+   }
+
+   time_interp_method = DW_MEAN;
+   day_interval       = ${DAY_INTERVAL};
+   hour_interval      = ${HOUR_INTERVAL};
+}
+
+climo_stdev = climo_mean;
+climo_stdev = {
+   file_name = [ ${CLIMO_STDEV_FILE_LIST} ];
+}
+
+//
+// May be set separately in each "obs.field" entry
+//
+climo_cdf = {
+   cdf_bins    = 1;
+   center_bins = TRUE;
+   write_bins  = FALSE;
+   direct_prob = FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Verification masking regions
+//
+mask = {
+   grid = [ "FULL" ];
+   poly = [];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Confidence interval settings
+//
+ci_alpha  = [ 0.05 ];
+
+boot = {
+   interval = PCTILE;
+   rep_prop = 1.0;
+   n_rep    = 0;
+   rng      = "mt19937";
+   seed     = "";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Data smoothing methods
+//
+interp = {
+   field      = BOTH;
+   vld_thresh = 1.0;
+   shape      = SQUARE;
+
+   type = [
+      {
+         method = NEAREST;
+         width  = 1;
+      }
+   ];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Neighborhood methods
+//
+nbrhd = {
+   width      = [ 1 ];
+   cov_thresh = [ >=0.5 ];
+   vld_thresh = 1.0;
+   shape      = SQUARE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Fourier decomposition
+//
+fourier = {
+   wave_1d_beg = [];
+   wave_1d_end = [];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Gradient statistics
+// May be set separately in each "obs.field" entry
+//
+gradient = {
+   dx = [ 1, 2, 5 ];
+   dy = [ 1, 3, 5 ];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Distance Map statistics
+// May be set separately in each "obs.field" entry
+//
+distance_map = {
+   baddeley_p        = 2;
+   baddeley_max_dist = NA;
+   fom_alpha         = 0.1;
+   zhu_weight        = 0.5;
+   beta_value(n)     = n * n / 2.0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//
+// Statistical output types
+//
+output_flag = {
+   fho    = NONE;
+   ctc    = NONE;
+   cts    = NONE;
+   mctc   = NONE;
+   mcts   = NONE;
+   cnt    = NONE;
+   sl1l2  = NONE;
+   sal1l2 = STAT;
+   vl1l2  = NONE;
+   val1l2 = NONE;
+   vcnt   = NONE;
+   pct    = NONE;
+   pstd   = NONE;
+   pjc    = NONE;
+   prc    = NONE;
+   eclv   = NONE;
+   nbrctc = NONE;
+   nbrcts = NONE;
+   nbrcnt = NONE;
+   grad   = NONE;
+   dmap   = NONE;
+   seeps  = NONE;
+}
+
+//
+// NetCDF matched pairs output file
+//
+nc_pairs_flag = {
+   latlon       = TRUE;
+   raw          = FALSE;
+   diff         = FALSE;
+   climo        = TRUE;
+   climo_cdp    = FALSE;
+   weight       = FALSE;
+   nbrhd        = FALSE;
+   fourier      = FALSE;
+   gradient     = FALSE;
+   distance_map = FALSE;
+   apply_mask   = FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Threshold for SEEPS p1 (Probability of being dry)
+
+seeps_p1_thresh = NA;
+
+////////////////////////////////////////////////////////////////////////////////
+
+grid_weight_flag = NONE;
+tmp_dir          = "/tmp";
+output_prefix    = "${OUTPUT_PREFIX}";
+version          = "V11.0.0";
+
+////////////////////////////////////////////////////////////////////////////////

internal/test_unit/xml/unit_climatology_2.5deg.xml

@@ -50,4 +50,35 @@
     </output>
   </test>
 
+  <!-- MET#2412: Test interpolation of monthly climo between December 15 and January 15 -->
+
+  <test name="climatology_GRID_STAT_WRAP_YEAR_2.5DEG">
+    <exec>&MET_BIN;/grid_stat</exec>
+    <env>
+      <pair><name>OUTPUT_PREFIX</name> <value>WRAP_YEAR_CLIMO_2.5DEG</value></pair>
+      <pair><name>DAY_INTERVAL</name>  <value>31</value></pair>
+      <pair><name>HOUR_INTERVAL</name> <value>6</value></pair>
+      <pair><name>CLIMO_MEAN_FILE_LIST</name>
+         <value>"&DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_mean.19591215",
+                "&DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_mean.19590115"
+         </value>
+      </pair>
+      <pair><name>CLIMO_STDEV_FILE_LIST</name>
+         <value>"&DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_stdv.19591215",
+                "&DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_stdv.19590115"
+         </value>
+      </pair>
+    </env>
+    <param> \
+      &DATA_DIR_MODEL;/grib2/gfsanl/gfsanl_4_20120409_1200_000.grb2 \
+      &DATA_DIR_MODEL;/grib2/gfsanl/gfsanl_4_20120409_1200_000.grb2 \
+      &CONFIG_DIR;/GridStatConfig_climo_wrap_year \
+      -outdir &OUTPUT_DIR;/climatology_2.5deg -v 3
+    </param>
+    <output>
+      <stat>&OUTPUT_DIR;/climatology_2.5deg/grid_stat_WRAP_YEAR_CLIMO_2.5DEG_000000L_20201225_120000V.stat</stat>
+      <grid_nc>&OUTPUT_DIR;/climatology_2.5deg/grid_stat_WRAP_YEAR_CLIMO_2.5DEG_000000L_20201225_120000V_pairs.nc</grid_nc>
+    </output>
+  </test>
+
 </met_test>

src/basic/vx_cal/doyhms_to_unix.cc

@@ -97,8 +97,28 @@ return ( s );
 
 }
 
+
+////////////////////////////////////////////////////////////////////////
+
+
+int unix_to_day_of_year(unixtime u) {
+
+int mon, day, yr, hr, min, sec;
+
+unix_to_mdyhms(u, mon, day, yr, hr, min, sec);
+
+int sec_of_year = mdyhms_to_unix(mon, day, 1970, 0, 0, 0);
+
+int sec_per_day = 60 * 60 * 24;
+
+return ( sec_of_year / sec_per_day );
+
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 
+
 long unix_to_long_yyyymmddhh(unixtime u) {
 
 int mon, day, yr, hr, min, sec;
@@ -112,4 +132,49 @@ return ( yyyymmddhh );
 
 }
 
+
+////////////////////////////////////////////////////////////////////////
+
+
+int sec_of_day_diff(unixtime ut1, unixtime ut2) {
+
+int sec_per_day = 60 * 60 * 24;
+
+int s1 = unix_to_sec_of_day(ut1);
+
+int s2 = unix_to_sec_of_day(ut2);
+
+int dt = s2 - s1;
+
+     if ( dt < -1 * sec_per_day/2 ) dt += sec_per_day;
+else if ( dt >      sec_per_day/2 ) dt -= sec_per_day;
+
+return ( dt );
+
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+
+int day_of_year_diff(unixtime ut1, unixtime ut2) {
+
+
+int sec_per_day  = 60 * 60 * 24;
+int day_per_year = 365;
+
+int d1 = unix_to_day_of_year(ut1);
+
+int d2 = unix_to_day_of_year(ut2);
+
+int dt = d2 - d1;
+
+     if ( dt < -1 * day_per_year/2.0 ) dt += day_per_year;
+else if ( dt >      day_per_year/2.0 ) dt -= day_per_year;
+
+return ( dt );
+
+}
+
+
 ////////////////////////////////////////////////////////////////////////