From a2c13e8aba628decb57d5bbb438a17d917c66e03 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 1 Feb 2008 22:20:39 -0500 Subject: Erik's addition of () around macro argument --- Tools/CodeGen/Differencing.m | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'Tools/CodeGen') diff --git a/Tools/CodeGen/Differencing.m b/Tools/CodeGen/Differencing.m index a7ea1c2..d027c3b 100644 --- a/Tools/CodeGen/Differencing.m +++ b/Tools/CodeGen/Differencing.m @@ -404,8 +404,16 @@ DifferenceGFTerm[op_, i_, j_, k_] := ThrowError["Could not parse difference operator:", op]]; If[CodeGen`SOURCELANGUAGE == "C", - remaining "u[CCTK_GFINDEX3D(cctkGH," <> ToString[CFormHideStrings[i+nx]] <> "," <> - ToString[CFormHideStrings[j+ny]] <> "," <> ToString[CFormHideStrings[k+nz]] <> ")]", + remaining "(u)[CCTK_GFINDEX3D(cctkGH," <> + ToString[CFormHideStrings[i+nx]] <> "," <> + ToString[CFormHideStrings[j+ny]] <> "," <> + ToString[CFormHideStrings[k+nz]] <> ")]", +(* + remaining "(u)[CCTK_GFINDEX3D(cctkGH,floor((" <> + ToString[CFormHideStrings[i+nx]] <> ")+0.5),floor((" <> + ToString[CFormHideStrings[j+ny]] <> ")+0.5),floor((" <> + ToString[CFormHideStrings[k+nz]] <> ")+0.5))]", +*) remaining "u(" <> ToString[FortranForm[i+nx]] <> "," <> ToString[FortranForm[j+ny]] <> "," <> ToString[FortranForm[k+nz]] <> ")"] ]; @@ -426,7 +434,7 @@ DifferenceGFTermInline[op_, i_, j_, k_] := If[Cases[{remaining}, shift[_], Infinity] != {}, ThrowError["Could not parse difference operator:", op]]; - remaining "u[CCTK_GFINDEX3D(cctkGH," <> ToString[CFormHideStrings[i+nx]] <> "," <> + remaining "(u)[CCTK_GFINDEX3D(cctkGH," <> ToString[CFormHideStrings[i+nx]] <> "," <> ToString[CFormHideStrings[j+ny]] <> "," <> ToString[CFormHideStrings[k+nz]] <> ")]" ]; -- cgit v1.2.3