Per #2893, add option to default config files and fix compilation err…

…ors.
dtcenter · Oct 15, 2024 · 168eef4 · 168eef4
1 parent 399e609
commit 168eef4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/data/config/EnsembleStatConfig_default b/data/config/EnsembleStatConfig_default
@@ -120,6 +120,8 @@ message_type_group_map = [
    { key = "ONLYSF";  val = "ADPSFC,SFCSHP";                      }
 ];
 
+obtype_as_obs_message_type_flag = FALSE;
+
 //
 // Ensemble bin sizes
 // May be set separately in each "obs.field" entry

diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default
@@ -115,6 +115,8 @@ message_type_group_map = [
    { key = "WATERSF"; val = "SFCSHP";                             }
 ];
 
+obtype_as_obs_message_type_flag = FALSE;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 //

diff --git a/src/libcode/vx_stat_out/stat_columns.h b/src/libcode/vx_stat_out/stat_columns.h
@@ -109,7 +109,7 @@ extern void write_mpr_row   (StatHdrColumns &, const PairDataPoint *, STATOutput
                              bool update_obtype, bool update_thresh = true);
 extern void write_seeps_row (StatHdrColumns &, const SeepsAggScore *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &,
-                             bool update_obtype, bool update_thresh = true);
+                             bool update_thresh = true);
 extern void write_seeps_mpr_row (StatHdrColumns &, const PairDataPoint *, STATOutputType,
                              AsciiTable &, int &, AsciiTable &, int &,
                              bool update_obtype, bool update_thresh = true);

diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
@@ -70,7 +70,7 @@ void EnsembleStatConfInfo::clear() {
    vld_ens_thresh = bad_data_double;
    vld_data_thresh = bad_data_double;
    msg_typ_group_map.clear();
-   obtype_as_obs_message_type = false;
+   obtype_as_obs_message_type_flag = false;
    msg_typ_sfc.clear();
    mask_area_map.clear();
    mask_sid_map.clear();
@@ -176,7 +176,7 @@ void EnsembleStatConfInfo::process_config(GrdFileType etype,
 
    // Conf: obtype_as_obs_message_type_flag
    obtype_as_obs_message_type_flag =
-   conf.lookup_bool(conf_key_obtype_as_obs_message_type_flag);
+      conf.lookup_bool(conf_key_obtype_as_obs_message_type_flag);
 
    // Conf: ens_member_ids
    ens_member_ids = parse_conf_ens_member_ids(&conf);

diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h
@@ -221,7 +221,7 @@ class EnsembleStatConfInfo {
       // Message type groups that should be processed together
       std::map<ConcatString,StringArray> msg_typ_group_map;
       StringArray                        msg_typ_sfc;
-      bool                               obtype_as_obs_message_type;
+      bool                               obtype_as_obs_message_type_flag;
 
       // Mapping of mask names to MaskPlanes
       std::map<ConcatString,MaskPlane>   mask_area_map;