From 4d0bde5e5f5bf7a3246f4d4a49ae7e77d0410dd3 Mon Sep 17 00:00:00 2001 From: Ian Hinder Date: Fri, 13 Sep 2013 17:20:31 +0200 Subject: KrancThorn.m: Move CactusBoundary code processing to CactusBoundary.m --- Tools/CodeGen/CactusBoundary.m | 17 ++++++++++++++++- Tools/CodeGen/KrancThorn.m | 7 +------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Tools/CodeGen/CactusBoundary.m b/Tools/CodeGen/CactusBoundary.m index 81cf670..733abb9 100644 --- a/Tools/CodeGen/CactusBoundary.m +++ b/Tools/CodeGen/CactusBoundary.m @@ -33,7 +33,8 @@ *) BeginPackage["CactusBoundary`", {"CodeGen`", "Thorn`", - "MapLookup`", "KrancGroups`", "Errors`", "Helpers`", "Kranc`", "MoL`"}]; + "MapLookup`", "KrancGroups`", "Errors`", "Helpers`", "Kranc`", "MoL`", + "Code`", "Object`"}]; GetInheritedImplementations::usage = ""; GetIncludeFiles::usage = ""; @@ -42,6 +43,7 @@ GetScheduledGroups::usage = ""; GetScheduledFunctions::usage = ""; GetParameters::usage = ""; GetSources::usage = ""; +CactusBoundaryProcessCode; Begin["`Private`"]; @@ -184,5 +186,18 @@ GetSources[declaredGroups_, groups_, implementation_, thornName_] := Return[{{Filename -> "Boundaries.cc", Contents -> CreateMoLBoundariesSource[boundarySpec]}}]]; +DefFn[ + CactusBoundaryProcessCode[cIn_Code, opts___] := + Module[ + {c = cIn}, + + c = JoinObjectField[ + c, "Sources", + CactusBoundary`GetSources[ + Sequence@@ + (GetObjectField[c,#]& /@ + {"DeclaredGroups", "Groups", "Implementation", "Name"})]]; + c]]; + End[]; EndPackage[]; diff --git a/Tools/CodeGen/KrancThorn.m b/Tools/CodeGen/KrancThorn.m index 5b54359..5b83fa9 100644 --- a/Tools/CodeGen/KrancThorn.m +++ b/Tools/CodeGen/KrancThorn.m @@ -307,12 +307,7 @@ CreateKrancThorn[groupsOrig_, parentDirectory_, thornName_, opts:OptionsPattern[ Create Boundary source files ------------------------------------------------------------------------ *) - c = JoinObjectField[ - c, "Sources", - CactusBoundary`GetSources[ - Sequence@@ - (GetObjectField[c,#]& /@ - {"DeclaredGroups", "Groups", "Implementation", "Name"})]]; + c = CactusBoundaryProcessCode[c, opts]; (* ------------------------------------------------------------------------ Add parameter check source file -- cgit v1.2.3