Skip to content

Commit

Permalink
Feature 1912 missing (#1915)
Browse files Browse the repository at this point in the history
* Per #1912, update logic of Met2dDataFile::process_data_plane(). Rather than returning bad status for a field of all bad data, print a warning message and continue processing.

* Per #1912, fixing typo in error message that I ran into. Doesn't actually apply to this issue.

* Per #1912, making an unrelated change here to fix up the MODE-Analysis log output. It was reporting (nul) for the number of lines being read/kept. Simplify the log messages to print the correct numbers.
  • Loading branch information
JohnHalleyGotway authored Sep 15, 2021
1 parent eee1ee7 commit ab4c731
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 31 deletions.
33 changes: 6 additions & 27 deletions met/src/libcode/vx_analysis_util/mode_job.cc
Original file line number Diff line number Diff line change
Expand Up @@ -535,20 +535,6 @@ for (j=0; j<Nfields; ++j) {

}

/*
for (j=0; j<ncols; ++j) {
m = table.col_width(j);
memset(junk, 0, sizeof(junk));
for (k=0; k<m; ++k) junk[k] = underline_char;
table.set_entry(1, j, junk);
};
*/

table.line_up_decimal_points();

table.underline_row(1, underline_char);
Expand Down Expand Up @@ -587,7 +573,6 @@ void SummaryJob::do_job(const StringArray & mode_files)
int j;
const int Nfields = columns.n_elements();
const int Nfiles = mode_files.n_elements();
ConcatString junk;
AsciiTable t;


Expand Down Expand Up @@ -621,11 +606,9 @@ for (j=0; j<Nfiles; ++j) {

}

comma_string(n_lines_read, junk);
mlog << Debug(2) << "Total mode lines read = " << junk << "\n";

comma_string(n_lines_kept, junk);
mlog << Debug(2) << "Total mode lines kept = " << junk << "\n";
mlog << Debug(2)
<< "Total mode lines read = " << n_lines_read << "\n"
<< "Total mode lines kept = " << n_lines_kept << "\n";

//
// output
Expand Down Expand Up @@ -989,7 +972,6 @@ void ByCaseJob::do_job(const StringArray & mode_files)

int j;
const int Nfiles = mode_files.n_elements();
ConcatString junk;
int n_valid_times;


Expand Down Expand Up @@ -1023,7 +1005,6 @@ for (j=0; j<n_valid_times; ++j) {

}


//
// loop through the files
//
Expand All @@ -1034,11 +1015,9 @@ for (j=0; j<Nfiles; ++j) {

}

comma_string(n_lines_read, junk);
mlog << Debug(2) << "Total mode lines read = " << junk << "\n";

comma_string(n_lines_kept, junk);
mlog << Debug(2) << "Total mode lines kept = " << junk << "\n";
mlog << Debug(2)
<< "Total mode lines read = " << n_lines_read << "\n"
<< "Total mode lines kept = " << n_lines_kept << "\n";

//
// output
Expand Down
5 changes: 2 additions & 3 deletions met/src/libcode/vx_data2d/data_class.cc
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,8 @@ if ( ! vinfo ) return ( false );

if ( dp.is_all_bad_data() ) {

mlog << Debug(3) << "No valid data found in input data plane!\n";

return ( false );
mlog << Warning << "\nThe field \"" << vinfo->magic_str()
<< "\" contains no valid data!\n\n";

}

Expand Down
2 changes: 1 addition & 1 deletion met/src/tools/other/ioda2nc/ioda2nc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ void write_netcdf_hdr_data() {
// Check for no messages retained
if(hdr_cnt <= 0) {
mlog << Error << method_name << " -> "
<< "No IODA reocrds retained. Nothing to write.\n\n";
<< "No IODA records retained. Nothing to write.\n\n";
// Delete the NetCDF file
remove_temp_file(ncfile);
exit(1);
Expand Down

0 comments on commit ab4c731

Please sign in to comment.