From 4ef8cd2bd3d7189f6a3469985dfed108e78279b9 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 13 Sep 2013 17:28:03 +0200 Subject: Move Boundary inherited implementations into CactusBoundary.m --- Tools/CodeGen/CactusBoundary.m | 3 +++ Tools/CodeGen/KrancThorn.m | 16 +++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m index 733abb9..7dee96d 100644 --- a/Tools/CodeGen/CactusBoundary.m +++ b/Tools/CodeGen/CactusBoundary.m @@ -197,6 +197,9 @@ DefFn[ Sequence@@ (GetObjectField[c,#]& /@ {"DeclaredGroups", "Groups", "Implementation", "Name"})]]; + + c = JoinObjectField[c, "InheritedImplementations", + CactusBoundary`GetInheritedImplementations[]]; c]]; End[]; diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 5b83fa9..e4a0478 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -178,9 +178,7 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ Inherited implementations ------------------------------------------------------------------------ *) - c = JoinObjectField[c, "InheritedImplementations", - Join[{"GenericFD"}, - CactusBoundary`GetInheritedImplementations[]]]; + c = AppendObjectField[c, "InheritedImplementations", "GenericFD"]; (* ------------------------------------------------------------------------ Check input parameters @@ -256,6 +254,12 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ GetObjectField[c, "DeclaredGroups"], GetObjectField[c, "Groups"], OptionValue[ReflectionSymmetries], False]}]; + (* ------------------------------------------------------------------------ + Boundary thorn + ------------------------------------------------------------------------ *) + + c = CactusBoundaryProcessCode[c, opts]; + (* ------------------------------------------------------------------------ Startup source file ------------------------------------------------------------------------ *) @@ -303,12 +307,6 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ cakernel = None; ]; - (* ------------------------------------------------------------------------ - Create Boundary source files - ------------------------------------------------------------------------ *) - - c = CactusBoundaryProcessCode[c, opts]; - (* ------------------------------------------------------------------------ Add parameter check source file ------------------------------------------------------------------------ *) -- cgit v1.2.3