Differencing.m: Use KRANC_GFOFFSET3D macro in difference operators

ianhinder · Sep 29, 2011 · 99cc699 · 99cc699
1 parent 61eee9e
commit 99cc699
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/Tools/CodeGen/Differencing.m b/Tools/CodeGen/Differencing.m
@@ -503,20 +503,15 @@ A GridFunctionDerivative (GFD) is an expression of the form
     If[CodeGen`SOURCELANGUAGE == "C",
 
   If[vectorise,
-    remaining "vec_loadu_maybe3" <>
-      "(" <> ToString[CFormHideStrings[nx /. {dir1->1, dir2->1, dir3->1}]] <> "," <>
-             ToString[CFormHideStrings[ny /. {dir1->1, dir2->1, dir3->1}]] <> "," <>
-             ToString[CFormHideStrings[nz /. {dir1->1, dir2->1, dir3->1}]] <> "," <>
-      "*(CCTK_REAL const*)&((char const*)(u))" <>
-        "[cdi*(" <> ToString[CFormHideStrings[nx]] <> ")" <>
-        "+cdj*(" <> ToString[CFormHideStrings[ny]] <> ")" <>
-        "+cdk*(" <> ToString[CFormHideStrings[nz]] <> ")])",
-
-    remaining
-      "(*(CCTK_REAL const*)&((char const*)(u))" <>
-        "[cdi*(" <> ToString[CFormHideStrings[nx]] <> ")" <>
-        "+cdj*(" <> ToString[CFormHideStrings[ny]] <> ")" <>
-        "+cdk*(" <> ToString[CFormHideStrings[nz]] <> ")])"],
+    remaining "KRANC_GFOFFSET3D(u," <>
+      ToString[CFormHideStrings[nx /. {dir1->1, dir2->1, dir3->1}]] <> "," <>
+      ToString[CFormHideStrings[ny /. {dir1->1, dir2->1, dir3->1}]] <> "," <>
+      ToString[CFormHideStrings[nz /. {dir1->1, dir2->1, dir3->1}]] <> ")",
+
+    remaining "KRANC_GFOFFSET3D(u," <>
+      ToString[CFormHideStrings[nx]] <> "," <>
+      ToString[CFormHideStrings[ny]] <> "," <>
+      ToString[CFormHideStrings[nz]] <> ")"],
 
     remaining "u(" <> ToString[FortranForm[i+nx]] <> "," <> 
       ToString[FortranForm[j+ny]] <> "," <> ToString[FortranForm[k+nz]] <> ")"] ];