From fb1a109b4b7d794c21db3e3e50c48e8897a5f3b3 Mon Sep 17 00:00:00 2001
From: John Halley Gotway <johnhg@ucar.edu>
Date: Thu, 15 Jul 2021 11:07:06 -0600
Subject: [PATCH] Per #1746, need to reinitialize apply_fcst_thresh and
 apply_obs_thresh to true inside the loop since the NA threshold can appear
 anywhere in the list of thresholds.

---
 met/src/tools/core/wavelet_stat/wavelet_stat.cc   | 15 ++++++++-------
 .../core/wavelet_stat/wavelet_stat_conf_info.cc   |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/met/src/tools/core/wavelet_stat/wavelet_stat.cc b/met/src/tools/core/wavelet_stat/wavelet_stat.cc
index 677a0d7de3..c2dbc61635 100644
--- a/met/src/tools/core/wavelet_stat/wavelet_stat.cc
+++ b/met/src/tools/core/wavelet_stat/wavelet_stat.cc
@@ -939,10 +939,8 @@ void do_intensity_scale(const NumArray &f_na, const NumArray &o_na,
    int bnd, row, col;
    int i, j, k;
    ConcatString fcst_thresh_str, obs_thresh_str;
+   bool apply_fcst_thresh, apply_obs_thresh;
 
-   int apply_fcst_thresh = 1;
-   int apply_obs_thresh = 1;
-   
    // Check the NumArray lengths
    n = f_na.n();
    if(n != o_na.n()) {
@@ -997,19 +995,22 @@ void do_intensity_scale(const NumArray &f_na, const NumArray &o_na,
    // Apply each threshold
    for(i=0; i<conf_info.fcat_ta[i_vx].n(); i++) {
 
+      // Initialize to true
+      apply_fcst_thresh = apply_obs_thresh = true;
+
       fcst_thresh_str = isc_info[i].fthresh.get_abbr_str();
       obs_thresh_str  = isc_info[i].othresh.get_abbr_str();
 
       // If the forecast threshold is set to NA skip masking below
       if(isc_info[i].fthresh.get_type() == thresh_na) {
-         mlog << Debug(2) << "The forecast threshold is NA (missing), skipping applying threshold.\n";
-         apply_fcst_thresh = 0;
+         mlog << Debug(2) << "The forecast threshold is NA, skipping applying threshold.\n";
+         apply_fcst_thresh = false;
       }
 
       // If the observation threshold is set to NA skip masking below
       if(isc_info[i].othresh.get_type() == thresh_na) {
-         mlog << Debug(2) << "The observation threshold is NA (missing), skipping applying threshold.\n";
-         apply_obs_thresh = 0;
+         mlog << Debug(2) << "The observation threshold is NA, skipping applying threshold.\n";
+         apply_obs_thresh = false;
       }
             
       mlog << Debug(2) << "Computing Intensity-Scale decomposition for "
diff --git a/met/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc b/met/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
index 74a0725572..103f203280 100644
--- a/met/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
+++ b/met/src/tools/core/wavelet_stat/wavelet_stat_conf_info.cc
@@ -283,9 +283,9 @@ void WaveletStatConfInfo::process_config(GrdFileType ftype,
          if((fcat_ta[i][j].get_type() == thresh_na) !=
             (ocat_ta[i][j].get_type() == thresh_na)) {
             mlog << Warning << "\nWaveletStatConfInfo::process_config() -> "
-                 << "Skipping thresholding for either the forecast ("
-                 << fcat_ta[i][j].get_str() << ") or observation (" << ocat_ta[i][j].get_str()
-                 << ") but not the other. This may produce unexpected results!\n\n";
+                 << "Skipping thresholding for the forecast (" << fcat_ta[i][j].get_str()
+                 << ") or observation (" << ocat_ta[i][j].get_str()
+                 << ") but not the other may produce unexpected results!\n\n";
          }
       }