KrancThorn.m: Eliminate most temporary variables in CreateKrancThorn

ianhinder · Sep 13, 2013 · b3c24e5 · b3c24e5
1 parent 7b7ffcc
commit b3c24e5
Showing 1 changed file with 23 additions and 39 deletions.
diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
@@ -62,18 +62,7 @@ Thorn generation (main entry point for non-tensorial thorns)
 Options[CreateKrancThorn] = ThornOptions;
 
 CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[]] :=
-  Module[{calcs, declaredGroups, odeGroups, implementation,
-    inheritedImplementations, includeFiles,
-    evolutionTimelevels, defaultEvolutionTimelevels,
-    parameters,
-    configuration,
-    partialDerivs, evolvedGroups, rhsGroups, nonevolvedGroups,
-    interface, evolvedGroupDefinitions,
-    evolvedODEGroups, nonevolvedODEGroups,
-    evolvedODEGroupDefinitions, rhsODEGroups,
-    cakernel,
-    sources = {},
-    c},
+  Module[{configuration, interface, schedule, param, make, cakernel, c},
 
     InfoMessage[Terse, "Processing arguments to CreateKrancThorn"];
 
@@ -83,30 +72,23 @@ Thorn generation (main entry point for non-tensorial thorns)
 
     cktCheckNamedArgs[{opts}];
 
-    calcs = OptionValue[Calculations];
-    declaredGroups = OptionValue[DeclaredGroups];
-    odeGroups = OptionValue[ODEGroups];
-    implementation = If[OptionValue[Implementation] =!= None,
-                        OptionValue[Implementation],
-                        thornName];
-    inheritedImplementations = OptionValue[InheritedImplementations];
-    includeFiles = OptionValue[IncludeFiles];
-    evolutionTimelevels = OptionValue[EvolutionTimelevels]; (* Redundant *)
-    defaultEvolutionTimelevels = lookupDefault[{opts}, DefaultEvolutionTimelevels, evolutionTimelevels];
-    partialDerivs = OptionValue[PartialDerivatives];
-
-    c = NewObject[Code, {"Name" -> thornName,
-                         "Groups" -> groupsOrig,
-                         "DeclaredGroups" -> declaredGroups,
-                         "Calculations" -> calcs,
-                         "ODEGroups" -> odeGroups,
-                         "Implementation" -> implementation,
-                         "InheritedImplementations" -> inheritedImplementations,
-                         "IncludeFiles" -> includeFiles,
-                         "EvolutionTimelevels" -> evolutionTimelevels,
-                         "DefaultEvolutionTimelevels" -> defaultEvolutionTimelevels,
-                         "PartialDerivatives" -> partialDerivs,
-                         "Sources" -> {}}];
+    c = NewObject[
+      Code, 
+      {"Name" -> thornName,
+       "Groups" -> groupsOrig,
+       "DeclaredGroups" -> OptionValue[DeclaredGroups],
+       "Calculations" -> OptionValue[Calculations],
+       "ODEGroups" -> OptionValue[ODEGroups],
+       "Implementation" -> If[OptionValue[Implementation] =!= None,
+                              OptionValue[Implementation],
+                              thornName],
+       "InheritedImplementations" -> OptionValue[InheritedImplementations],
+       "IncludeFiles" -> OptionValue[IncludeFiles],
+       "EvolutionTimelevels" -> OptionValue[EvolutionTimelevels],
+       "DefaultEvolutionTimelevels" -> lookupDefault[{opts}, DefaultEvolutionTimelevels,
+                                                     OptionValue[EvolutionTimelevels]],
+       "PartialDerivatives" -> OptionValue[PartialDerivatives],
+       "Sources" -> {}}];
 
     (* ------------------------------------------------------------------------ 
        Add required include files
@@ -135,8 +117,8 @@ Thorn generation (main entry point for non-tensorial thorns)
       {calcs = GetObjectField[c, "Calculations"]},
 
       calcs = Map[mapReplaceAdd[#, Shorthands, Join[lookup[#,Shorthands,{}],OptionValue[Shorthands]]] &, calcs];
-      calcs = Map[Append[#, Implementation -> implementation] &, calcs];
-      calcs = Map[Append[#, PartialDerivatives -> partialDerivs] &, calcs];
+      calcs = Map[Append[#, Implementation -> GetObjectField[c, "Implementation"]] &, calcs];
+      calcs = Map[Append[#, PartialDerivatives -> GetObjectField[c, "PartialDerivatives"]] &, calcs];
       SetObjectField[c, "Calculations", calcs]];
 
     (* ------------------------------------------------------------------------ 
@@ -323,7 +305,9 @@ Thorn generation (main entry point for non-tensorial thorns)
       {Filename -> "RegisterMoL.cc",
        Contents -> CreateKrancMoLRegister[
          evolvedGroups, nonevolvedGroups, evolvedODEGroups,
-         nonevolvedODEGroups, groups, implementation, thornName]}]];
+         nonevolvedODEGroups, 
+         Sequence@@(GetObjectField[c,#]& /@ 
+                    {"Groups", "Implementation", "Name"})]}]];
 
     (* ------------------------------------------------------------------------ 
        Add options to calculations