diff --git a/met/src/libcode/vx_statistics/apply_mask.cc b/met/src/libcode/vx_statistics/apply_mask.cc index 22ec01b627..eece56dc98 100644 --- a/met/src/libcode/vx_statistics/apply_mask.cc +++ b/met/src/libcode/vx_statistics/apply_mask.cc @@ -469,10 +469,10 @@ void parse_poly_2d_data_mask(const ConcatString &mask_poly_str, mask_dp.threshold(st); // Store the mask name - mask_name = info->name(); + mask_name = info->name_attr(); // Append level info - if(append_level) mask_name << "_" << info->level_name(); + if(append_level) mask_name << "_" << info->level_attr(); // Append threshold info if(append_thresh) mask_name << st.get_str(); diff --git a/met/src/libcode/vx_tc_util/vx_tc_nc_util.cc b/met/src/libcode/vx_tc_util/vx_tc_nc_util.cc index 42f791e30f..997c0ba835 100644 --- a/met/src/libcode/vx_tc_util/vx_tc_nc_util.cc +++ b/met/src/libcode/vx_tc_util/vx_tc_nc_util.cc @@ -372,16 +372,16 @@ void def_tc_data(NcFile* nc_out, dims.push_back(azimuth_dim); dims.push_back(track_point_dim); - ConcatString var_name = data_info->name(); + ConcatString var_name = data_info->name_attr(); var_name.add("_"); - var_name.add(data_info->level().name()); + var_name.add(data_info->level_attr()); data_var = nc_out->addVar( var_name, ncDouble, dims); // Set attributes - add_att(&data_var, "long_name", data_info->long_name()); - add_att(&data_var, "units", data_info->units()); + add_att(&data_var, "long_name", data_info->long_name_attr()); + add_att(&data_var, "units", data_info->units_attr()); add_att(&data_var, "_FillValue", bad_data_double); } @@ -399,11 +399,11 @@ void def_tc_data_3d(NcFile* nc_out, dims.push_back(track_point_dim); data_var = nc_out->addVar( - data_info->name(), ncDouble, dims); + data_info->name_attr(), ncDouble, dims); // Set attributes - add_att(&data_var, "long_name", data_info->long_name()); - add_att(&data_var, "units", data_info->units()); + add_att(&data_var, "long_name", data_info->long_name_attr()); + add_att(&data_var, "units", data_info->units_attr()); add_att(&data_var, "_FillValue", bad_data_double); } @@ -418,16 +418,16 @@ void def_tc_azi_mean_data(NcFile* nc_out, dims.push_back(range_dim); dims.push_back(track_point_dim); - ConcatString var_name = data_info->name(); + ConcatString var_name = data_info->name_attr(); var_name.add("_"); - var_name.add(data_info->level().name()); + var_name.add(data_info->level_attr()); var_name.add("_azi_mean"); data_var = nc_out->addVar(var_name, ncDouble, dims); // Set attributes - add_att(&data_var, "long_name", data_info->long_name()); - add_att(&data_var, "units", data_info->units()); + add_att(&data_var, "long_name", data_info->long_name_attr()); + add_att(&data_var, "units", data_info->units_attr()); add_att(&data_var, "_FillValue", bad_data_double); } diff --git a/met/src/tools/core/series_analysis/series_analysis.cc b/met/src/tools/core/series_analysis/series_analysis.cc index 9b48ccb2ec..81256089d3 100644 --- a/met/src/tools/core/series_analysis/series_analysis.cc +++ b/met/src/tools/core/series_analysis/series_analysis.cc @@ -337,7 +337,7 @@ void process_grid(const Grid &fcst_grid, const Grid &obs_grid) { // Compute the number of reads required n_reads = nint(ceil((double) nxy / conf_info.block_size)); - + mlog << Debug(2) << "Computing statistics using a block size of " << conf_info.block_size << ", requiring " << n_reads @@ -477,7 +477,7 @@ void get_series_data(int i_series, exit(1); break; } - + // Setup the verification grid if(nxy == 0) process_grid(fcst_grid, obs_grid); @@ -738,7 +738,7 @@ void process_scores() { is_bad_data(fcst_dp(x, y)) || is_bad_data(obs_dp(x,y)) || (cmn_flag && is_bad_data(cmn_dp(x, y))) || - (csd_flag && is_bad_data(csd_dp(x, y)))) continue; + (csd_flag && is_bad_data(csd_dp(x, y)))) continue; pd_ptr[i].add_grid_pair(fcst_dp(x, y), obs_dp(x, y), (cmn_flag ? cmn_dp(x, y) : bad_data_double), @@ -2031,12 +2031,12 @@ void setup_nc_file(const VarInfo *fcst_info, const VarInfo *obs_info) { (string)conf_info.mask_grid_name : na_str)); add_att(nc_out, "mask_poly", (conf_info.mask_poly_name.nonempty() ? (string)conf_info.mask_poly_name : na_str)); - add_att(nc_out, "fcst_var", (string)fcst_info->name()); - add_att(nc_out, "fcst_lev", (string)fcst_info->level_name()); - add_att(nc_out, "fcst_units", (string)fcst_info->units()); - add_att(nc_out, "obs_var", (string)obs_info->name()); - add_att(nc_out, "obs_lev", (string)obs_info->level_name()); - add_att(nc_out, "obs_units", (string)obs_info->units()); + add_att(nc_out, "fcst_var", (string)fcst_info->name_attr()); + add_att(nc_out, "fcst_lev", (string)fcst_info->level_attr()); + add_att(nc_out, "fcst_units", (string)fcst_info->units_attr()); + add_att(nc_out, "obs_var", (string)obs_info->name_attr()); + add_att(nc_out, "obs_lev", (string)obs_info->level_attr()); + add_att(nc_out, "obs_units", (string)obs_info->units_attr()); // Add the projection information write_netcdf_proj(nc_out, grid); @@ -2298,7 +2298,7 @@ void set_verbosity(const StringArray & a) { if(mlog.verbosity_level() >= 3) { mlog << Warning << "\nRunning Series-Analysis at verbosity >= 3 " << "produces excessive log output and can slow the runtime " - << "considerably.\n\n"; + << "considerably.\n\n"; } } diff --git a/met/src/tools/other/mode_time_domain/mtd.cc b/met/src/tools/other/mode_time_domain/mtd.cc index 64152e82ca..d243bcb0b6 100644 --- a/met/src/tools/other/mode_time_domain/mtd.cc +++ b/met/src/tools/other/mode_time_domain/mtd.cc @@ -1100,11 +1100,11 @@ mtd_read_data(config, *(config.fcst_info), single_filenames, raw); // copy forecast name/units/level to observation // -config.obs_info->set_name(config.fcst_info->name().text()); +config.obs_info->set_name(config.fcst_info->name_attr().text()); -config.obs_info->set_units(config.fcst_info->units().text()); +config.obs_info->set_units(config.fcst_info->units_attr().text()); -config.obs_info->set_level_name(config.fcst_info->level_name().text()); +config.obs_info->set_level_name(config.fcst_info->level_attr().text()); config.delta_t_seconds = raw.delta_t(); diff --git a/met/src/tools/tc_utils/tc_rmw/tc_rmw.cc b/met/src/tools/tc_utils/tc_rmw/tc_rmw.cc index ccd296187a..36ef1090b4 100644 --- a/met/src/tools/tc_utils/tc_rmw/tc_rmw.cc +++ b/met/src/tools/tc_utils/tc_rmw/tc_rmw.cc @@ -600,12 +600,12 @@ void setup_nc_file() { // Get VarInfo data_info = conf_info.data_info[i_var]; mlog << Debug(4) << "Processing field: " << data_info->magic_str() << "\n"; - variable_levels[data_info->name()].push_back( - data_info->level_name()); - variable_long_names[data_info->name()] - = data_info->long_name(); - variable_units[data_info->name()] - = data_info->units(); + variable_levels[data_info->name_attr()].push_back( + data_info->level_attr()); + variable_long_names[data_info->name_attr()] + = data_info->long_name_attr(); + variable_units[data_info->name_attr()] + = data_info->units_attr(); } // Define pressure levels @@ -749,13 +749,13 @@ void process_fields(const TrackInfoArray& tracks) { mlog << Debug(4) << "data_max:" << data_max << "\n"; // Write data - if (variable_levels[data_info->name()].size() > 1) { + if (variable_levels[data_info->name_attr()].size() > 1) { write_tc_pressure_level_data(nc_out, tcrmw_grid, - pressure_level_indices, data_info->level().name(), - i_point, data_3d_vars[data_info->name()], data_dp.data()); + pressure_level_indices, data_info->level_attr()), + i_point, data_3d_vars[data_info->name_attr()], data_dp.data()); } else { write_tc_data_rev(nc_out, tcrmw_grid, i_point, - data_3d_vars[data_info->name()], data_dp.data()); + data_3d_vars[data_info->name_attr()], data_dp.data()); } } } // Close loop over track points