diff --git a/internal/test_unit/xml/unit_point2grid.xml b/internal/test_unit/xml/unit_point2grid.xml index 5221ea4460..213ffcf756 100644 --- a/internal/test_unit/xml/unit_point2grid.xml +++ b/internal/test_unit/xml/unit_point2grid.xml @@ -130,7 +130,7 @@ G212 \ &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_compute.nc \ -field 'name="AOD"; level="(*,*)";' \ - -qc 1,2,3 -method MAX \ + -qc 0,1 -method MAX \ -v 1 @@ -167,7 +167,7 @@ &OUTPUT_DIR;/point2grid/point2grid_GOES_16_ADP.nc \ -field 'name="AOD_Smoke"; level="(*,*)";' \ -adp &DATA_DIR_MODEL;/goes_16/OR_ABI-L2-ADPC-M6_G16_s20192662141196_e20192662143569_c20192662144526.nc \ - -qc 1,2 -method MAX \ + -qc 0,1 -method MAX \ -v 1 @@ -213,7 +213,7 @@ - + &MET_BIN;/point2grid MET_TMP_DIR &OUTPUT_DIR;/point2grid @@ -259,7 +259,7 @@ G212 \ &OUTPUT_DIR;/point2grid/point2grid_GOES_16_AOD_TO_G212_unsigned.nc \ -field 'name="AOD"; level="(*,*)";' \ - -qc 1,2,3 -method MAX \ + -qc 0,1,2 -method MAX \ -v 1 diff --git a/src/libcode/vx_nc_util/nc_utils.h b/src/libcode/vx_nc_util/nc_utils.h index c879ba3c1d..671b3bf609 100644 --- a/src/libcode/vx_nc_util/nc_utils.h +++ b/src/libcode/vx_nc_util/nc_utils.h @@ -52,49 +52,49 @@ typedef unsigned char uchar; #define OBS_BUFFER_SIZE (128 * 1024) -static const char nc_dim_nhdr[] = "nhdr"; -static const char nc_dim_nhdr_typ[] = "nhdr_typ"; -static const char nc_dim_nhdr_sid[] = "nhdr_sid"; -static const char nc_dim_nhdr_vld[] = "nhdr_vld"; -static const char nc_dim_npbhdr[] = "npbhdr"; -static const char nc_dim_nobs[] = "nobs"; -static const char nc_dim_nqty[] = "nobs_qty"; -static const char nc_dim_hdr_arr[] = "hdr_arr_len"; -static const char nc_dim_obs_arr[] = "obs_arr_len"; -static const char nc_dim_mxstr[] = "mxstr"; -static const char nc_dim_mxstr2[] = "mxstr2"; -static const char nc_dim_mxstr3[] = "mxstr3"; -static const char nc_dim_nvar[] = "obs_var_num"; -static const char nc_dim_unit[] = "unit_len"; -static const char nc_dim_desc[] = "desc_len"; -static const char nc_var_desc[] = "obs_desc"; -static const char nc_var_hdr_arr[] = "hdr_arr"; -static const char nc_var_hdr_lat[] = "hdr_lat"; -static const char nc_var_hdr_lon[] = "hdr_lon"; -static const char nc_var_hdr_elv[] = "hdr_elv"; -static const char nc_var_hdr_typ[] = "hdr_typ"; -static const char nc_var_hdr_sid[] = "hdr_sid"; -static const char nc_var_hdr_vld[] = "hdr_vld"; -static const char nc_var_hdr_prpt_typ[] = "hdr_prpt_typ"; -static const char nc_var_hdr_irpt_typ[] = "hdr_irpt_typ"; -static const char nc_var_hdr_inst_typ[] = "hdr_inst_typ"; -static const char nc_var_hdr_typ_tbl[] = "hdr_typ_table"; -static const char nc_var_hdr_sid_tbl[] = "hdr_sid_table"; -static const char nc_var_hdr_vld_tbl[] = "hdr_vld_table"; -static const char nc_var_obs_arr[] = "obs_arr"; -static const char nc_var_obs_hid[] = "obs_hid"; -static const char nc_var_obs_gc[] = "obs_gc"; -static const char nc_var_obs_vid[] = "obs_vid"; -static const char nc_var_obs_lvl[] = "obs_lvl"; -static const char nc_var_obs_hgt[] = "obs_hgt"; -static const char nc_var_obs_val[] = "obs_val"; -static const char nc_var_obs_qty[] = "obs_qty"; -static const char nc_var_obs_qty_tbl[] = "obs_qty_table"; -static const char nc_var_obs_var[] = "obs_var"; -static const char nc_var_unit[] = "obs_unit"; -static const std::string nc_att_use_var_id = "use_var_id"; -static const char nc_att_obs_version[] = "MET_Obs_version"; -static const char nc_att_met_point_nccf[] = "MET_point_NCCF"; +constexpr char nc_dim_nhdr[] = "nhdr"; +constexpr char nc_dim_nhdr_typ[] = "nhdr_typ"; +constexpr char nc_dim_nhdr_sid[] = "nhdr_sid"; +constexpr char nc_dim_nhdr_vld[] = "nhdr_vld"; +constexpr char nc_dim_npbhdr[] = "npbhdr"; +constexpr char nc_dim_nobs[] = "nobs"; +constexpr char nc_dim_nqty[] = "nobs_qty"; +constexpr char nc_dim_hdr_arr[] = "hdr_arr_len"; +constexpr char nc_dim_obs_arr[] = "obs_arr_len"; +constexpr char nc_dim_mxstr[] = "mxstr"; +constexpr char nc_dim_mxstr2[] = "mxstr2"; +constexpr char nc_dim_mxstr3[] = "mxstr3"; +constexpr char nc_dim_nvar[] = "obs_var_num"; +constexpr char nc_dim_unit[] = "unit_len"; +constexpr char nc_dim_desc[] = "desc_len"; +constexpr char nc_var_desc[] = "obs_desc"; +constexpr char nc_var_hdr_arr[] = "hdr_arr"; +constexpr char nc_var_hdr_lat[] = "hdr_lat"; +constexpr char nc_var_hdr_lon[] = "hdr_lon"; +constexpr char nc_var_hdr_elv[] = "hdr_elv"; +constexpr char nc_var_hdr_typ[] = "hdr_typ"; +constexpr char nc_var_hdr_sid[] = "hdr_sid"; +constexpr char nc_var_hdr_vld[] = "hdr_vld"; +constexpr char nc_var_hdr_prpt_typ[] = "hdr_prpt_typ"; +constexpr char nc_var_hdr_irpt_typ[] = "hdr_irpt_typ"; +constexpr char nc_var_hdr_inst_typ[] = "hdr_inst_typ"; +constexpr char nc_var_hdr_typ_tbl[] = "hdr_typ_table"; +constexpr char nc_var_hdr_sid_tbl[] = "hdr_sid_table"; +constexpr char nc_var_hdr_vld_tbl[] = "hdr_vld_table"; +constexpr char nc_var_obs_arr[] = "obs_arr"; +constexpr char nc_var_obs_hid[] = "obs_hid"; +constexpr char nc_var_obs_gc[] = "obs_gc"; +constexpr char nc_var_obs_vid[] = "obs_vid"; +constexpr char nc_var_obs_lvl[] = "obs_lvl"; +constexpr char nc_var_obs_hgt[] = "obs_hgt"; +constexpr char nc_var_obs_val[] = "obs_val"; +constexpr char nc_var_obs_qty[] = "obs_qty"; +constexpr char nc_var_obs_qty_tbl[] = "obs_qty_table"; +constexpr char nc_var_obs_var[] = "obs_var"; +constexpr char nc_var_unit[] = "obs_unit"; +constexpr char nc_att_use_var_id[] = "use_var_id"; +constexpr char nc_att_obs_version[] = "MET_Obs_version"; +constexpr char nc_att_met_point_nccf[] = "MET_point_NCCF"; static const std::string add_offset_att_name = "add_offset"; static const std::string axis_att_name = "axis"; @@ -111,17 +111,17 @@ static const std::string scale_factor_att_name = "scale_factor"; static const std::string standard_name_att_name = "standard_name"; static const std::string units_att_name = "units"; -static const char nc_time_unit_exp[] = "^[a-z|A-Z]* *since *[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; -static const char nc_time_unit_ymd_exp[] = "[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; +constexpr char nc_time_unit_exp[] = "^[a-z|A-Z]* *since *[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; +constexpr char nc_time_unit_ymd_exp[] = "[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; -static const char MET_NC_Obs_ver_1_2[] = "1.02"; -static const char MET_NC_Obs_version[] = "1.02"; +constexpr char MET_NC_Obs_ver_1_2[] = "1.02"; +constexpr char MET_NC_Obs_version[] = "1.02"; -static const int exit_code_no_error = 0; -static const int exit_code_no_dim = 1; -static const int exit_code_no_hdr_vars = 2; -static const int exit_code_no_loc_vars = 3; -static const int exit_code_no_obs_vars = 4; +constexpr int exit_code_no_error = 0; +constexpr int exit_code_no_dim = 1; +constexpr int exit_code_no_hdr_vars = 2; +constexpr int exit_code_no_loc_vars = 3; +constexpr int exit_code_no_obs_vars = 4; ////////////////////////////////////////////////////////////////////////