aboutsummaryrefslogtreecommitdiff
path: root/ML_BSSN_O8
diff options
context:
space:
mode:
authorIan Hinder <ian.hinder@aei.mpg.de>2011-06-11 03:50:30 +0200
committerIan Hinder <ian.hinder@aei.mpg.de>2011-06-11 04:34:23 +0200
commit158189c6675c8f03869e231f7cd36b4f96e4a75c (patch)
tree0cb14075ccdf2e701bd7f1215b64b4c614b7cde3 /ML_BSSN_O8
parent05003fafaa79d7a4f3730231ebc845324cc29d84 (diff)
Regenerate code after Kranc ToReal change
Kranc commit 25d10c9c3c8133a9caefbe1e6ecbd4b5e234105d
Diffstat (limited to 'ML_BSSN_O8')
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc2
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc7
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc7
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc2
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_constraints1.cc7
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_constraints2.cc2
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc48
-rw-r--r--ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc3
8 files changed, 35 insertions, 43 deletions
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc b/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc
index 3e4fa15..0e7ca12 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_Minkowski.cc
@@ -111,7 +111,7 @@ static void ML_BSSN_O8_Minkowski_Body(cGH const * restrict const cctkGH, int con
/* Precompute derivatives */
/* Calculate temporaries and grid functions */
- CCTK_REAL phiL = IfThen(ToReal(conformalMethod),1,0);
+ CCTK_REAL phiL = IfThen(conformalMethod,1,0);
CCTK_REAL gt11L = 1;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc
index 34d0d18..ac85cc4 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHS1.cc
@@ -363,7 +363,7 @@ static void ML_BSSN_O8_RHS1_Body(cGH const * restrict const cctkGH, int const di
CCTK_REAL Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu12 +
Gt313*gtu13 + Gt323*gtu23) + Gt333*gtu33;
- CCTK_REAL fac1 = IfThen(ToReal(conformalMethod),-0.5*INV(phiL),1);
+ CCTK_REAL fac1 = IfThen(conformalMethod,-0.5*INV(phiL),1);
CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
@@ -401,8 +401,7 @@ static void ML_BSSN_O8_RHS1_Body(cGH const * restrict const cctkGH, int const di
CCTK_REAL Atu33 = Atm31*gtu13 + Atm32*gtu23 + Atm33*gtu33;
- CCTK_REAL e4phi =
- IfThen(ToReal(conformalMethod),INV(SQR(phiL)),exp(4*phiL));
+ CCTK_REAL e4phi = IfThen(conformalMethod,INV(SQR(phiL)),exp(4*phiL));
CCTK_REAL em4phi = INV(e4phi);
@@ -424,7 +423,7 @@ static void ML_BSSN_O8_RHS1_Body(cGH const * restrict const cctkGH, int const di
eTxzL*gtu13 + eTyzL*gtu23) + eTzzL*gtu33);
CCTK_REAL phirhsL =
- IfThen(ToReal(conformalMethod),phiL*(-0.333333333333333333333333333333*(PDstandardNth1beta1
+ IfThen(conformalMethod,phiL*(-0.333333333333333333333333333333*(PDstandardNth1beta1
+ PDstandardNth2beta2 + PDstandardNth3beta3) +
0.333333333333333333333333333333*alphaL*trKL),0.166666666666666666666666666667*(PDstandardNth1beta1
+ PDstandardNth2beta2 + PDstandardNth3beta3) -
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc b/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc
index d9b3233..c3fa1de 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_RHS2.cc
@@ -488,7 +488,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
gt13L*PDstandardNth3Xt1 + gt23L*PDstandardNth3Xt2 +
gt33L*PDstandardNth3Xt3 + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3;
- CCTK_REAL fac1 = IfThen(ToReal(conformalMethod),-0.5*INV(phiL),1);
+ CCTK_REAL fac1 = IfThen(conformalMethod,-0.5*INV(phiL),1);
CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
@@ -496,7 +496,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
CCTK_REAL cdphi3 = fac1*PDstandardNth3phi;
- CCTK_REAL fac2 = IfThen(ToReal(conformalMethod),0.5*INV(SQR(phiL)),0);
+ CCTK_REAL fac2 = IfThen(conformalMethod,0.5*INV(SQR(phiL)),0);
CCTK_REAL cdphi211 = -(fac1*(-PDstandardNth11phi +
Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi +
@@ -576,8 +576,7 @@ static void ML_BSSN_O8_RHS2_Body(cGH const * restrict const cctkGH, int const di
CCTK_REAL Atm33 = At13L*gtu13 + At23L*gtu23 + At33L*gtu33;
- CCTK_REAL e4phi =
- IfThen(ToReal(conformalMethod),INV(SQR(phiL)),exp(4*phiL));
+ CCTK_REAL e4phi = IfThen(conformalMethod,INV(SQR(phiL)),exp(4*phiL));
CCTK_REAL em4phi = INV(e4phi);
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc b/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc
index a0b60fb..5669ea4 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_boundary.cc
@@ -147,7 +147,7 @@ static void ML_BSSN_O8_boundary_Body(cGH const * restrict const cctkGH, int cons
/* Precompute derivatives */
/* Calculate temporaries and grid functions */
- CCTK_REAL phiL = IfThen(ToReal(conformalMethod),1,0);
+ CCTK_REAL phiL = IfThen(conformalMethod,1,0);
CCTK_REAL gt11L = 1;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_constraints1.cc b/ML_BSSN_O8/src/ML_BSSN_O8_constraints1.cc
index 4b15f26..451bd3a 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_constraints1.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_constraints1.cc
@@ -472,7 +472,7 @@ static void ML_BSSN_O8_constraints1_Body(cGH const * restrict const cctkGH, int
gt13L*PDstandardNth3Xt1 + gt23L*PDstandardNth3Xt2 +
gt33L*PDstandardNth3Xt3 + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3;
- CCTK_REAL fac1 = IfThen(ToReal(conformalMethod),-0.5*INV(phiL),1);
+ CCTK_REAL fac1 = IfThen(conformalMethod,-0.5*INV(phiL),1);
CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
@@ -480,7 +480,7 @@ static void ML_BSSN_O8_constraints1_Body(cGH const * restrict const cctkGH, int
CCTK_REAL cdphi3 = fac1*PDstandardNth3phi;
- CCTK_REAL fac2 = IfThen(ToReal(conformalMethod),0.5*INV(SQR(phiL)),0);
+ CCTK_REAL fac2 = IfThen(conformalMethod,0.5*INV(SQR(phiL)),0);
CCTK_REAL cdphi211 = -(fac1*(-PDstandardNth11phi +
Gt111*PDstandardNth1phi + Gt211*PDstandardNth2phi +
@@ -542,8 +542,7 @@ static void ML_BSSN_O8_constraints1_Body(cGH const * restrict const cctkGH, int
+ 2*SQR(cdphi1)) + gtu22*(cdphi222 + 2*SQR(cdphi2))) + 2*(-1 +
gt33L*gtu33)*SQR(cdphi3));
- CCTK_REAL e4phi =
- IfThen(ToReal(conformalMethod),INV(SQR(phiL)),exp(4*phiL));
+ CCTK_REAL e4phi = IfThen(conformalMethod,INV(SQR(phiL)),exp(4*phiL));
CCTK_REAL em4phi = INV(e4phi);
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_constraints2.cc b/ML_BSSN_O8/src/ML_BSSN_O8_constraints2.cc
index bdd6977..371bbb2 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_constraints2.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_constraints2.cc
@@ -311,7 +311,7 @@ static void ML_BSSN_O8_constraints2_Body(cGH const * restrict const cctkGH, int
CCTK_REAL Gt333 = Gtl133*gtu13 + Gtl233*gtu23 + Gtl333*gtu33;
- CCTK_REAL fac1 = IfThen(ToReal(conformalMethod),-0.5*INV(phiL),1);
+ CCTK_REAL fac1 = IfThen(conformalMethod,-0.5*INV(phiL),1);
CCTK_REAL cdphi1 = fac1*PDstandardNth1phi;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc
index 35f1679..54b6f5e 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertFromADMBaseGamma.cc
@@ -288,36 +288,32 @@ static void ML_BSSN_O8_convertFromADMBaseGamma_Body(cGH const * restrict const c
CCTK_REAL Xt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu12 +
Gt313*gtu13 + Gt323*gtu23) + Gt333*gtu33;
- CCTK_REAL AL = IfThen(ToReal(LapseACoeff) !=
- 0,-3*INV(ToReal(harmonicF))*pow(alphaL,-ToReal(harmonicN))*(9*dtalpL -
- (beta1L*PDupwindNthAnti1alpha + beta2L*PDupwindNthAnti2alpha +
- beta3L*PDupwindNthAnti3alpha + PDupwindNthSymm1alpha*Abs(beta1L) +
- PDupwindNthSymm2alpha*Abs(beta2L) +
- PDupwindNthSymm3alpha*Abs(beta3L))*ToReal(LapseAdvectionCoeff)),0);
+ CCTK_REAL AL = IfThen(LapseACoeff != 0,-3*(9*dtalpL +
+ LapseAdvectionCoeff*(-(beta1L*PDupwindNthAnti1alpha) -
+ beta2L*PDupwindNthAnti2alpha - beta3L*PDupwindNthAnti3alpha -
+ PDupwindNthSymm1alpha*Abs(beta1L) - PDupwindNthSymm2alpha*Abs(beta2L) -
+ PDupwindNthSymm3alpha*Abs(beta3L)))*INV(harmonicF)*pow(alphaL,-harmonicN),0);
CCTK_REAL theta = fmin(1,exp(1 -
rL*INV(ToReal(SpatialShiftGammaCoeffRadius))));
- CCTK_REAL B1L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) !=
- 0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetaxL -
- 3*(beta1L*PDupwindNthAnti1beta1 + beta2L*PDupwindNthAnti2beta1 +
- beta3L*PDupwindNthAnti3beta1 + PDupwindNthSymm1beta1*Abs(beta1L) +
- PDupwindNthSymm2beta1*Abs(beta2L) +
- PDupwindNthSymm3beta1*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0);
-
- CCTK_REAL B2L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) !=
- 0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetayL -
- 3*(beta1L*PDupwindNthAnti1beta2 + beta2L*PDupwindNthAnti2beta2 +
- beta3L*PDupwindNthAnti3beta2 + PDupwindNthSymm1beta2*Abs(beta1L) +
- PDupwindNthSymm2beta2*Abs(beta2L) +
- PDupwindNthSymm3beta2*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0);
-
- CCTK_REAL B3L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) !=
- 0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetazL -
- 3*(beta1L*PDupwindNthAnti1beta3 + beta2L*PDupwindNthAnti2beta3 +
- beta3L*PDupwindNthAnti3beta3 + PDupwindNthSymm1beta3*Abs(beta1L) +
- PDupwindNthSymm2beta3*Abs(beta2L) +
- PDupwindNthSymm3beta3*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0);
+ CCTK_REAL B1L = IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,3*(9*dtbetaxL
+ + ShiftAdvectionCoeff*(-(beta1L*PDupwindNthAnti1beta1) -
+ beta2L*PDupwindNthAnti2beta1 - beta3L*PDupwindNthAnti3beta1 -
+ PDupwindNthSymm1beta1*Abs(beta1L) - PDupwindNthSymm2beta1*Abs(beta2L) -
+ PDupwindNthSymm3beta1*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0);
+
+ CCTK_REAL B2L = IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,3*(9*dtbetayL
+ + ShiftAdvectionCoeff*(-(beta1L*PDupwindNthAnti1beta2) -
+ beta2L*PDupwindNthAnti2beta2 - beta3L*PDupwindNthAnti3beta2 -
+ PDupwindNthSymm1beta2*Abs(beta1L) - PDupwindNthSymm2beta2*Abs(beta2L) -
+ PDupwindNthSymm3beta2*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0);
+
+ CCTK_REAL B3L = IfThen(ShiftBCoeff*ShiftGammaCoeff != 0,3*(9*dtbetazL
+ + ShiftAdvectionCoeff*(-(beta1L*PDupwindNthAnti1beta3) -
+ beta2L*PDupwindNthAnti2beta3 - beta3L*PDupwindNthAnti3beta3 -
+ PDupwindNthSymm1beta3*Abs(beta1L) - PDupwindNthSymm2beta3*Abs(beta2L) -
+ PDupwindNthSymm3beta3*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0);
/* Copy local copies back to grid functions */
A[index] = AL;
diff --git a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc
index e0bc9ee..0f74f58 100644
--- a/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc
+++ b/ML_BSSN_O8/src/ML_BSSN_O8_convertToADMBase.cc
@@ -135,8 +135,7 @@ static void ML_BSSN_O8_convertToADMBase_Body(cGH const * restrict const cctkGH,
/* Precompute derivatives */
/* Calculate temporaries and grid functions */
- CCTK_REAL e4phi =
- IfThen(ToReal(conformalMethod),INV(SQR(phiL)),exp(4*phiL));
+ CCTK_REAL e4phi = IfThen(conformalMethod,INV(SQR(phiL)),exp(4*phiL));
gxxL = e4phi*gt11L;