Feature 1583 skip_mean (#2090)

dtcenter · Mar 8, 2022 · ee0be03 · ee0be03
1 parent 1b9784e
commit ee0be03
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/met/src/basic/vx_util/num_array.cc b/met/src/basic/vx_util/num_array.cc
@@ -269,6 +269,27 @@ int NumArray::has(double d, bool forward) const
 ////////////////////////////////////////////////////////////////////////
 
 
+bool NumArray::is_const(double d) const
+
+{
+
+   bool status = true;
+
+   for (int j=0; j<n_elements(); ++j)  {
+      if ( !is_eq(e[j], d) )  {
+         status = false;
+         break;
+      }
+   }
+
+   return ( status && n_elements() > 0 );
+
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+
 void NumArray::add(int k)
 
 {

diff --git a/met/src/basic/vx_util/num_array.h b/met/src/basic/vx_util/num_array.h
@@ -62,6 +62,8 @@ class NumArray {
       int has(int, bool forward=true)    const;
       int has(double, bool forward=true) const;
 
+      bool is_const(double) const;
+
       void add(int);
       void add(double);
       void add(const NumArray &);

diff --git a/met/src/libcode/vx_statistics/ens_stats.cc b/met/src/libcode/vx_statistics/ens_stats.cc
@@ -228,9 +228,6 @@ void ECNTInfo::set(const PairDataEnsemble &pd) {
    // Store the number of ensemble members
    n_ens = pd.n_ens;
 
-   // HiRA data has no ensemble mean
-   bool skip_mean = pd.mn_na.has(bad_data_double);
-
    // Compute empirical CRPS scores
    crps_emp   = pd.crps_emp_na.wmean(pd.wgt_na);
    crpscl_emp = pd.crpscl_emp_na.wmean(pd.wgt_na);
@@ -260,8 +257,9 @@ void ECNTInfo::set(const PairDataEnsemble &pd) {
       }
    }
 
-   // Compute ensemble mean based statistics
-   if(!skip_mean) {
+   // Compute ensemble mean based statistics, if possible
+   // HiRA stores the ensemble mean as bad data
+   if(!pd.mn_na.is_const(bad_data_double)) {
 
       // Compute ME and RMSE values
       fbar = obar = ffbar = oobar = fobar = 0.0;

diff --git a/met/src/libcode/vx_statistics/pair_data_ensemble.cc b/met/src/libcode/vx_statistics/pair_data_ensemble.cc
@@ -628,9 +628,9 @@ void PairDataEnsemble::compute_ssvar() {
    ssvar_bin_map bins;
    NumArray cur;
 
+   // SSVAR requires valid ensemble mean input
    // HiRA stores the ensemble mean as bad data
-   // Do not compute SSVAR when bad data is present
-   if(mn_na.has(bad_data_double)) return;
+   if(mn_na.is_const(bad_data_double)) return;
 
    // Check number of points
    if(o_na.n() != mn_na.n()) {