merged stashed

src/Classic/Fields/FM3DH5BlockBase.h

@@ -217,6 +217,18 @@ protected:
                                   (long double)difference,
                                   (long double)hz_m
                                   );
+=======
+        idx.i = std::min((unsigned int)((difference) / __float128(hx_m)), num_gridpx_m);
+        idx.weight(0) = std::fmod(difference, (long)hx_m);
+
+        difference = __float128(X(1)) - __float128(ybegin_m);
+        idx.j = std::min(unsigned int)((difference) / __float128(hy_m)), num_gridpy_m;
+        idx.weight(1) = std::fmod(difference, (long)hy_m);
+
+        difference = __float128(X(2)) - __float128(zbegin_m);
+        idx.k = std::min(unsigned int)((difference) / __float128(hz_m)), num_gridpz_m;
+        idx.weight(2) = std::fmod(difference, (long)hz_m);
+>>>>>>> Stashed changes
 
         return idx;
     }
@@ -270,4 +282,4 @@ protected:
 
 using FM3DH5BlockBase = std::shared_ptr<_FM3DH5BlockBase>;
 
-#endif
\ No newline at end of file
+#endif