KrancThorn.m: Reformat conservation calculation section

1 files changed, 21 insertions, 23 deletions

diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m
index e2a0c98..588db40 100644
--- a/Tools/CodeGen/KrancThorn.m
+++ b/Tools/CodeGen/KrancThorn.m
@@ -178,29 +178,27 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[
        ------------------------------------------------------------------------ *)
 
     Module[
-      {consCalcsIn, consCalcs, consGroups},
-
-    consCalcsIn = Append[#,Groups -> groups]& /@
-                    OptionValue[ConservationCalculations];
-
-    (* Add in calculations to solve any conservation laws that have
-       been provided *)
-
-    consCalcs = Flatten[Map[ProcessConservationCalculation[#,thornName] &,
-                            consCalcsIn],1];
-
-    consCalcs = Map[Join[#, {PartialDerivatives -> partialDerivs,
-                             Implementation -> implementation}] &, consCalcs];
-
-    calcs = Join[calcs,consCalcs];
-    (* Print["consCalcs = ", consCalcs]; *)
-
-    consGroups = Union@Flatten[
-      Map[ConservationCalculationDeclaredGroups, consCalcsIn],1];
-
-    groups = Join[groups, consGroups];
-
-    declaredGroups = Join[declaredGroups, Map[groupName, consGroups]]];
+      {inputConsCalcs, outputConsCalcs, consGroups},
+
+      inputConsCalcs = Map[Append[#, Groups -> groups] &, OptionValue[ConservationCalculations]];
+
+      outputConsCalcs = 
+      Flatten[
+        Map[
+          ProcessConservationCalculation[#, thornName] &,
+          inputConsCalcs],
+        1];
+
+      outputConsCalcs = Map[Join[#, {PartialDerivatives -> partialDerivs,
+                                     Implementation -> implementation}] &,
+                            outputConsCalcs];
+
+      consGroups = Union@Flatten[
+        Map[ConservationCalculationDeclaredGroups, inputConsCalcs],1];
+      
+      calcs = Join[calcs,outputConsCalcs];
+      groups = Join[groups, consGroups];
+      declaredGroups = Join[declaredGroups, Map[groupName, consGroups]]];
 
     (* ------------------------------------------------------------------------ 
        ODEs