Per #1653, for GRIB1, GRIB2, and Pinterp, I was able to remove the se…

…t_magic() function so that VarInfo::set_magic() would be called instead. That simpler anyway.
dtcenter · Feb 5, 2021 · bb7bb06 · bb7bb06
1 parent fa6a0b1
commit bb7bb06
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 43 deletions.
diff --git a/met/src/libcode/vx_data2d_grib/var_info_grib.cc b/met/src/libcode/vx_data2d_grib/var_info_grib.cc
@@ -198,18 +198,6 @@ void VarInfoGrib::set_tri(int v) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void VarInfoGrib::set_magic(const ConcatString &nstr, const ConcatString &lstr) {
-
-   // Validate the magic_string
-   VarInfo::set_magic(nstr, lstr);
-
-   // Store the magic string
-   MagicStr << cs_erase << nstr << "/" << lstr;
-
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 void VarInfoGrib::add_grib_code (Dictionary &dict)
 {
    ConcatString field_name = dict.lookup_string(conf_key_name,            false);

diff --git a/met/src/libcode/vx_data2d_grib/var_info_grib.h b/met/src/libcode/vx_data2d_grib/var_info_grib.h
@@ -89,7 +89,6 @@ class VarInfoGrib : public VarInfo
          // set stuff
          //
 
-      void set_magic(const ConcatString &, const ConcatString &);
       void set_dict(Dictionary &);
       void add_grib_code(Dictionary &);
 

diff --git a/met/src/libcode/vx_data2d_grib2/var_info_grib2.cc b/met/src/libcode/vx_data2d_grib2/var_info_grib2.cc
@@ -257,19 +257,6 @@ void VarInfoGrib2::set_ipdtmpl_val(const IntArray &v) {
    return;
 }
 
-
-///////////////////////////////////////////////////////////////////////////////
-
-void VarInfoGrib2::set_magic(const ConcatString &nstr, const ConcatString &lstr) {
-
-   // Validate the magic_string
-   VarInfo::set_magic(nstr, lstr);
-
-   // Store the magic string
-   MagicStr << cs_erase << nstr << "/" << lstr;
-
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void VarInfoGrib2::set_dict(Dictionary & dict) {

diff --git a/met/src/libcode/vx_data2d_grib2/var_info_grib2.h b/met/src/libcode/vx_data2d_grib2/var_info_grib2.h
@@ -97,7 +97,6 @@ class VarInfoGrib2 : public VarInfo
          // set stuff
          //
 
-      void set_magic(const ConcatString &, const ConcatString &);
       void set_dict(Dictionary &);
 
       void set_record(int);

diff --git a/met/src/libcode/vx_data2d_python/var_info_python.cc b/met/src/libcode/vx_data2d_python/var_info_python.cc
@@ -147,21 +147,6 @@ void VarInfoPython::set_file_type(const GrdFileType t) {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void VarInfoPython::set_magic(const ConcatString &nstr, const ConcatString &lstr) {
-
-   // Validate the magic_string
-   VarInfo::set_magic(nstr, lstr);
-
-   // Store the magic string
-   MagicStr << cs_erase << nstr << "/" << lstr;
-
-   return;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-
 void VarInfoPython::set_dict(Dictionary & dict) {
 
    VarInfo::set_dict(dict);

diff --git a/met/src/libcode/vx_data2d_python/var_info_python.h b/met/src/libcode/vx_data2d_python/var_info_python.h
@@ -56,7 +56,6 @@ class VarInfoPython : public VarInfo
          //
 
       void set_file_type(const GrdFileType);
-      void set_magic(const ConcatString &, const ConcatString &);
       void set_dict(Dictionary &);
 
          //