Per #1020, removed unused SetAttrsEnsemble option.

dtcenter · Jun 24, 2020 · cb8934a · cb8934a
1 parent b9192bd
commit cb8934a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/met/src/basic/vx_config/config_constants.h b/met/src/basic/vx_config/config_constants.h
@@ -625,7 +625,6 @@ static const char conf_key_set_name[]          = "set_name";
 static const char conf_key_set_units[]         = "set_units";
 static const char conf_key_set_level[]         = "set_level";
 static const char conf_key_set_long_name[]     = "set_long_name";
-static const char conf_key_set_ensemble[]      = "set_ensemble";
 static const char conf_key_set_grid[]          = "set_grid";
 static const char conf_key_set_init[]          = "set_init";
 static const char conf_key_set_valid[]         = "set_valid";

diff --git a/met/src/libcode/vx_data2d/var_info.cc b/met/src/libcode/vx_data2d/var_info.cc
@@ -121,7 +121,6 @@ void VarInfo::assign(const VarInfo &v) {
    SetAttrsUnits = v.SetAttrsUnits;
    SetAttrsLevel = v.SetAttrsLevel;
    SetAttrsLongName = v.SetAttrsLongName;
-   SetAttrsEnsemble = v.SetAttrsEnsemble;
 
    SetAttrsGrid = v.SetAttrsGrid;
 
@@ -182,7 +181,6 @@ void VarInfo::clear() {
    SetAttrsUnits.clear();
    SetAttrsLevel.clear();
    SetAttrsLongName.clear();
-   SetAttrsEnsemble.clear();
 
    SetAttrsGrid.clear();
 
@@ -498,8 +496,6 @@ void VarInfo::set_dict(Dictionary &dict) {
       parse_set_attrs_string(dict, conf_key_set_level, true);
    SetAttrsLongName =
       parse_set_attrs_string(dict, conf_key_set_long_name);
-   SetAttrsEnsemble =
-      parse_set_attrs_string(dict, conf_key_set_ensemble);
 
    // Parse set_attrs grid
    s = parse_set_attrs_string(dict, conf_key_set_grid);

diff --git a/met/src/libcode/vx_data2d/var_info.h b/met/src/libcode/vx_data2d/var_info.h
@@ -64,7 +64,6 @@ class VarInfo
       ConcatString  SetAttrsUnits;
       ConcatString  SetAttrsLevel;
       ConcatString  SetAttrsLongName;
-      ConcatString  SetAttrsEnsemble;
 
       Grid          SetAttrsGrid;
 
@@ -239,11 +238,10 @@ inline NumArray     VarInfo::range()          const { return(Range);
 
 inline RegridInfo   VarInfo::regrid()         const { return(Regrid);           }
 
-inline ConcatString VarInfo::name_attr()      const { return(SetAttrsName.empty()      ? name()       : SetAttrsName);     }
-inline ConcatString VarInfo::units_attr()     const { return(SetAttrsUnits.empty()     ? units()      : SetAttrsUnits);    }
-inline ConcatString VarInfo::level_attr()     const { return(SetAttrsLevel.empty()     ? level_name() : SetAttrsLevel);    }
-inline ConcatString VarInfo::long_name_attr() const { return(SetAttrsLongName.empty()  ? long_name()  : SetAttrsLongName); }
-inline ConcatString VarInfo::ensemble_attr()  const { return(SetAttrsEnsemble.empty()  ? ens()        : SetAttrsEnsemble); }
+inline ConcatString VarInfo::name_attr()      const { return(SetAttrsName.empty()     ? name()       : SetAttrsName);     }
+inline ConcatString VarInfo::units_attr()     const { return(SetAttrsUnits.empty()    ? units()      : SetAttrsUnits);    }
+inline ConcatString VarInfo::level_attr()     const { return(SetAttrsLevel.empty()    ? level_name() : SetAttrsLevel);    }
+inline ConcatString VarInfo::long_name_attr() const { return(SetAttrsLongName.empty() ? long_name()  : SetAttrsLongName); }
 
 inline Grid         VarInfo::grid_attr()      const { return(SetAttrsGrid);     }