diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-05-03 12:50:32 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2010-05-03 12:50:32 -0500 |
| commit | cb874f331a3cf1faadf540762afa9817d4f42861 (patch) | |
| tree | 6b2ad46199dfdc2720cc3974134ce465774e1e08 /Tools/CodeGen/CalculationFunction.m | |
| parent | 04dfdcd32eec91978ba050a472aae2a6e7091c05 (diff) | |
Revert "Add support for vectorisation of generated code."
This reverts commit 8e006230f24be02831d390eaad9b90b7a7c77d2c.
Diffstat (limited to 'Tools/CodeGen/CalculationFunction.m')
| -rw-r--r-- | Tools/CodeGen/CalculationFunction.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/CodeGen/CalculationFunction.m b/Tools/CodeGen/CalculationFunction.m index 9f10c55..295fd5e 100644 --- a/Tools/CodeGen/CalculationFunction.m +++ b/Tools/CodeGen/CalculationFunction.m @@ -239,7 +239,7 @@ simpCollect[collectList_, eqrhs_, localvar_, debug_] := assignVariableFromExpression[dest_, expr_, declare_] := Module[{tSym, type, cleanExpr, code}, tSym = Unique[]; - type = If[StringMatchQ[ToString[dest], "dir*"], "int", "CCTK_REAL_VEC"]; + type = If[StringMatchQ[ToString[dest], "dir*"], "int", "CCTK_REAL"]; cleanExpr = ReplacePowers[expr] /. sym`t -> tSym; If[SOURCELANGUAGE == "C", @@ -402,7 +402,7 @@ CreateCalculationFunction[calc_, debug_, useCSE_, 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, "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[]", { "DECLARE_CCTK_ARGUMENTS;\n", "DECLARE_CCTK_PARAMETERS;\n\n", @@ -541,7 +541,7 @@ equationLoop[eqs_, cleancalc_, gfs_, shorts_, incs_, groups_, pddefs_, CommentedBlock["Assign local copies of grid functions", Map[DeclareMaybeAssignVariableInLoop[ - "CCTK_REAL_VEC", localName[#], GridName[#], + "CCTK_REAL", localName[#], GridName[#], StringMatchQ[ToString[GridName[#]], "eT" ~~ _ ~~ _ ~~ "[" ~~ __ ~~ "]"], "*stress_energy_state"] &, gfsInRHS]], @@ -559,7 +559,7 @@ equationLoop[eqs_, cleancalc_, gfs_, shorts_, incs_, groups_, pddefs_, ""], CommentedBlock["Copy local copies back to grid functions", - Map[StoreVariableInLoop[GridName[#], localName[#]] &, + Map[AssignVariableInLoop[GridName[#], localName[#]] &, gfsInLHS]], If[debugInLoop, Map[InfoVariable[GridName[#]] &, gfsInLHS], ""]}, opts]]; |