IVEC_LOOP_COUNTER macro

NanoComp · Jul 8, 2021 · 73154b4 · 73154b4
1 parent f5d61dd
commit 73154b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/dft.cpp b/src/dft.cpp
@@ -225,7 +225,7 @@ void dft_chunk::update_dft(double time) {
   int numcmp = fc->f[c][1] ? 2 : 1;
 
   PLOOP_OVER_IVECS(fc->gv, is, ie, idx) {
-    size_t idx_dft = (loop_i1 * loop_n2 + loop_i2) * loop_n3 + loop_i3;
+    size_t idx_dft = IVEC_LOOP_COUNTER;
     double w;
     if (include_dV_and_interp_weights) {
       w = IVEC_LOOP_WEIGHT(s0, s1, e0, e1, dV0 + dV1 * loop_i2);

diff --git a/src/meep/vec.hpp b/src/meep/vec.hpp
@@ -382,6 +382,9 @@ _Pragma("omp parallel for collapse(2)")
   (IVEC_LOOP_WEIGHT1(s0, s1, e0, e1, 3) *                                                          \
    (IVEC_LOOP_WEIGHT1(s0, s1, e0, e1, 2) * ((dV)*IVEC_LOOP_WEIGHT1(s0, s1, e0, e1, 1))))
 
+// equivalent to incrementing a counter, starting from 0, in the loop body
+#define IVEC_LOOP_COUNTER ((loop_i1 * loop_n2 + loop_i2) * loop_n3 + loop_i3)
+
 inline signed_direction flip(signed_direction d) {
   signed_direction d2 = d;
   d2.flipped = !d.flipped;