Rename dst to tgt.

src/remap_search_latbins.cc

@@ -157,10 +157,10 @@ gridSearchSquareCurv2dNNScrip(size_t min_add, size_t max_add, size_t *nbr_add, d
 {
   int search_result = 0;
 
-  const double coslat_dst = std::cos(plat);
-  const double sinlat_dst = std::sin(plat);
-  const double coslon_dst = std::cos(plon);
-  const double sinlon_dst = std::sin(plon);
+  const auto tgtCoslat = std::cos(plat);
+  const auto tgtSinlat = std::sin(plat);
+  const auto tgtCoslon = std::cos(plon);
+  const auto tgtSinlon = std::sin(plon);
 
   double dist_min = DBL_MAX;
   for (unsigned n = 0; n < 4; ++n) nbr_dist[n] = DBL_MAX;
@@ -168,9 +168,9 @@ gridSearchSquareCurv2dNNScrip(size_t min_add, size_t max_add, size_t *nbr_add, d
   double distance;
   for (size_t srch_add = min_add; srch_add <= max_add; ++srch_add)
     {
-      distance = std::acos(coslat_dst * std::cos(src_center_lat[srch_add])
-                               * (coslon_dst * std::cos(src_center_lon[srch_add]) + sinlon_dst * std::sin(src_center_lon[srch_add]))
-                           + sinlat_dst * std::sin(src_center_lat[srch_add]));
+      distance = std::acos(tgtCoslat * std::cos(src_center_lat[srch_add])
+                               * (tgtCoslon * std::cos(src_center_lon[srch_add]) + tgtSinlon * std::sin(src_center_lon[srch_add]))
+                           + tgtSinlat * std::sin(src_center_lat[srch_add]));
 
       if (distance < dist_min)
         {

src/remap_search_reg2d.cc

@@ -36,10 +36,10 @@ grid_search_square_reg_2d_NN(size_t nx, size_t ny, size_t *nbr_add, double *nbr_
 {
   int search_result = 0;
 
-  const auto coslat_dst = std::cos(plat);
-  const auto sinlat_dst = std::sin(plat);
-  const auto coslon_dst = std::cos(plon);
-  const auto sinlon_dst = std::sin(plon);
+  const auto tgtCoslat = std::cos(plat);
+  const auto tgtSinlat = std::sin(plat);
+  const auto tgtCoslon = std::cos(plon);
+  const auto tgtSinlon = std::sin(plon);
 
   double dist_min = DBL_MAX;
   for (unsigned n = 0; n < 4; ++n) nbr_dist[n] = DBL_MAX;
@@ -66,12 +66,12 @@ grid_search_square_reg_2d_NN(size_t nx, size_t ny, size_t *nbr_add, double *nbr_
   std::vector<double> sincoslon(nx);
 
   for (size_t ii = 0; ii < nx; ++ii)
-    sincoslon[ii] = coslon_dst * std::cos(src_center_lon[ii]) + sinlon_dst * std::sin(src_center_lon[ii]);
+    sincoslon[ii] = tgtCoslon * std::cos(src_center_lon[ii]) + tgtSinlon * std::sin(src_center_lon[ii]);
 
   for (size_t jj = jjf; jj <= jjl; ++jj)
     {
-      const auto coslat = coslat_dst * std::cos(src_center_lat[jj]);
-      const auto sinlat = sinlat_dst * std::sin(src_center_lat[jj]);
+      const auto coslat = tgtCoslat * std::cos(src_center_lat[jj]);
+      const auto sinlat = tgtSinlat * std::sin(src_center_lat[jj]);
 
       const auto jjskip = (jj > 1 && jj < (ny - 2));