Merge pull request #2595 from dtcenter/bugfix_2578_rotated_latlon_mai…

…n_v11.1 Bugfix 2578 rotated latlon main v11.1
dtcenter · Jul 3, 2023 · 79f6afd · 79f6afd
2 parents e4ba356 + df36ebe
commit 79f6afd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/libcode/vx_data2d_nccf/nccf_file.cc b/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -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;

diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc
@@ -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);
 }
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/libcode/vx_nc_util/nc_utils.h b/src/libcode/vx_nc_util/nc_utils.h
@@ -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";