update remap_vars after rebase

src/remap_vars.cc

@@ -211,7 +211,7 @@ void
 remap(Field_t &field2, double missval, size_t gridsize2, const RemapVars &rv, const Field_t &field1, RemapGradients &gradients)
 {
   const auto func = [](LambdaField_T_ field1, LambdaField_T_ field2, double missval, size_t gridsize2, const RemapVars &rv, RemapGradients &gradients) {
-    using T = std::remove_reference_t<decltype(field1)>;
+    using T = std::remove_reference_t<decltype(field2)>;
     remap(field2.vec, static_cast<typename T::memType>(missval), gridsize2, rv, field1.vec, gradients);
   };
 
@@ -391,7 +391,7 @@ void
 remap_laf(Field_t &field2, double missval, size_t gridsize2, const RemapVars &rv, const Field_t &field1)
 {
   const auto func = [](LambdaField_T_ field1, LambdaField_T_ field2, double missval, size_t gridsize2, const RemapVars &rv) {
-    using T = std::remove_reference_t<decltype(field1)>;
+    using T = std::remove_reference_t<decltype(field2)>;
     remap_laf(field2.vec, static_cast<typename T::memType>(missval), gridsize2, rv, field1.vec);
   };
 
@@ -493,7 +493,7 @@ void
 remap_avg(Field_t &field2, double missval, size_t gridsize2, const RemapVars &rv, const Field_t &field1)
 {
   const auto func = [](LambdaField_T_ field1, LambdaField_T_ field2, double missval, size_t gridsize2, const RemapVars &rv) {
-    using T = std::remove_reference_t<decltype(field1)>;
+    using T = std::remove_reference_t<decltype(field2)>;
     remap_avg(field2.vec, static_cast<typename T::memType>(missval), gridsize2, rv, field1.vec);
   };