diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2011-09-28 11:10:21 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2011-09-29 20:57:10 +0200 |
| commit | 344f522f2227b02f698d7f23f9cbce68d1660b81 (patch) | |
| tree | 84d94f249eb0e463c2820e53686afc841be8b2a4 /Tools/CodeGen | |
| parent | c05d20c3934b4525cba12bb53847352b434711d6 (diff) | |
Use imin and imax instead of min and max as formal argument names for loop body functions
Diffstat (limited to 'Tools/CodeGen')
| -rw-r--r-- | Tools/CodeGen/CalculationFunction.m | 2 | ||||
| -rw-r--r-- | Tools/CodeGen/CodeGen.m | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Tools/CodeGen/CalculationFunction.m b/Tools/CodeGen/CalculationFunction.m index 155ae63..a93516e 100644 --- a/Tools/CodeGen/CalculationFunction.m +++ b/Tools/CodeGen/CalculationFunction.m @@ -462,7 +462,7 @@ CreateCalculationFunction[calcp_, debug_, imp_, opts:OptionsPattern[]] := "Calculation is:", cleancalc]]; { - DefineFunction[bodyFunctionName, "static void", "cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[]", + DefineFunction[bodyFunctionName, "static void", "cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const imin[3], int const imax[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[]", { "DECLARE_CCTK_ARGUMENTS;\n", "DECLARE_CCTK_PARAMETERS;\n\n", diff --git a/Tools/CodeGen/CodeGen.m b/Tools/CodeGen/CodeGen.m index 29a42cc..86d2260 100644 --- a/Tools/CodeGen/CodeGen.m +++ b/Tools/CodeGen/CodeGen.m @@ -665,9 +665,9 @@ GenericGridLoop[functionName_, block_, opts:OptionsPattern[]] := GenericGridLoopTraditional[block_] := CommentedBlock["Loop over the grid points", - loopOverInteger["k", "min[2]", "max[2]", - loopOverInteger["j", "min[1]", "max[1]", - loopOverInteger["i", "min[0]", "max[0]", + loopOverInteger["k", "imin[2]", "imax[2]", + loopOverInteger["j", "imin[1]", "imax[1]", + loopOverInteger["i", "imin[0]", "imax[0]", { If[SOURCELANGUAGE == "C", { @@ -684,7 +684,7 @@ GenericGridLoopUsingLoopControl[functionName_, block_, vectorise_] := { "#pragma omp parallel\n", If[vectorise, "LC_LOOP3VEC", "LC_LOOP3"] <> " (", functionName, ",\n", - " i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],\n", + " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n", " cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]", If[vectorise, {",\n", " CCTK_REAL_VEC_SIZE"},""] <> ")\n", "{\n", |