diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-22 17:19:18 +0100 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-22 17:19:18 +0100 |
| commit | 45071fec4db209205c3e0e89f9fc9c2e283ad99d (patch) | |
| tree | f62f437a1f8f87a9b355ce1d4cbf3c192f4668c9 /Tools/CodeGen/Schedule.m | |
| parent | 121ff02440893cfabee9899a90048b393dadaa7c (diff) | |
| parent | b9dbd186f1d2a8bdaec160fde110d7e160117228 (diff) | |
Merge branch 'hydro'
Conflicts:
Auxiliary/Cactus/KrancNumericalTools/GenericFD/src/MathematicaCompat.h
Examples/kranc.th
Tools/CodeGen/Kranc.m
Tools/CodeGen/KrancTensor.m
Tools/CodeGen/Schedule.m
Tools/CodeGen/Thorn.m
Diffstat (limited to 'Tools/CodeGen/Schedule.m')
| -rw-r--r-- | Tools/CodeGen/Schedule.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/CodeGen/Schedule.m b/Tools/CodeGen/Schedule.m index c375fd6..87604b1 100644 --- a/Tools/CodeGen/Schedule.m +++ b/Tools/CodeGen/Schedule.m @@ -100,8 +100,10 @@ scheduleCalc[calc_, groups_] := relStr = If[before =!= None, " before " <> before, ""] <> If[after =!= None, " after " <> after, ""]; + applyBCs = lookupDefault[calc, ApplyBCs, False]; userSchedule = lookupDefault[calc, Schedule, Automatic]; - If[userSchedule =!= Automatic, + + If[userSchedule =!= Automatic && !applyBCs, Return[Map[ Join[ { @@ -138,7 +140,7 @@ scheduleCalc[calc_, groups_] := groupSched = { Name -> "group " <> groupName, - SchedulePoint -> "in MoL_PseudoEvolution" <> relStr, + SchedulePoint -> If[applyBCs, First[userSchedule] <> relStr, "in MoL_PseudoEvolution" <> relStr], SynchronizedGroups -> {}, Language -> "None", Comment -> lookup[calc, Name] |