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 2578 rotated latlon main v11.1 #2595

Merged
merged 6 commits into from
Jul 3, 2023
Merged

Bugfix 2578 rotated latlon main v11.1 #2595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9bf17be
#2578 Sets swap_to_north flag for rotated lat/lon
Jun 29, 2023
add953d
#2578 Allow to swap_to_north flag for rotated lat/lon
Jun 29, 2023
4e884ab
#2578 Allow spaces around since
Jun 29, 2023
d644fdc
Merge branch 'main_v10.1' of github.com:dtcenter/MET into bugfix_2578…
jprestop Jul 3, 2023
1eb227d
Merge remote-tracking branch 'origin/main_v11.1' into bugfix_2578_rot…
Jul 3, 2023
df36ebe
Merge branch 'bugfix_2578_rotated_latlon_main_v11.1' of github.com:dt…
Jul 3, 2023
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
1 change: 1 addition & 0 deletions src/libcode/vx_data2d_nccf/nccf_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2580,6 +2580,7 @@ void NcCfFile::get_grid_mapping_rotated_latitude_longitude(const NcVar *grid_map
data.aux_rotation = 0;

grid.set(data);
grid.set_swap_to_north(swap_to_north);

if(grid_np_lat_att) delete grid_np_lat_att;
if(grid_np_lon_att) delete grid_np_lon_att;
Expand Down
2 changes: 1 addition & 1 deletion src/libcode/vx_grid/grid_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ return;
////////////////////////////////////////////////////////////////////////

bool Grid::get_swap_to_north() const {
return swap_to_north && (info().ll != 0);
return swap_to_north && (info().ll != nullptr || info().rll != nullptr);
}

////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion src/libcode/vx_nc_util/nc_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ 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_exp[] = "^[a-z|A-Z]* *since *[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";
Expand Down