diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-05-29 22:34:04 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-05-29 22:34:04 -0400 |
| commit | 184b6bb8c614924f456e996caae54e6219faafe9 (patch) | |
| tree | 727a877b56d633d78ee996f71cefa76d4cc6b6c7 /m | |
| parent | f9c7beb75e0d2bfa91e8de341356c2cff0596d87 (diff) | |
Correct some errors in CCZ4, in particular the GammaShift parameter
Diffstat (limited to 'm')
| -rw-r--r-- | m/McLachlan_BSSN.m | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/m/McLachlan_BSSN.m b/m/McLachlan_BSSN.m index 1ac8816..5b9aca6 100644 --- a/m/McLachlan_BSSN.m +++ b/m/McLachlan_BSSN.m @@ -640,10 +640,8 @@ evolCalc = - Xtn[uj] PD[beta[ui],lj] + (2/3) Xtn[ui] PD[beta[uj],lj] + IfCCZ4[ - + IfThen[GammaShift, - 2 e4phi (- Z[uj] PD[beta[ui],lj] - + (2/3) Z[ui] PD[beta[uj],lj]), - 0] + + GammaShift 2 e4phi (- Z[uj] PD[beta[ui],lj] + + (2/3) Z[ui] PD[beta[uj],lj]) - (4/3) alpha e4phi Z[ui] trK + 2 gtu[ui,uj] (+ alpha PD[Theta,lj] - Theta PD[alpha,lj]) @@ -657,7 +655,8 @@ evolCalc = IfCCZ4[ dotTheta -> - PD[alpha,la] Z[ua] - dampk1 (2 + dampk2) alpha Theta - + (1/2) alpha (gu[ua,ub] R[la,lb] - Atm[ua,lb] Atm[ub,la] + (2/3) trK^2 - 2 trK Theta) + + (1/2) alpha (gu[ua,ub] R[la,lb] - Atm[ua,lb] Atm[ub,la] + (2/3) trK^2 - 2 trK Theta) + + addMatter (- 8 Pi alpha rho) ], IfCCZ4[ @@ -1253,11 +1252,6 @@ keywordParameters = intParameters = { - IfCCZ4[{ - Name -> GammaShift, - Description -> "Covariant shift term in Gamma", - Default -> 0 - }], { Name -> harmonicN, Description -> "d/dt alpha = - f alpha^n K (harmonic=2, 1+log=1)", @@ -1291,6 +1285,11 @@ intParameters = realParameters = { IfCCZ4[{ + Name -> GammaShift, + Description -> "Covariant shift term in Gamma", + Default -> 0.5 + }], + IfCCZ4[{ Name -> dampk1, Description -> "CCZ4 damping term 1 for Theta and Z", Default -> 0 |