Skip to content

Commit a7223ed

Browse files
committed
fix: Wrong Function call names in Metric.m. Also, minor refactors.
1 parent aef4954 commit a7223ed

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

modules/FEDeriK/Derivatives.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@
5353
];
5454

5555
(**********************************************************************************
56-
ResolveDerivatives : Iteratively resolve all derivative operators in an FTerm or FEx
56+
FResolveDerivatives : Iteratively resolve all derivative operators in an FTerm or FEx
5757
**********************************************************************************)
5858

59-
ResolveDerivatives::argument = "The given argument is neither an FTerm nor a FEx.
59+
FResolveDerivatives::argument = "The given argument is neither an FTerm nor a FEx.
6060
The argument was `1`";
6161

62-
Options[ResolveDerivatives] = {"Symmetries" -> {}};
62+
Options[FResolveDerivatives] = {"Symmetries" -> {}};
6363

64-
ResolveDerivatives[setup_, term_FTerm, OptionsPattern[]] :=
65-
ResolveDerivatives[setup, FEx[term], "Symmetries" -> OptionValue["Symmetries"]]
64+
FResolveDerivatives[setup_, term_FTerm, OptionsPattern[]] :=
65+
FResolveDerivatives[setup, FEx[term], "Symmetries" -> OptionValue["Symmetries"]]
6666

67-
ResolveDerivatives[setup_, eq_FEx, OptionsPattern[]] :=
67+
FResolveDerivatives[setup_, eq_FEx, OptionsPattern[]] :=
6868
Module[{ret = eq, annotations, mmap, fw, bw, i, symmetries},
6969
FunKitDebug[1, "Resolving derivatives"];
7070
If[FreeQ[ret, FDOp[__], Infinity],
@@ -105,9 +105,9 @@
105105
Return[MergeFExAnnotations[ret, annotations]];
106106
]
107107

108-
ResolveDerivatives[setup_, a___] :=
108+
FResolveDerivatives[setup_, a___] :=
109109
Module[{},
110-
Message[ResolveDerivatives::argument, {a}];
110+
Message[FResolveDerivatives::argument, {a}];
111111
Abort[];
112112
];
113113

@@ -126,7 +126,7 @@
126126
(*First, fix the indices in the input equation, i.e. make everything have unique names*)
127127
result = FixIndices[setup, FEx[expr]];
128128
If[Length[derivativeListSIDX] === 0,
129-
Return[ResolveDerivatives[setup, result, "Symmetries" -> OptionValue["Symmetries"]]]
129+
Return[FResolveDerivatives[setup, result, "Symmetries" -> OptionValue["Symmetries"]]]
130130
];
131131
If[ModuleLoaded[AnSEL] && OptionValue["Symmetries"] === {} && $AutoBuildSymmetryList === True,
132132
FunKitDebug[2, "Auto-building symmetry list for derivatives"];
@@ -141,7 +141,7 @@
141141
];
142142
FunKitDebug[1, "Adding the derivative operator ", (FTerm @@ (FDOp /@ derivativeListSIDX))];
143143
(*Perform all the derivatives, one after the other*)
144-
result = ResolveDerivatives[setup, (FTerm @@ (FDOp /@ derivativeListSIDX)) ** result];
144+
result = FResolveDerivatives[setup, (FTerm @@ (FDOp /@ derivativeListSIDX)) ** result];
145145
If[ModuleLoaded[AnSEL] && $AutoSimplify === True,
146146
result = FunKit`FSimplify[setup, result];
147147
];

modules/FEDeriK/Global.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
FTruncate[expr_] /; Head[$GlobalSetup] =!= Symbol :=
2323
FTruncate[$GlobalSetup, expr];
2424

25-
TakeDerivatives[expr_, derivativeList_] /; Head[$GlobalSetup] =!= Symbol :=
26-
TakeDerivatives[$GlobalSetup, expr, derivativeList, "Symmetries" -> {}];
25+
FTakeDerivatives[expr_, derivativeList_] /; Head[$GlobalSetup] =!= Symbol :=
26+
FTakeDerivatives[$GlobalSetup, expr, derivativeList, "Symmetries" -> {}];
2727

28-
TakeDerivatives[expr_, derivativeList_, OptionsPattern[]] /; Head[$GlobalSetup] =!= Symbol :=
29-
TakeDerivatives[$GlobalSetup, expr, derivativeList, "Symmetries" -> OptionValue["Symmetries"]];
28+
FTakeDerivatives[expr_, derivativeList_, OptionsPattern[]] /; Head[$GlobalSetup] =!= Symbol :=
29+
FTakeDerivatives[$GlobalSetup, expr, derivativeList, "Symmetries" -> OptionValue["Symmetries"]];
3030

3131
QMeSForm[expr_] /; Head[$GlobalSetup] =!= Symbol :=
3232
QMeSForm[$GlobalSetup, expr];
@@ -49,8 +49,8 @@
4949
FResolveDerivatives[expr_, OptionsPattern[]] /; Head[$GlobalSetup] =!= Symbol :=
5050
FResolveDerivatives[$GlobalSetup, expr, "Symmetries" -> OptionValue["Symmetries"]];
5151

52-
ResolveFDOp[expr_] /; Head[$GlobalSetup] =!= Symbol :=
53-
ResolveFDOp[$GlobalSetup, expr];
52+
FResolveFDOp[expr_] /; Head[$GlobalSetup] =!= Symbol :=
53+
FResolveFDOp[$GlobalSetup, expr];
5454

5555
FOrderFields[expr_] /; Head[$GlobalSetup] =!= Symbol :=
5656
FOrderFields[$GlobalSetup, expr];

modules/FEDeriK/Metric.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
cases = Select[cases, FreeQ[getFields[#], AnyField]&];
5858
casesFMinus = Select[cases, Head[#] === FMinus&];
5959
cases = Select[cases, Head[#] === \[Gamma]&];
60-
closed = Map[MemberQ[closedSIndices, MakePosIdx[#]]&, Indices /@ cases, {2}];
60+
closed = Map[MemberQ[closedSIndices, makePosIdx[#]]&, getIndices /@ cases, {2}];
6161
casesOpen = Pick[cases, Map[Not[#[[1]] || #[[2]]]&, closed]];
6262
cases = Pick[cases, Map[#[[1]] || #[[2]]&, closed]];
6363
(*closed is a truth array indicating which indices of cases are closed *)

modules/FEDeriK/Truncation.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272

7373
LTrunc[setup_, expr_] :=
7474
(
75-
Print[expr];
7675
Message[FTruncate::wrongExpr];
7776
Abort[]
7877
)

0 commit comments

Comments
 (0)