From f4e744c0ac63c5b26d22e7287c3860d6d93c6318 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Thu, 12 Sep 2013 17:15:11 +0200 Subject: Remove unused "max" entry in group storage spec --- Tools/CodeGen/CodeGenSchedule.m | 9 ++------- Tools/CodeGen/Schedule.m | 8 ++++---- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'Tools') diff --git a/Tools/CodeGen/CodeGenSchedule.m b/Tools/CodeGen/CodeGenSchedule.m index 5204e39..3eed29b 100644 --- a/Tools/CodeGen/CodeGenSchedule.m +++ b/Tools/CodeGen/CodeGenSchedule.m @@ -70,13 +70,8 @@ groupStorage[spec_] := IntegerQ[tls], {"STORAGE: ", group, "[", tls, "]\n"}, - ListQ[tls], - If[!MatchQ[tls, {_String, _Integer}], - Error["Unrecognized Timelevels value "<>ToString[tls]]]; - Module[ - {param,max}, - {param,max} = tls; - {"STORAGE: ", group, "[", param, "]\n"}], + StringQ[tls], + {"STORAGE: ", group, "[", tls, "]\n"}, True, Error["Unrecognized Timelevels value "<>ToString[tls]]]]; diff --git a/Tools/CodeGen/Schedule.m b/Tools/CodeGen/Schedule.m index f44ce0d..776ba47 100644 --- a/Tools/CodeGen/Schedule.m +++ b/Tools/CodeGen/Schedule.m @@ -274,15 +274,15 @@ CreateKrancScheduleFile[calcs_, groups_, evolvedGroups_, rhsGroups_, nonevolvedG (* Number of timelevels requested for this group, or 1 if no request made *) tl = NonevolvedTimelevels[groupFromName[#, groups]]; If[tl===1, - storageStructure[#, {"other_timelevels", tl}], - storageStructure[#, {"timelevels", evolutionTimelevels}]]] &, + storageStructure[#, "other_timelevels"], + storageStructure[#, "timelevels"]]] &, (* over *) nonevolvedGroups], - Map[storageStructure[#, {"timelevels", evolutionTimelevels}] &, + Map[storageStructure[#, "timelevels"] &, evolvedGroups], - Map[storageStructure[#, {"rhs_timelevels", evolutionTimelevels}] &, + Map[storageStructure[#, "rhs_timelevels"] &, rhsGroups]]; (* Schedule groups defined in calculations *) -- cgit v1.2.3