Per #3006, revert back to using FileType instead of GrdFileType. That…

… change was not meaningful or warranted.
dtcenter · hsoh-u · Nov 5, 2024 · Nov 7, 2024 · Nov 18, 2024 · Nov 18, 2024
commit 5e431c4496346441a57db2cb680e8c433701bd71
diff --git a/data/config/ConfigConstants b/data/config/ConfigConstants
@@ -59,7 +59,7 @@ MB_to_PA(p)  = HPA_to_PA(p);
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// Gridded data file types
+// File types
 GRIB1          = 1;
 GRIB2          = 2;
 NETCDF_MET     = 3;

diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h
@@ -1268,7 +1268,7 @@ static const char conf_key_cira_diag_flag[]         = "cira_diag_flag";
 // Parameter value names common to multiple tools
 //
 
-// Gridded data file types
+// File types
 static const char conf_val_grib1         [] = "GRIB1";
 static const char conf_val_grib2         [] = "GRIB2";
 static const char conf_val_netcdf_met    [] = "NETCDF_MET";

diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc
@@ -345,12 +345,12 @@ StringArray parse_conf_string_array(Dictionary *dict, const char *conf_key, cons
 
 ///////////////////////////////////////////////////////////////////////////////
 
-FileType parse_conf_grd_file_type(Dictionary *dict) {
-   FileType t = FileType_None;
+GrdFileType parse_conf_file_type(Dictionary *dict) {
+   GrdFileType t = FileType_None;
    int v;
 
    if(!dict) {
-      mlog << Error << "\nparse_conf_grd_file_type() -> "
+      mlog << Error << "\nparse_conf_file_type() -> "
            << "empty dictionary!\n\n";
       exit(1);
    }
@@ -359,7 +359,7 @@ FileType parse_conf_grd_file_type(Dictionary *dict) {
    v = dict->lookup_int(conf_key_file_type, false);
 
    if(dict->last_lookup_status()) {
-      // Convert integer to enumerated FileType
+      // Convert integer to enumerated GrdFileType
            if(v == conf_const.lookup_int(conf_val_grib1))         t = FileType_Gb1;
       else if(v == conf_const.lookup_int(conf_val_grib2))         t = FileType_Gb2;
       else if(v == conf_const.lookup_int(conf_val_netcdf_met))    t = FileType_NcMet;
@@ -370,7 +370,7 @@ FileType parse_conf_grd_file_type(Dictionary *dict) {
       else if(v == conf_const.lookup_int(conf_val_python_numpy))  t = FileType_Python_Numpy;
       else if(v == conf_const.lookup_int(conf_val_python_xarray)) t = FileType_Python_Xarray;
       else {
-         mlog << Error << "\nparse_conf_grd_file_type() -> "
+         mlog << Error << "\nparse_conf_file_type() -> "
               << "Unexpected config file value of " << v << " for \""
               << conf_key_file_type << "\".\n\n";
          exit(1);

diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h
@@ -35,7 +35,7 @@ extern ConcatString    parse_conf_string(
                           Dictionary *dict,
                           const char *,
                           bool check_empty=true);
-extern FileType        parse_conf_grd_file_type(Dictionary *dict);
+extern GrdFileType     parse_conf_file_type(Dictionary *dict);
 extern std::map<STATLineType,STATOutputType>
                        parse_conf_output_flag(
                           Dictionary *dict,

diff --git a/src/basic/vx_config/data_file_type.h b/src/basic/vx_config/data_file_type.h
@@ -17,7 +17,7 @@
 // Enumeration of supported file types
 //
 
-enum FileType {
+enum GrdFileType {
 
    FileType_None,           // Default
 
@@ -38,7 +38,7 @@ enum FileType {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline bool is_netcdf_grdfiletype(const FileType _t) {
+inline bool is_netcdf_grdfiletype(const GrdFileType _t) {
    return(_t == FileType_NcMet          ||
           _t == FileType_General_Netcdf ||
           _t == FileType_NcWrf          ||
@@ -48,7 +48,7 @@ inline bool is_netcdf_grdfiletype(const FileType _t) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline bool is_python_grdfiletype(const FileType _t) {
+inline bool is_python_grdfiletype(const GrdFileType _t) {
    return(_t == FileType_Python_Xarray ||
           _t == FileType_Python_Numpy);
 }

diff --git a/src/basic/vx_config/grdfiletype_to_string.cc b/src/basic/vx_config/grdfiletype_to_string.cc
@@ -34,7 +34,7 @@ using namespace std;
 ////////////////////////////////////////////////////////////////////////
 
 
-ConcatString grdfiletype_to_string(const FileType t)
+ConcatString grdfiletype_to_string(const GrdFileType t)
 
 {
 
@@ -73,7 +73,7 @@ return ConcatString(s);
 ////////////////////////////////////////////////////////////////////////
 
 
-bool string_to_grdfiletype(const char * text, FileType & t)
+bool string_to_grdfiletype(const char * text, GrdFileType & t)
 
 {
 

diff --git a/src/basic/vx_config/grdfiletype_to_string.h b/src/basic/vx_config/grdfiletype_to_string.h
@@ -38,10 +38,10 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-extern ConcatString grdfiletype_to_string(const FileType);
+extern ConcatString grdfiletype_to_string(const GrdFileType);
 
 
-extern bool string_to_grdfiletype(const char *, FileType &);
+extern bool string_to_grdfiletype(const char *, GrdFileType &);
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d/data_class.h b/src/libcode/vx_data2d/data_class.h
@@ -129,7 +129,7 @@ class Met2dDataFile : public Met2dData {
       virtual int raw_nx() const;
       virtual int raw_ny() const;
 
-      virtual FileType file_type() const = 0;
+      virtual GrdFileType file_type() const = 0;
 
       int shift_right() const;
 

diff --git a/src/libcode/vx_data2d/var_info.cc b/src/libcode/vx_data2d/var_info.cc
@@ -952,7 +952,7 @@ ConcatString EnsVarInfo::get_ens_member_id(int index) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-ConcatString raw_magic_str(Dictionary i_edict, FileType file_type) {
+ConcatString raw_magic_str(Dictionary i_edict, GrdFileType file_type) {
    ConcatString magic_str;
 
    ConcatString name = i_edict.lookup_string("name");

diff --git a/src/libcode/vx_data2d/var_info.h b/src/libcode/vx_data2d/var_info.h
@@ -106,7 +106,7 @@ class VarInfo
          // get stuff
          //
 
-      virtual FileType  file_type() const = 0;
+      virtual GrdFileType file_type() const = 0;
 
       ConcatString magic_str()      const;
       ConcatString magic_time_str() const;
@@ -310,7 +310,7 @@ class EnsVarInfo {
 
 ////////////////////////////////////////////////////////////////////////
 
-ConcatString raw_magic_str(Dictionary i_edict, FileType file_type);
+ConcatString raw_magic_str(Dictionary i_edict, GrdFileType file_type);
 bool is_req_level_match(const ConcatString &, const ConcatString &);
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc
@@ -44,7 +44,7 @@ using namespace std;
 //
 ////////////////////////////////////////////////////////////////////////
 
-Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(FileType type)
+Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(GrdFileType type)
 
 {
 
@@ -116,7 +116,7 @@ MetPythonDataFile * p = nullptr;
       case FileType_HdfEos:
 
          mlog << Error << "\n" << method_name
-              << "Support for FileType = \"" << grdfiletype_to_string(type)
+              << "Support for GrdFileType = \"" << grdfiletype_to_string(type)
               << "\" not yet implemented!\n\n";
          exit(1);
 
@@ -160,7 +160,7 @@ MetPythonDataFile * p = nullptr;
 ////////////////////////////////////////////////////////////////////////
 
 Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename) {
-   FileType type;
+   GrdFileType type;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
 
    //
@@ -191,7 +191,7 @@ Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename)
 
 ////////////////////////////////////////////////////////////////////////
 
-Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename, FileType type)
+Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(const char *filename, GrdFileType type)
 
 {
 
@@ -247,14 +247,14 @@ bool is_2d_data_file(const ConcatString &filename,
                      const ConcatString &config_str) {
    Met2dDataFileFactory mtddf_factory;
    Met2dDataFile *mtddf = (Met2dDataFile *) nullptr;
-   FileType type = FileType_None;
+   GrdFileType type = FileType_None;
 
    // Check for a requested file type
    if(config_str.nonempty()) {
       MetConfig config;
       config.read(replace_path(config_const_filename).c_str());
       config.read_string(config_str.c_str());
-      type = parse_conf_grd_file_type(&config);
+      type = parse_conf_file_type(&config);
    }
 
    mtddf = mtddf_factory.new_met_2d_data_file(filename.c_str(), type);

diff --git a/src/libcode/vx_data2d_factory/data2d_factory.h b/src/libcode/vx_data2d_factory/data2d_factory.h
@@ -21,9 +21,9 @@
 class Met2dDataFileFactory
 {
    public:
-      static Met2dDataFile *new_met_2d_data_file(FileType type);
+      static Met2dDataFile *new_met_2d_data_file(GrdFileType type);
       static Met2dDataFile *new_met_2d_data_file(const char *filename);
-      static Met2dDataFile *new_met_2d_data_file(const char *filename, FileType type);
+      static Met2dDataFile *new_met_2d_data_file(const char *filename, GrdFileType type);
 };
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_factory/data2d_factory_utils.cc b/src/libcode/vx_data2d_factory/data2d_factory_utils.cc
@@ -49,17 +49,17 @@ static const int   n_bf_file_ext  = sizeof(bf_file_ext)/sizeof(*bf_file_ext);
 ////////////////////////////////////////////////////////////////////////
 
 
-static FileType file_type_by_suffix(const char * filename);
+static GrdFileType file_type_by_suffix(const char * filename);
 
 
 ////////////////////////////////////////////////////////////////////////
 
-FileType grd_file_type(const char * filename)
+GrdFileType grd_file_type(const char * filename)
 
 {
 
-FileType suffix_type = FileType_None;
-FileType data_type   = FileType_None;
+GrdFileType suffix_type = FileType_None;
+GrdFileType data_type   = FileType_None;
 
    //
    //  first check for python strings
@@ -129,7 +129,7 @@ else                                 return data_type  ;
 ////////////////////////////////////////////////////////////////////////
 
 
-FileType file_type_by_suffix(const char * filename)
+GrdFileType file_type_by_suffix(const char * filename)
 
 {
 

diff --git a/src/libcode/vx_data2d_factory/data2d_factory_utils.h b/src/libcode/vx_data2d_factory/data2d_factory_utils.h
@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-extern FileType grd_file_type(const char * filename);
+extern GrdFileType grd_file_type(const char * filename);
 
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_factory/parse_file_list.cc b/src/libcode/vx_data2d_factory/parse_file_list.cc
@@ -93,7 +93,7 @@ StringArray parse_ascii_file_list(const char * path)
 
 ifstream f_in;
 StringArray a;
-FileType file_type;
+GrdFileType file_type;
 std::string file_name;
 ConcatString list_str(file_list_str);
 bool check_files_exist = true;
@@ -205,11 +205,11 @@ return a;
 ////////////////////////////////////////////////////////////////////////
 
 
-FileType parse_file_list_type(const StringArray& file_list)
+GrdFileType parse_file_list_type(const StringArray& file_list)
 
 {
 
-FileType ftype = FileType_None;
+GrdFileType ftype = FileType_None;
 
 for ( int i=0; i<file_list.n(); i++ )  {
 

diff --git a/src/libcode/vx_data2d_factory/parse_file_list.h b/src/libcode/vx_data2d_factory/parse_file_list.h
@@ -29,7 +29,7 @@ extern StringArray parse_file_list(const StringArray&);
 
 extern StringArray parse_ascii_file_list(const char * path);
 
-extern FileType parse_file_list_type(const StringArray&);
+extern GrdFileType parse_file_list_type(const StringArray&);
 
 extern void log_missing_file(const char *method_name,
                              const char *desc_str,

diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc
@@ -49,7 +49,7 @@ using namespace std;
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-VarInfo * VarInfoFactory::new_var_info(FileType type)
+VarInfo * VarInfoFactory::new_var_info(GrdFileType type)
 
 {
 
@@ -117,7 +117,7 @@ VarInfo * VarInfoFactory::new_var_info(FileType type)
 
       case FileType_HdfEos:
          mlog << Error << "\n" << method_name
-              << "Support for FileType = " << grdfiletype_to_string(type)
+              << "Support for GrdFileType = " << grdfiletype_to_string(type)
               << " not yet implemented!\n\n";
          exit(1);
 
@@ -138,7 +138,7 @@ VarInfo * VarInfoFactory::new_var_info(FileType type)
 ///////////////////////////////////////////////////////////////////////////////
 
 VarInfo * VarInfoFactory::new_var_info(ConcatString s) {
-   FileType type;
+   GrdFileType type;
 
    // Convert the string to a gridded data file type
    string_to_grdfiletype(s.c_str(), type);

diff --git a/src/libcode/vx_data2d_factory/var_info_factory.h b/src/libcode/vx_data2d_factory/var_info_factory.h
@@ -23,7 +23,7 @@
 class VarInfoFactory
 {
    public:
-      static VarInfo *new_var_info(FileType t);
+      static VarInfo *new_var_info(GrdFileType t);
       static VarInfo *new_var_info(ConcatString s);
       static VarInfo *new_copy(const VarInfo *);
 };

diff --git a/src/libcode/vx_data2d_grib/data2d_grib.h b/src/libcode/vx_data2d_grib/data2d_grib.h
@@ -60,7 +60,7 @@ class MetGrib1DataFile : public Met2dDataFile {
          //  get stuff
          //
 
-      FileType file_type() const;
+      GrdFileType file_type() const;
 
       double operator () (int x, int y) const;
 
@@ -102,8 +102,8 @@ class MetGrib1DataFile : public Met2dDataFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline double   MetGrib1DataFile::operator  () (int x, int y) const { return get(x, y);    }
-inline FileType MetGrib1DataFile::file_type ()                const { return FileType_Gb1; }
+inline double      MetGrib1DataFile::operator  () (int x, int y) const { return get(x, y);    }
+inline GrdFileType MetGrib1DataFile::file_type ()                const { return FileType_Gb1; }
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_grib/var_info_grib.h b/src/libcode/vx_data2d_grib/var_info_grib.h
@@ -76,15 +76,15 @@ class VarInfoGrib : public VarInfo
          // get stuff
          //
 
-      FileType file_type() const;
-      int      ptv()       const;
-      int      code()      const;
-      int      lvl_type()  const;
-      int      p_code()    const;
-      int      center()    const;
-      int      subcenter() const;
-      int      field_rec() const;
-      int      tri()       const;
+      GrdFileType file_type() const;
+      int         ptv()       const;
+      int         code()      const;
+      int         lvl_type()  const;
+      int         p_code()    const;
+      int         center()    const;
+      int         subcenter() const;
+      int         field_rec() const;
+      int         tri()       const;
 
          //
          // set stuff
@@ -116,15 +116,15 @@ class VarInfoGrib : public VarInfo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-inline FileType VarInfoGrib::file_type() const { return FileType_Gb1; }
-inline int      VarInfoGrib::ptv()       const { return PTV;          }
-inline int      VarInfoGrib::code()      const { return Code;         }
-inline int      VarInfoGrib::lvl_type()  const { return LvlType;      }
-inline int      VarInfoGrib::p_code()    const { return PCode;        }
-inline int      VarInfoGrib::center()    const { return Center;       }
-inline int      VarInfoGrib::subcenter() const { return Subcenter;    }
-inline int      VarInfoGrib::field_rec() const { return FieldRec;     }
-inline int      VarInfoGrib::tri()       const { return TRI;          }
+inline GrdFileType VarInfoGrib::file_type() const { return FileType_Gb1; }
+inline int         VarInfoGrib::ptv()       const { return PTV;          }
+inline int         VarInfoGrib::code()      const { return Code;         }
+inline int         VarInfoGrib::lvl_type()  const { return LvlType;      }
+inline int         VarInfoGrib::p_code()    const { return PCode;        }
+inline int         VarInfoGrib::center()    const { return Center;       }
+inline int         VarInfoGrib::subcenter() const { return Subcenter;    }
+inline int         VarInfoGrib::field_rec() const { return FieldRec;     }
+inline int         VarInfoGrib::tri()       const { return TRI;          }
 
 ///////////////////////////////////////////////////////////////////////////////