Fix support for using xTensor instead of TensorTools

ianhinder · Mar 6, 2014 · 3fa36d3 · 3fa36d3
1 parent eca6928
commit 3fa36d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Tools/CodeGen/KrancScript.m b/Tools/CodeGen/KrancScript.m
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-BeginPackage["KrancScript`", {"Errors`", "Helpers`", "Kranc`", "JLink`", "TensorTools`",
+BeginPackage["KrancScript`", {"Errors`", "Helpers`", "Kranc`", "JLink`",
                               "KrancTensor`", "Piraha`", "MapLookup`"}];
 
 CreateThornFromKrancScript;

diff --git a/Tools/CodeGen/KrancTensor.m b/Tools/CodeGen/KrancTensor.m
@@ -24,11 +24,13 @@
 (* Wrapper providing tensor support to Kranc (from TensorTools or xTensor)  *)
 (****************************************************************************)
 
-$KrancTensorPackage = "TensorToolsKranc`";
+If[!ValueQ[$KrancTensorPackage],
+  $KrancTensorPackage = Sequence["TensorToolsKranc`", "TensorTools`"];
+];
 
 BeginPackage["KrancTensor`", {"Errors`", "KrancThorn`", "MapLookup`", "KrancGroups`",
                               "Kranc`", $KrancTensorPackage, "ConservationCalculation`",
-                              "TensorTools`", "KrancGroups`", "Differencing`",
+                              "KrancGroups`", "Differencing`",
                               "Piraha`", "ScriptOutput`"}];
 
 CreateKrancThornTT::usage = "Construct a Kranc thorn using tensor expressions.";

diff --git a/Tools/CodeGen/ScriptOutput.m b/Tools/CodeGen/ScriptOutput.m
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *)
 
-BeginPackage["ScriptOutput`", {"Errors`", "Helpers`", "Kranc`", "CodeGen`", "MapLookup`", "TensorTools`", "KrancGroups`", "Calculation`"}];
+BeginPackage["ScriptOutput`", {"Errors`", "Helpers`", "Kranc`", "CodeGen`", "MapLookup`", "KrancGroups`", "Calculation`"}];
 
 WriteScript;