From 2ba6cd99d40a0f276fc47522e41f4b0c061a37ef Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Fri, 26 Feb 2021 16:16:23 -0700
Subject: [PATCH 1/8] #1454 Disabled plot_data_plane_CESM_SSMI_microwave and
 plot_data_plane_CESM_sea_ice_nc becaues of not evenly spaced

---
 test/xml/unit_plot_data_plane.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/xml/unit_plot_data_plane.xml b/test/xml/unit_plot_data_plane.xml
index 1eb25e614c..67ecba95bf 100644
--- a/test/xml/unit_plot_data_plane.xml
+++ b/test/xml/unit_plot_data_plane.xml
@@ -343,6 +343,7 @@
     </output>
   </test>
 
+  <!-- The delta of lat/lon is not con
   <test name="plot_data_plane_CESM_SSMI_microwave">
     <exec>&MET_BIN;/plot_data_plane</exec>
     <param> \
@@ -368,6 +369,7 @@
       <ps>&OUTPUT_DIR;/plot_data_plane/CESM_b.e11.B20TRC5CNBDRD.f09_g16.002.cice.h1.aice_d_nh.19200101-20051231.ps</ps>
     </output>
   </test>
+  -->
 
   <!--
   <test name="plot_data_plane_EaSM_CMIP5_histroical">

From fe5f318fc0cc01cd9777bc803641ef9f7f033085 Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Fri, 26 Feb 2021 16:18:03 -0700
Subject: [PATCH 2/8] #1454 Moved NC attribute name to nc_utils.h

---
 met/src/libcode/vx_data2d_nc_met/met_file.cc         | 5 -----
 met/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc | 3 ---
 met/src/libcode/vx_nc_util/nc_utils.cc               | 5 -----
 met/src/libcode/vx_nc_util/nc_utils.h                | 9 +++++++++
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/met/src/libcode/vx_data2d_nc_met/met_file.cc b/met/src/libcode/vx_data2d_nc_met/met_file.cc
index 6f922b80e6..83c56a5e8e 100644
--- a/met/src/libcode/vx_data2d_nc_met/met_file.cc
+++ b/met/src/libcode/vx_data2d_nc_met/met_file.cc
@@ -41,11 +41,6 @@ static const string valid_time_ut_att_name  = "valid_time_ut";
 static const string  init_time_ut_att_name  = "init_time_ut";
 static const string accum_time_att_name  = "accum_time_sec";
 
-static const string name_att_name        = "name";
-static const string long_name_att_name   = "long_name";
-static const string level_att_name       = "level";
-static const string units_att_name       = "units";
-
 static const int  max_met_args           = 30;
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/met/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc b/met/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
index 4f9f24ca16..84cec1cf06 100644
--- a/met/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
+++ b/met/src/libcode/vx_data2d_nc_pinterp/pinterp_file.cc
@@ -58,9 +58,6 @@ static const char hpa_units_str        [] = "hPa";
 
 static const string init_time_att_name   = "START_DATE";
 
-static const string description_att_name  = "description";
-static const string units_att_name        = "units";
-
 static const int max_pinterp_args         = 30;
 
 static const double pinterp_missing       = 1.0e35;
diff --git a/met/src/libcode/vx_nc_util/nc_utils.cc b/met/src/libcode/vx_nc_util/nc_utils.cc
index a0c302b96c..62b64e233b 100644
--- a/met/src/libcode/vx_nc_util/nc_utils.cc
+++ b/met/src/libcode/vx_nc_util/nc_utils.cc
@@ -25,11 +25,6 @@ using namespace netCDF::exceptions;
 
 ////////////////////////////////////////////////////////////////////////
 
-static const string  level_att_name         = "level";
-static const string  units_att_name         = "units";
-static const string  missing_value_att_name = "missing_value";
-static const string  fill_value_att_name    = "_FillValue";
-
 ////////////////////////////////////////////////////////////////////////
 
 void patch_nc_name(string *var_name) {
diff --git a/met/src/libcode/vx_nc_util/nc_utils.h b/met/src/libcode/vx_nc_util/nc_utils.h
index 9945afc563..79cc241f07 100644
--- a/met/src/libcode/vx_nc_util/nc_utils.h
+++ b/met/src/libcode/vx_nc_util/nc_utils.h
@@ -128,6 +128,15 @@ static const string nc_att_use_var_id   = "use_var_id";
 static const char nc_att_obs_version[]  = "MET_Obs_version";
 static const char nc_att_met_point_nccf[] = "MET_point_NCCF";
 
+static const string description_att_name   = "description";
+static const string fill_value_att_name    = "_FillValue";
+static const string level_att_name         = "level";
+static const string long_name_att_name     = "long_name";
+static const string missing_value_att_name = "missing_value";
+static const string name_att_name          = "name";
+static const 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 MET_NC_Obs_ver_1_2[]  = "1.02";

From c1463b2e232a4b196b685904526b83b510e14299 Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Fri, 26 Feb 2021 16:23:17 -0700
Subject: [PATCH 3/8] #1454 Corrected sanity checking for lat/lon projection
 based on the percentage of the delta instead of fixed tolerance

---
 met/src/libcode/vx_data2d_nccf/nccf_file.cc | 122 +++++++++++---------
 1 file changed, 65 insertions(+), 57 deletions(-)

diff --git a/met/src/libcode/vx_data2d_nccf/nccf_file.cc b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
index b96ea5ed2d..4ba5c073c4 100644
--- a/met/src/libcode/vx_data2d_nccf/nccf_file.cc
+++ b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -33,6 +33,7 @@ using namespace std;
 
 
 static const int  max_met_args           = 30;
+static const double DELTA_TOLERANCE_PERCENT = 0.05;
 
 const double NcCfFile::DELTA_TOLERANCE = 15.0;
 
@@ -2870,43 +2871,33 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
 
   // Figure out the dlat/dlon values from the dimension variables
 
-  double lat_values[lat_counts];
-  double lon_values[lon_counts];
-
   bool two_dim_corrd = false;
   long x_size = get_data_size(lon_var);
   long y_size = get_data_size(lat_var);
   long latlon_counts = lon_counts*lat_counts;
-  if( x_size == latlon_counts || y_size == latlon_counts ) two_dim_corrd = true;
-  else if( x_size != lon_counts || y_size != lat_counts)
+  two_dim_corrd = (x_size == latlon_counts) && (y_size == latlon_counts );
+  if( !two_dim_corrd && (x_size != lon_counts || y_size != lat_counts))
   {
     mlog << Error << "\n" << method_name << " -> "
          << "Coordinate variables don't match dimension sizes in netCDF file.\n\n";
     exit(1);
   }
 
-  if (two_dim_corrd) {
-    long cur[2], length[2];
-    for (int i=0; i<2; i++) {
-       cur[i] = 0;
-       length[i] = 1;
-    }
-    length[0] = lat_counts;
-    get_nc_data(lat_var,lat_values, length, cur);
-    length[1] = lon_counts;
-    length[0] = 1;
-    get_nc_data(lon_var,lon_values, length, cur);
-  }
-  else {
-    get_nc_data(lat_var,lat_values);
-    get_nc_data(lon_var,lon_values);
-  }
+  double lat_values[y_size];
+  double lon_values[x_size];
+  get_nc_data(lat_var,lat_values);
+  get_nc_data(lon_var,lon_values);
 
-  // Calculate dlat and dlon assuming they are constant.  MET requires that
-  // dlat be equal to dlon
+  // Calculate dlat and dlon assuming they are constant.
 
-  double dlat = lat_values[1] - lat_values[0];
-  double dlon = rescale_lon(lon_values[1] - lon_values[0]);
+  bool lat_first = false;
+  double dlat = fabs(lat_values[1] - lat_values[0]);
+  double dlon = rescale_lon(fabs(lon_values[1] - lon_values[0]));
+  if( two_dim_corrd ) {
+    lat_first = (lat_counts == get_dim_size(lat_var, 0));
+    if( lat_first ) dlat = fabs(lat_values[lon_counts] - lat_values[0]);
+    else dlon = fabs(rescale_lon(lon_values[lat_counts] - lon_values[0]));
+  }
 
   ConcatString point_nccf;
   bool skip_sanity_check = get_att_value_string(_ncFile, nc_att_met_point_nccf, point_nccf);
@@ -2919,53 +2910,70 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
   // entire grid.  CF compliancy doesn't require this, but MET does.
 
   if (!skip_sanity_check) {
+    double degree_tolerance;
     float lat_missing_value = bad_data_double;
     float lon_missing_value = bad_data_double;
-    NcVarAtt *missing_value_att = (NcVarAtt*) 0;
-    missing_value_att = get_nc_att(lat_var, (string)"_FillValue");
-    if (IS_VALID_NC_P(missing_value_att)) {
-      lat_missing_value = get_att_value_double(missing_value_att);
-    }
-    if( missing_value_att ) delete missing_value_att;
-    missing_value_att = get_nc_att(lon_var, (string)"_FillValue");
-    if (IS_VALID_NC_P(missing_value_att)) {
-      lon_missing_value = get_att_value_double(missing_value_att);
-    }
-    if( missing_value_att ) delete missing_value_att;
+    bool sanity_check_failed = false;
+    get_var_att_float(lat_var, fill_value_att_name, lat_missing_value);
+    get_var_att_float(lon_var, fill_value_att_name, lon_missing_value);
 
-    if (fabs(dlat - dlon) > DELTA_TOLERANCE)
-    {
-      mlog << Error << "\n" << method_name << " -> "
-           << "MET can only process Latitude/Longitude files where the delta lat and delta lon are the same\n\n";
-      exit(1);
-    }
-    
+    degree_tolerance = dlat * DELTA_TOLERANCE_PERCENT;
     for (int i = 1; i < (int)lat_counts; ++i)
     {
-      if ((fabs(lat_missing_value - lat_values[i]) < DELTA_TOLERANCE) ||
-          (fabs(lat_missing_value - lat_values[i-1]) < DELTA_TOLERANCE)) continue;
-      double curr_delta = lat_values[i] - lat_values[i-1];
-      if (fabs(curr_delta - dlat) > DELTA_TOLERANCE)
+      int idx_cur = i;
+      int idx_pre = i - 1;
+      if( two_dim_corrd && lat_first ) {
+        idx_cur *= lon_counts;
+        idx_pre *= lon_counts;
+      }
+      if ((fabs(lat_missing_value - lat_values[idx_cur]) < degree_tolerance) ||
+          (fabs(lat_missing_value - lat_values[idx_pre]) < degree_tolerance)) continue;
+      double curr_delta = fabs(lat_values[idx_cur] - lat_values[idx_pre]);
+      if (fabs(curr_delta - dlat) > degree_tolerance)
       {
+        mlog << Debug(4) << method_name << " -> lat["
+             << idx_pre << "]=" << lat_values[idx_pre] << " lat["
+             << idx_cur << "]=" << lat_values[idx_cur] << "  "
+             << fabs(curr_delta - dlat) << " > " << degree_tolerance << "\n";
         mlog << Error << "\n" << method_name << " -> "
-             << "MET can only process Latitude/Longitude files where the lat delta is constant (dlat="
-             << dlat <<", dlon=" << dlon << ")\n\n";
-        exit(1);
+             << "MET can only process Latitude/Longitude files where the latitudes are evenly spaced (dlat="
+             << dlat <<", delta[" << i << "]=" << curr_delta << ")\n\n";
+        sanity_check_failed = true;
+        break;
       }
     }
-    
+
+    degree_tolerance = dlon * DELTA_TOLERANCE_PERCENT;
     for (int i = 1; i < (int)lon_counts; ++i)
     {
-      if ((fabs(lon_missing_value - lon_values[i]) < DELTA_TOLERANCE) ||
-          (fabs(lon_missing_value - lon_values[i-1]) < DELTA_TOLERANCE)) continue;
-      double curr_delta = rescale_lon(lon_values[i] - lon_values[i-1]);
-      if (fabs(curr_delta - dlon) > DELTA_TOLERANCE)
+      int idx_cur = i;
+      int idx_pre = i - 1;
+      if( two_dim_corrd && !lat_first ) {
+        idx_cur *= lat_counts;
+        idx_pre *= lat_counts;
+      }
+      if ((fabs(lon_missing_value - lon_values[idx_cur]) < degree_tolerance) ||
+          (fabs(lon_missing_value - lon_values[idx_pre]) < degree_tolerance)) continue;
+      double curr_delta = fabs(rescale_lon(lon_values[idx_cur] - lon_values[idx_pre]));
+      if (fabs(curr_delta - dlon) > degree_tolerance)
       {
+        mlog << Debug(4) << method_name << " -> lon["
+             << idx_pre << "]=" << lon_values[idx_pre] << " lon["
+             << idx_cur << "]=" << lon_values[idx_cur] << "  "
+             << fabs(curr_delta - dlon) << " > " << degree_tolerance << "\n";
         mlog << Error << "\n" << method_name << " -> "
-             << "MET can only process Latitude/Longitude files where the lon delta is constant\n\n";
-        exit(1);
+             << "MET can only process Latitude/Longitude files where the longitudes are evenly spaced (dlon="
+             << dlon <<", delta[" << i << "]=" << curr_delta << ")\n\n";
+        sanity_check_failed = true;
+        break;
       }
     }
+
+    if (sanity_check_failed) {
+      mlog << Error << "\n" << method_name << " -> "
+           << "Please check the input data is the lat/lon projection\n\n";
+      exit(1);
+    }
   }
 
   // Fill in the data structure.  Remember to negate the longitude

From ac4d7f99c3e61be48a0df3401cea68b0616c24b1 Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Fri, 26 Feb 2021 16:28:24 -0700
Subject: [PATCH 4/8] #1454 Corrected sanity checking for lat/lon projection
 based on the percentage of the delta instead of fixed tolerance

---
 met/src/libcode/vx_data2d_nccf/nccf_file.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/met/src/libcode/vx_data2d_nccf/nccf_file.cc b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
index 4ba5c073c4..7041b8beda 100644
--- a/met/src/libcode/vx_data2d_nccf/nccf_file.cc
+++ b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -2892,7 +2892,7 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
 
   bool lat_first = false;
   double dlat = fabs(lat_values[1] - lat_values[0]);
-  double dlon = rescale_lon(fabs(lon_values[1] - lon_values[0]));
+  double dlon = fabs(rescale_lon(lon_values[1] - lon_values[0]));
   if( two_dim_corrd ) {
     lat_first = (lat_counts == get_dim_size(lat_var, 0));
     if( lat_first ) dlat = fabs(lat_values[lon_counts] - lat_values[0]);

From 371dd2c1ecc1c39f6950d677d8b9e7c6aaeabb7b Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Mon, 1 Mar 2021 08:41:27 -0700
Subject: [PATCH 5/8] #1454 Corrected data.delta_lon

---
 met/src/libcode/vx_data2d_nccf/nccf_file.cc | 87 ++++++++++-----------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/met/src/libcode/vx_data2d_nccf/nccf_file.cc b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
index 7041b8beda..7ada423020 100644
--- a/met/src/libcode/vx_data2d_nccf/nccf_file.cc
+++ b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -32,7 +32,7 @@ using namespace std;
 ////////////////////////////////////////////////////////////////////////
 
 
-static const int  max_met_args           = 30;
+static const int  max_met_args              = 30;
 static const double DELTA_TOLERANCE_PERCENT = 0.05;
 
 const double NcCfFile::DELTA_TOLERANCE = 15.0;
@@ -2871,11 +2871,10 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
 
   // Figure out the dlat/dlon values from the dimension variables
 
-  bool two_dim_corrd = false;
   long x_size = get_data_size(lon_var);
   long y_size = get_data_size(lat_var);
   long latlon_counts = lon_counts*lat_counts;
-  two_dim_corrd = (x_size == latlon_counts) && (y_size == latlon_counts );
+  bool two_dim_corrd = (x_size == latlon_counts) && (y_size == latlon_counts );
   if( !two_dim_corrd && (x_size != lon_counts || y_size != lat_counts))
   {
     mlog << Error << "\n" << method_name << " -> "
@@ -2883,21 +2882,34 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
     exit(1);
   }
 
-  double lat_values[y_size];
-  double lon_values[x_size];
-  get_nc_data(lat_var,lat_values);
-  get_nc_data(lon_var,lon_values);
-
-  // Calculate dlat and dlon assuming they are constant.
-
+  double lat_values[lat_counts];
+  double lon_values[lon_counts];
   bool lat_first = false;
-  double dlat = fabs(lat_values[1] - lat_values[0]);
-  double dlon = fabs(rescale_lon(lon_values[1] - lon_values[0]));
-  if( two_dim_corrd ) {
+  if (two_dim_corrd) {
     lat_first = (lat_counts == get_dim_size(lat_var, 0));
-    if( lat_first ) dlat = fabs(lat_values[lon_counts] - lat_values[0]);
-    else dlon = fabs(rescale_lon(lon_values[lat_counts] - lon_values[0]));
+    long cur[2], length[2];
+    cur[0] = cur[1] = 0;
+    length[0] = length[1] = 1;
+    if (lat_first) length[0] = lat_counts;
+    else length[1] = lat_counts;
+    get_nc_data(lat_var,lat_values, length, cur);
+    
+    length[0] = length[1] = 1;
+    if (lat_first) length[1] = lon_counts;
+    else length[0] = lon_counts;
+    get_nc_data(lon_var,lon_values, length, cur);
   }
+  else {
+    get_nc_data(lat_var,lat_values);
+    get_nc_data(lon_var,lon_values);
+  }
+
+  // Calculate dlat and dlon assuming they are constant.
+
+  double dlat_raw = lat_values[1] - lat_values[0];
+  double dlon_raw = rescale_lon(lon_values[1] - lon_values[0]);
+  double dlat = fabs(dlat_raw);
+  double dlon = fabs(dlon_raw);
 
   ConcatString point_nccf;
   bool skip_sanity_check = get_att_value_string(_ncFile, nc_att_met_point_nccf, point_nccf);
@@ -2920,20 +2932,14 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
     degree_tolerance = dlat * DELTA_TOLERANCE_PERCENT;
     for (int i = 1; i < (int)lat_counts; ++i)
     {
-      int idx_cur = i;
-      int idx_pre = i - 1;
-      if( two_dim_corrd && lat_first ) {
-        idx_cur *= lon_counts;
-        idx_pre *= lon_counts;
-      }
-      if ((fabs(lat_missing_value - lat_values[idx_cur]) < degree_tolerance) ||
-          (fabs(lat_missing_value - lat_values[idx_pre]) < degree_tolerance)) continue;
-      double curr_delta = fabs(lat_values[idx_cur] - lat_values[idx_pre]);
+      if ((fabs(lat_missing_value - lat_values[i]) < degree_tolerance) ||
+          (fabs(lat_missing_value - lat_values[i-1]) < degree_tolerance)) continue;
+      double curr_delta = fabs(lat_values[i] - lat_values[i-1]);
       if (fabs(curr_delta - dlat) > degree_tolerance)
       {
         mlog << Debug(4) << method_name << " -> lat["
-             << idx_pre << "]=" << lat_values[idx_pre] << " lat["
-             << idx_cur << "]=" << lat_values[idx_cur] << "  "
+             << i-1 << "]=" << lat_values[i-1] << " lat["
+             << i << "]=" << lat_values[i] << "  "
              << fabs(curr_delta - dlat) << " > " << degree_tolerance << "\n";
         mlog << Error << "\n" << method_name << " -> "
              << "MET can only process Latitude/Longitude files where the latitudes are evenly spaced (dlat="
@@ -2946,20 +2952,14 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
     degree_tolerance = dlon * DELTA_TOLERANCE_PERCENT;
     for (int i = 1; i < (int)lon_counts; ++i)
     {
-      int idx_cur = i;
-      int idx_pre = i - 1;
-      if( two_dim_corrd && !lat_first ) {
-        idx_cur *= lat_counts;
-        idx_pre *= lat_counts;
-      }
-      if ((fabs(lon_missing_value - lon_values[idx_cur]) < degree_tolerance) ||
-          (fabs(lon_missing_value - lon_values[idx_pre]) < degree_tolerance)) continue;
-      double curr_delta = fabs(rescale_lon(lon_values[idx_cur] - lon_values[idx_pre]));
+      if ((fabs(lon_missing_value - lon_values[i]) < degree_tolerance) ||
+          (fabs(lon_missing_value - lon_values[i-1]) < degree_tolerance)) continue;
+      double curr_delta = fabs(rescale_lon(lon_values[i] - lon_values[i-1]));
       if (fabs(curr_delta - dlon) > degree_tolerance)
       {
         mlog << Debug(4) << method_name << " -> lon["
-             << idx_pre << "]=" << lon_values[idx_pre] << " lon["
-             << idx_cur << "]=" << lon_values[idx_cur] << "  "
+             << i-1 << "]=" << lon_values[i-1] << " lon["
+             << i << "]=" << lon_values[i] << "  "
              << fabs(curr_delta - dlon) << " > " << degree_tolerance << "\n";
         mlog << Error << "\n" << method_name << " -> "
              << "MET can only process Latitude/Longitude files where the longitudes are evenly spaced (dlon="
@@ -2991,17 +2991,14 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
   data.lat_ll = lat_values[0];
   data.lon_ll = -lon_values[0];
   data.delta_lat = dlat;
-  data.delta_lon = dlon;
+  data.delta_lon = dlon_raw;
   data.Nlat = lat_counts;
   data.Nlon = lon_counts;
-  if (dlat < 0) {
-    data.delta_lat = -dlat;
-    data.lat_ll = lat_values[lat_counts-1];
-  }
+  if (dlat_raw < 0) data.lat_ll = lat_values[lat_counts-1];
+
+  grid.set(data);   // resets swap_to_north to false
+  if (dlat_raw < 0) grid.set_swap_to_north(true);
 
-  grid.set(data);
-  if (dlat < 0) grid.set_swap_to_north(true);
- 
 }
 
 ////////////////////////////////////////////////////////////////////////

From 24c2bd82b2dbd39ce65ee5d49aab4f588269b2f8 Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Mon, 1 Mar 2021 09:45:50 -0700
Subject: [PATCH 6/8] #1454 Change bact to use diff instead of absolute value
 of diff

---
 met/src/libcode/vx_data2d_nccf/nccf_file.cc | 25 +++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/met/src/libcode/vx_data2d_nccf/nccf_file.cc b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
index 7ada423020..91696d8a91 100644
--- a/met/src/libcode/vx_data2d_nccf/nccf_file.cc
+++ b/met/src/libcode/vx_data2d_nccf/nccf_file.cc
@@ -2893,7 +2893,7 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
     if (lat_first) length[0] = lat_counts;
     else length[1] = lat_counts;
     get_nc_data(lat_var,lat_values, length, cur);
-    
+
     length[0] = length[1] = 1;
     if (lat_first) length[1] = lon_counts;
     else length[0] = lon_counts;
@@ -2906,10 +2906,8 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
 
   // Calculate dlat and dlon assuming they are constant.
 
-  double dlat_raw = lat_values[1] - lat_values[0];
-  double dlon_raw = rescale_lon(lon_values[1] - lon_values[0]);
-  double dlat = fabs(dlat_raw);
-  double dlon = fabs(dlon_raw);
+  double dlat = lat_values[1] - lat_values[0];
+  double dlon = rescale_lon(lon_values[1] - lon_values[0]);
 
   ConcatString point_nccf;
   bool skip_sanity_check = get_att_value_string(_ncFile, nc_att_met_point_nccf, point_nccf);
@@ -2929,12 +2927,12 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
     get_var_att_float(lat_var, fill_value_att_name, lat_missing_value);
     get_var_att_float(lon_var, fill_value_att_name, lon_missing_value);
 
-    degree_tolerance = dlat * DELTA_TOLERANCE_PERCENT;
+    degree_tolerance = fabs(dlat * DELTA_TOLERANCE_PERCENT);
     for (int i = 1; i < (int)lat_counts; ++i)
     {
       if ((fabs(lat_missing_value - lat_values[i]) < degree_tolerance) ||
           (fabs(lat_missing_value - lat_values[i-1]) < degree_tolerance)) continue;
-      double curr_delta = fabs(lat_values[i] - lat_values[i-1]);
+      double curr_delta = lat_values[i] - lat_values[i-1];
       if (fabs(curr_delta - dlat) > degree_tolerance)
       {
         mlog << Debug(4) << method_name << " -> lat["
@@ -2949,12 +2947,12 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
       }
     }
 
-    degree_tolerance = dlon * DELTA_TOLERANCE_PERCENT;
+    degree_tolerance = fabs(dlon * DELTA_TOLERANCE_PERCENT);
     for (int i = 1; i < (int)lon_counts; ++i)
     {
       if ((fabs(lon_missing_value - lon_values[i]) < degree_tolerance) ||
           (fabs(lon_missing_value - lon_values[i-1]) < degree_tolerance)) continue;
-      double curr_delta = fabs(rescale_lon(lon_values[i] - lon_values[i-1]));
+      double curr_delta = rescale_lon(lon_values[i] - lon_values[i-1]);
       if (fabs(curr_delta - dlon) > degree_tolerance)
       {
         mlog << Debug(4) << method_name << " -> lon["
@@ -2991,13 +2989,16 @@ void NcCfFile::get_grid_from_lat_lon_vars(NcVar *lat_var, NcVar *lon_var,
   data.lat_ll = lat_values[0];
   data.lon_ll = -lon_values[0];
   data.delta_lat = dlat;
-  data.delta_lon = dlon_raw;
+  data.delta_lon = dlon;
   data.Nlat = lat_counts;
   data.Nlon = lon_counts;
-  if (dlat_raw < 0) data.lat_ll = lat_values[lat_counts-1];
+  if (dlat < 0) {
+    data.delta_lat = -dlat;
+    data.lat_ll = lat_values[lat_counts-1];
+  }
 
   grid.set(data);   // resets swap_to_north to false
-  if (dlat_raw < 0) grid.set_swap_to_north(true);
+  if (dlat < 0) grid.set_swap_to_north(true);
 
 }
 

From e224ce126339179d91595676491c0b166ca1b90e Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Mon, 1 Mar 2021 13:13:46 -0700
Subject: [PATCH 7/8] 454 Deleted instea dof commenting out

---
 test/xml/unit_plot_data_plane.xml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/test/xml/unit_plot_data_plane.xml b/test/xml/unit_plot_data_plane.xml
index 67ecba95bf..e861ed154e 100644
--- a/test/xml/unit_plot_data_plane.xml
+++ b/test/xml/unit_plot_data_plane.xml
@@ -343,34 +343,6 @@
     </output>
   </test>
 
-  <!-- The delta of lat/lon is not con
-  <test name="plot_data_plane_CESM_SSMI_microwave">
-    <exec>&MET_BIN;/plot_data_plane</exec>
-    <param> \
-      &DATA_DIR_MODEL;/cesm/ssmi.ifrac.gx3v5.2003.nc \
-      &OUTPUT_DIR;/plot_data_plane/CESM_ssmi.ifrac.gx3v5.2003.ps \
-      'name="ifrac"; level="(0,*,*)";' \
-      -v 4
-    </param>
-    <output>
-      <ps>&OUTPUT_DIR;/plot_data_plane/CESM_ssmi.ifrac.gx3v5.2003.ps</ps>
-    </output>
-  </test>
-
-  <test name="plot_data_plane_CESM_sea_ice_nc">
-    <exec>&MET_BIN;/plot_data_plane</exec>
-    <param> \
-      &DATA_DIR_MODEL;/cesm/b.e11.B20TRC5CNBDRD.f09_g16.002.cice.h1.aice_d_nh.19200101-20051231.nc \
-      &OUTPUT_DIR;/plot_data_plane/CESM_b.e11.B20TRC5CNBDRD.f09_g16.002.cice.h1.aice_d_nh.19200101-20051231.ps \
-      'name="aice_d"; level="(0,*,*)";' \
-      -v 4
-    </param>
-    <output>
-      <ps>&OUTPUT_DIR;/plot_data_plane/CESM_b.e11.B20TRC5CNBDRD.f09_g16.002.cice.h1.aice_d_nh.19200101-20051231.ps</ps>
-    </output>
-  </test>
-  -->
-
   <!--
   <test name="plot_data_plane_EaSM_CMIP5_histroical">
     <exec>&MET_BIN;/plot_data_plane</exec>

From c8e90493b31e8eeab670b7294d3b1f1123624ad1 Mon Sep 17 00:00:00 2001
From: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Date: Mon, 1 Mar 2021 13:14:26 -0700
Subject: [PATCH 8/8] 454 Deleted instea dof commenting out

---
 test/xml/unit_plot_data_plane.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/test/xml/unit_plot_data_plane.xml b/test/xml/unit_plot_data_plane.xml
index e861ed154e..c655ff7116 100644
--- a/test/xml/unit_plot_data_plane.xml
+++ b/test/xml/unit_plot_data_plane.xml
@@ -343,21 +343,6 @@
     </output>
   </test>
 
-  <!--
-  <test name="plot_data_plane_EaSM_CMIP5_histroical">
-    <exec>&MET_BIN;/plot_data_plane</exec>
-    <param> \
-      &DATA_DIR_MODEL;/easm/pr_day_MPI-ESM-MR_historical_r1i1p1_20000101-20051231.nc \
-      &OUTPUT_DIR;/plot_data_plane/EaSM_CMIP5_pr_day_MPI-ESM-MR_historical_r1i1p1_20000101-20051231.ps \
-      'name="pr"; level="(0,*,*)";' \
-      -v 4
-    </param>
-    <output>
-      <ps>&OUTPUT_DIR;/plot_data_plane/EaSM_CMIP5_pr_day_MPI-ESM-MR_historical_r1i1p1_20000101-20051231.ps</ps>
-    </output>
-  </test>
-  -->
-
   <test name="plot_data_plane_EaSM_CMIP5_rcp85">
     <exec>&MET_BIN;/plot_data_plane</exec>
     <param> \