Calculation.m: Give derivative calculations slightly better names

ianhinder · Apr 11, 2012 · 64b4f58 · 64b4f58
1 parent 6bed8e7
commit 64b4f58
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Tools/CodeGen/Calculation.m b/Tools/CodeGen/Calculation.m
@@ -176,10 +176,14 @@
           ThrowError["Separating derivatives in an automatically scheduled function is not supported"]];
 
        Module[
-         {derivGFName, derivs, sepDerivs, calc2, replaceSymmetric},
+         {derivGFName, derivGFName2, derivs, sepDerivs, calc2, replaceSymmetric},
          derivGFName[pd_[var_,inds___]] :=
          Symbol["Global`D"<>ToString[pd]<>ToString[var]<>Apply[StringJoin,Map[ToString,{inds}]]];
 
+         derivGFName2[pd_[var_,inds___]] :=
+         "D"<>ToString[pd]<>ToString[var]<>"_"<>Apply[StringJoin,Map[ToString,{inds}]];
+
+
          replaceSymmetric = pd_[var_,i_,j_] /; i > j :> pd[var,j,i];
          derivs = DeleteDuplicates[GetDerivatives[calc] /. replaceSymmetric];
          sepDerivs = Flatten[Map[Cases[derivs, #] &, sepPat],1];
@@ -191,7 +195,7 @@
                               Equations, 
                               {derivName -> sepDeriv}];
            calc1 = mapReplace[calc1, Schedule, Map[#<>" before "<>lookup[calc,Name] &, lookup[calc,Schedule]]];
-           calc1 = mapReplace[calc1, Name, lookup[calc,Name]<>"_"<>ToString@derivName];
+           calc1 = mapReplace[calc1, Name, lookup[calc,Name]<>"_"<>derivGFName2[sepDeriv]];
            currentGroups = lookup[calc, LocalGroups, {}];
            localGroups = Append[currentGroups, {ToString@derivName<>"_group", {derivName}}];
            calc1 = mapReplaceAdd[calc1, LocalGroups, localGroups];