KrancThorn.m: Eliminate some local variables

ianhinder · Sep 12, 2013 · ec87414 · ec87414
1 parent b0ab67c
commit ec87414
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
@@ -73,7 +73,7 @@ Thorn generation (main entry point for non-tensorial thorns)
     evolvedODEGroupDefinitions, rhsODEGroups,
     boundarySources, reflectionSymmetries,
     pDefs, consCalcs, consCalcsIn, consGroups, cakernel,
-    hostCals, deviceCalcs, sources = {}},
+    sources = {}},
 
     InfoMessage[Terse, "Processing arguments to CreateKrancThorn"];
 
@@ -366,21 +366,17 @@ Thorn generation (main entry point for non-tensorial thorns)
        Create calculation source files
        ------------------------------------------------------------------------ *)
 
-    ext = CodeGenC`SOURCESUFFIX;
-
     InfoMessage[Terse, "Creating calculation source files"];
 
-    hostCalcs = Select[calcs, !CalculationOnDevice[#] &];
-    hostSources = Map[{Filename -> lookup[#, Name] <> ext,
-                       Contents -> CreateSetterSource[{#}, False, {}, opts]} &,
-                      hostCalcs];
-    sources = Join[sources, hostSources];
-
-    deviceCalcs = Select[calcs, CalculationOnDevice];
-    deviceSources = Map[{Filename -> "CaKernel__"<>lookup[#, Name] <> ".code",
-                         Contents -> CaKernelCode[#,opts]} &,
-                        deviceCalcs];
-    sources = Join[sources, deviceSources];
+    sources = Join[sources,
+                   Map[{Filename -> lookup[#, Name] <> ".cc",
+                        Contents -> CreateSetterSource[{#}, False, {}, opts]} &,
+                       Select[calcs, !CalculationOnDevice[#] &]]];
+
+    sources = Join[sources,
+                   Map[{Filename -> "CaKernel__"<>lookup[#, Name] <> ".code",
+                        Contents -> CaKernelCode[#,opts]} &,
+                       Select[calcs, CalculationOnDevice]]];
 
     (* ------------------------------------------------------------------------ 
        Create Makefile