Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix 1936 develop madis2nc #1984

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Bugfix 1936 develop madis2nc #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a5233
#1936 Excludes precip3hr, precip6hr, precip12hr, and precip10min from…
Nov 29, 2021
d35190e
#1936 Added an unit test for newer MESONET file
Dec 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions met/src/tools/other/madis2nc/madis2nc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static void clean_up();
static void setup_netcdf_out(int nhdr);

static bool get_filtered_nc_data(NcVar var, float *data, const long dim,
const long cur, const char *var_name);
const long cur, const char *var_name, bool required=true);
static bool get_filtered_nc_data_2d(NcVar var, int *data, const long *dim,
const long *cur, const char *var_name, bool count_bad=false);
static bool get_filtered_nc_data_2d(NcVar var, float *data, const long *dim,
Expand Down Expand Up @@ -415,7 +415,7 @@ void setup_netcdf_out(int nhdr) {

static bool get_filtered_nc_data(NcVar var, float *data,
const long dim, const long cur,
const char *var_name) {
const char *var_name, bool required) {

bool status = false;
float in_fill_value;
Expand All @@ -439,15 +439,13 @@ static bool get_filtered_nc_data(NcVar var, float *data,
<< "Fail to read data [" << var_name << "].\n\n";
}
}
else {
else if (required) {
mlog << Error << "\n" << method_name
<< "Can not read a NetCDF data because the variable [" << var_name << "] is missing.\n\n";
}
if (!status) {
for (int idx=0; idx<dim; idx++) {
data[idx] = bad_data_float;
rej_fill++;
}
if(!status) {
for (int idx=0; idx<dim; idx++) data[idx] = bad_data_float;
rej_fill += dim;
}
return status;

Expand Down Expand Up @@ -2715,10 +2713,6 @@ void process_madis_mesonet(NcFile *&f_in) {
if (IS_INVALID_NC(in_soilTemperature_var)) missing_vars.add("soilTemperature");
if (IS_INVALID_NC(in_minTemp24Hour_var)) missing_vars.add("minTemp24Hour");
if (IS_INVALID_NC(in_maxTemp24Hour_var)) missing_vars.add("maxTemp24Hour");
if (IS_INVALID_NC(in_precip3hr_var)) missing_vars.add("precip3hr");
if (IS_INVALID_NC(in_precip6hr_var)) missing_vars.add("precip6hr");
if (IS_INVALID_NC(in_precip12hr_var)) missing_vars.add("precip12hr");
if (IS_INVALID_NC(in_precip10min_var)) missing_vars.add("precip10min");
if (IS_INVALID_NC(in_precip1min_var)) missing_vars.add("precip1min");
if (IS_INVALID_NC(in_windDir10_var)) missing_vars.add("windDir10");
if (IS_INVALID_NC(in_windSpeed10_var)) missing_vars.add("windSpeed10");
Expand Down Expand Up @@ -2922,10 +2916,10 @@ void process_madis_mesonet(NcFile *&f_in) {
get_filtered_nc_data(in_soilTemperature_var, soilTemperature_arr, buf_size, i_hdr_s, "soilTemperature" );
get_filtered_nc_data(in_minTemp24Hour_var, minTemp24Hour_arr, buf_size, i_hdr_s, "minTemp24Hour" );
get_filtered_nc_data(in_maxTemp24Hour_var, maxTemp24Hour_arr, buf_size, i_hdr_s, "maxTemp24Hour" );
get_filtered_nc_data(in_precip3hr_var, precip3hr_arr, buf_size, i_hdr_s, "precip3hr" );
get_filtered_nc_data(in_precip6hr_var, precip6hr_arr, buf_size, i_hdr_s, "precip6hr" );
get_filtered_nc_data(in_precip12hr_var, precip12hr_arr, buf_size, i_hdr_s, "precip12hr" );
get_filtered_nc_data(in_precip10min_var, precip10min_arr, buf_size, i_hdr_s, "precip10min" );
get_filtered_nc_data(in_precip3hr_var, precip3hr_arr, buf_size, i_hdr_s, "precip3hr" , false);
get_filtered_nc_data(in_precip6hr_var, precip6hr_arr, buf_size, i_hdr_s, "precip6hr" , false);
get_filtered_nc_data(in_precip12hr_var, precip12hr_arr, buf_size, i_hdr_s, "precip12hr" , false);
get_filtered_nc_data(in_precip10min_var, precip10min_arr, buf_size, i_hdr_s, "precip10min" , false);
get_filtered_nc_data(in_precip1min_var, precip1min_arr, buf_size, i_hdr_s, "precip1min" );
get_filtered_nc_data(in_windDir10_var, windDir10_arr, buf_size, i_hdr_s, "windDir10" );
get_filtered_nc_data(in_windSpeed10_var, windSpeed10_arr, buf_size, i_hdr_s, "windSpeed10" );
Expand Down
12 changes: 12 additions & 0 deletions test/xml/unit_madis2nc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@
</output>
</test>

<test name="madis2nc_MESONET_optional_vars">
<exec>&MET_BIN;/madis2nc</exec>
<param> \
&DATA_DIR_OBS;/madis/mesonet/mesonet_20170101_0000.nc \
&OUTPUT_DIR;/madis2nc/mesonet_20170101_0000_F000.nc \
-type mesonet -mask_grid G207 -v 2
</param>
<output>
<point_nc>&OUTPUT_DIR;/madis2nc/mesonet_20170101_0000_F000.nc</point_nc>
</output>
</test>

<test name="madis2nc_ACARS_PROFILES">
<exec>&MET_BIN;/madis2nc</exec>
<param> \
Expand Down