Per #2547, rename nccf files as nc_cf for consistency throughout

dtcenter · Dec 20, 2023 · fad94d1 · fad94d1
1 parent ee5ec29
commit fad94d1
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/internal/test_util/libcode/vx_data2d_nc_cf/test_read_nccf.cc b/internal/test_util/libcode/vx_data2d_nc_cf/test_read_nccf.cc
@@ -19,7 +19,7 @@ using namespace std;
 
 #include "vx_log.h"
 #include "data_class.h"
-#include "data2d_nccf.h"
+#include "data2d_nc_cf.h"
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc
@@ -22,7 +22,7 @@ using namespace std;
 #include "data2d_grib.h"
 #include "data2d_nc_met.h"
 #include "data2d_nc_pinterp.h"
-#include "data2d_nccf.h"
+#include "data2d_nc_cf.h"
 #ifdef WITH_UGRID
 #include "data2d_ugrid.h"
 #endif

diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc
@@ -26,7 +26,7 @@ using namespace std;
 #include "var_info_factory.h"
 #include "grdfiletype_to_string.h"
 #include "var_info_grib.h"
-#include "var_info_nccf.h"
+#include "var_info_nc_cf.h"
 #include "var_info_nc_met.h"
 #include "var_info_nc_pinterp.h"
 #include "var_info_ugrid.h"

diff --git a/src/libcode/vx_data2d_nc_cf/Makefile.am b/src/libcode/vx_data2d_nc_cf/Makefile.am
@@ -12,9 +12,9 @@ include ${top_srcdir}/Make-include
 
 noinst_LIBRARIES = libvx_data2d_nc_cf.a
 libvx_data2d_nc_cf_a_SOURCES = \
-              nccf_file.cc nccf_file.h \
-              var_info_nccf.cc var_info_nccf.h \
-              data2d_nccf.cc data2d_nccf.h \
+              nc_cf_file.cc nc_cf_file.h \
+              var_info_nc_cf.cc var_info_nc_cf.h \
+              data2d_nc_cf.cc data2d_nc_cf.h \
               vx_data2d_nc_cf.h
 libvx_data2d_nc_cf_a_CPPFLAGS = ${MET_CPPFLAGS}
 
diff --git a/src/libcode/vx_data2d_nc_cf/data2d_nccf.cc → src/libcode/vx_data2d_nc_cf/data2d_nc_cf.cc b/src/libcode/vx_data2d_nc_cf/data2d_nccf.cc → src/libcode/vx_data2d_nc_cf/data2d_nc_cf.cc
@@ -17,7 +17,7 @@
 
 #include <netcdf>
 
-#include "data2d_nccf.h"
+#include "data2d_nc_cf.h"
 #include "vx_math.h"
 #include "vx_log.h"
 

diff --git a/src/libcode/vx_data2d_nc_cf/data2d_nccf.h → src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h b/src/libcode/vx_data2d_nc_cf/data2d_nccf.h → src/libcode/vx_data2d_nc_cf/data2d_nc_cf.h
@@ -19,8 +19,8 @@
 
 #include "data_plane.h"
 #include "data_class.h"
-#include "var_info_nccf.h"
-#include "nccf_file.h"
+#include "var_info_nc_cf.h"
+#include "nc_cf_file.h"
 #include "two_to_one.h"
 
 

diff --git a/src/libcode/vx_data2d_nc_cf/nccf_file.cc → src/libcode/vx_data2d_nc_cf/nc_cf_file.cc b/src/libcode/vx_data2d_nc_cf/nccf_file.cc → src/libcode/vx_data2d_nc_cf/nc_cf_file.cc
@@ -29,7 +29,7 @@ using namespace netCDF;
 #include "vx_cal.h"
 #include "vx_log.h"
 
-#include "nccf_file.h"
+#include "nc_cf_file.h"
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_nc_cf/nccf_file.h → src/libcode/vx_data2d_nc_cf/nc_cf_file.h b/src/libcode/vx_data2d_nc_cf/nccf_file.h → src/libcode/vx_data2d_nc_cf/nc_cf_file.h
@@ -14,8 +14,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#ifndef  __NCCF_FILE_H__
-#define  __NCCF_FILE_H__
+#ifndef  __NC_CF_FILE_H__
+#define  __NC_CF_FILE_H__
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -194,7 +194,7 @@ class NcCfFile {
 ////////////////////////////////////////////////////////////////////////
 
 
-#endif   /*  __NCCF_FILE_H__  */
+#endif   /*  __NC_CF_FILE_H__  */
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_data2d_nc_cf/var_info_nccf.cc → ...libcode/vx_data2d_nc_cf/var_info_nc_cf.cc b/src/libcode/vx_data2d_nc_cf/var_info_nccf.cc → ...libcode/vx_data2d_nc_cf/var_info_nc_cf.cc
@@ -8,7 +8,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-//   Filename:   var_info_nccf.cc
+//   Filename:   var_info_nc_cf.cc
 //
 //   Description:
 //
@@ -25,7 +25,7 @@ using namespace std;
 #include <strings.h>
 
 #include "var_info.h"
-#include "var_info_nccf.h"
+#include "var_info_nc_cf.h"
 
 #include "vx_math.h"
 #include "util_constants.h"

diff --git a/src/libcode/vx_data2d_nc_cf/var_info_nccf.h → src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h b/src/libcode/vx_data2d_nc_cf/var_info_nccf.h → src/libcode/vx_data2d_nc_cf/var_info_nc_cf.h
diff --git a/src/libcode/vx_data2d_nc_cf/vx_data2d_nccf.h → ...libcode/vx_data2d_nc_cf/vx_data2d_nc_cf.h b/src/libcode/vx_data2d_nc_cf/vx_data2d_nccf.h → ...libcode/vx_data2d_nc_cf/vx_data2d_nc_cf.h
@@ -21,9 +21,9 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#include "data2d_nccf.h"
-#include "var_info_nccf.h"
-#include "nccf_file.h"
+#include "data2d_nc_cf.h"
+#include "var_info_nc_cf.h"
+#include "nc_cf_file.h"
 
 
 ////////////////////////////////////////////////////////////////////////