Removed inclusion of precomputations.h as it is never used. Made

stripping of implementation names a little more consistent, though it
is still a bit messy.

1 files changed, 5 insertions, 2 deletions

diff --git a/Tools/CodeGen/Thorn.m b/Tools/CodeGen/Thorn.m
index 4491e52..1358dcb 100644
--- a/Tools/CodeGen/Thorn.m
+++ b/Tools/CodeGen/Thorn.m
@@ -437,11 +437,12 @@ CreateSetterSource[calcs_, debug_, opts___] :=
       ],
 
    Map[IncludeFile, Join[{"cctk.h", "cctk_Arguments.h", "cctk_Parameters.h",
-                     "precomputations.h", "GenericFD.h", "Differencing.h"}, include]],
+                     (*"precomputations.h",*) "GenericFD.h", "Differencing.h"}, include]],
    calculationMacros[],
 
    (* For each function structure passed, create the function and
       insert it *)
+
    Map[CreateCalculationFunction[# , debug]& , 
        calcs]}];
 
@@ -560,13 +561,15 @@ CreateMoLRegistrationSource[spec_, debug_] :=
 
       CommentedBlock["Register all the evolved grid functions with MoL",
 
+(* FIXME: We should clarify exactly what should happen with the implementation names here *)
+
       Map[{"ierr += MoLRegisterEvolved(CCTK_VarIndex(\"", #, "\"),  CCTK_VarIndex(\"",
            lookup[spec,BaseImplementation], "::", unqualifiedGroupName[#], "rhs\"));\n"} &,
           lookup[spec, EvolvedGFs]]],
 
       CommentedBlock["Register all the primitive grid functions with MoL",
       Map[{"ierr += MoLRegisterConstrained(CCTK_VarIndex(\"", 
-           lookup[spec,BaseImplementation], "::", #, "\"));\n"} &,
+           lookup[spec,BaseImplementation], "::", unqualifiedGroupName[#], "\"));\n"} &,
           lookup[spec, PrimitiveGFs]]],
 	"return ierr;\n"}]};