[Commits] [svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 99)

[schnetter at cct.lsu.edu]

User: eschnett
Date: 2011/12/19 03:27 PM

Modified:
 /trunk/m/
  WeylScal4.m

Log:
 [PATCH 3/4] Only compute actual invariants in invars_calc_*.
 
 Calculation of the psis is already handled by a separate calculation
 and we schedule the calculation of the invariants after this.

File Changes:

Directory: /trunk/m/
====================

File [modified]: WeylScal4.m
Delta lines: +12 -6
===================================================================
--- trunk/m/WeylScal4.m	2011-12-19 21:26:47 UTC (rev 98)
+++ trunk/m/WeylScal4.m	2011-12-19 21:27:12 UTC (rev 99)
@@ -235,7 +235,7 @@
 		 + Rojo[la,lb] nn nn (rm[ua] im[ub] + im[ua] rm[ub])
 };
 
-invariantEqs := {
+invariantEqs = {
   (* Scalar invariants I and J as defined in (2.2a) and (2.2b) of arXiv:gr-qc/0407013 *)
   curvIr -> ComplexExpand[Re[3 (Psi2r+I Psi2i)^2 - 4 (Psi1r+I Psi1i) (Psi3r + I Psi3i) + (Psi4r + I Psi4i) (Psi0r + I Psi0i)]],
   curvIi -> ComplexExpand[Im[3 (Psi2r+I Psi2i)^2 - 4 (Psi1r+I Psi1i) (Psi3r + I Psi3i) + (Psi4r + I Psi4i) (Psi0r + I Psi0i)]],
@@ -309,9 +309,8 @@
   Name -> "invars_calc_" <> fdOrder,
   Where -> Interior,
   After -> "ADMBase_SetADMVars",
-  ConditionalOnKeywords -> {{"fd_order", fdOrder}, {"calc_scalars", "psis_and_invariants"}},
-  Shorthands -> shorthands,
-  Equations -> Join[psi4Eqs[PD], otherPsiEqs, invariantEqs]
+  ConditionalOnKeywords -> {{"fd_order", fdOrder}, {"calc_scalars", "psis"}, {"calc_invariants", "always"}},
+  Equations -> invariantEqs
 };
 
 
@@ -329,13 +328,20 @@
 calcScalarsParam = {
   Name -> "calc_scalars",
   Description -> "Which scalars to calculate",
-  AllowedValues -> {"psi4", "psis", "psis_and_invariants"},
+  AllowedValues -> {"psi4", "psis"},
   Default -> "psi4"
 };
 
+calcInvariantsParam = {
+  Name -> "calc_invariants",
+  Description -> "Compute invariants",
+  AllowedValues -> {"always", "never"},
+  Default -> "never"
+};
+
 keywordParameters = 
 {
-  fdOrderParam, calcScalarsParam
+  fdOrderParam, calcScalarsParam, calcInvariantsParam
 };
 
 intParameters =