aboutsummaryrefslogtreecommitdiff
path: root/ML_BSSN/src
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/src
parent05003fafaa79d7a4f3730231ebc845324cc29d84 (diff)
Regenerate code after Kranc ToReal change
Kranc commit 25d10c9c3c8133a9caefbe1e6ecbd4b5e234105d
Diffstat (limited to 'ML_BSSN/src')
-rw-r--r--ML_BSSN/src/ML_BSSN_Minkowski.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_RHS1.cc7
-rw-r--r--ML_BSSN/src/ML_BSSN_RHS2.cc7
-rw-r--r--ML_BSSN/src/ML_BSSN_boundary.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_constraints1.cc7
-rw-r--r--ML_BSSN/src/ML_BSSN_constraints2.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc8
-rw-r--r--ML_BSSN/src/ML_BSSN_convertToADMBase.cc3
8 files changed, 17 insertions, 21 deletions
diff --git a/ML_BSSN/src/ML_BSSN_Minkowski.cc b/ML_BSSN/src/ML_BSSN_Minkowski.cc
index 10d5506..77b7e2d 100644
--- a/ML_BSSN/src/ML_BSSN_Minkowski.cc
+++ b/ML_BSSN/src/ML_BSSN_Minkowski.cc
@@ -105,7 +105,7 @@ static void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const
/* 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/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc
index 8a09a0b..d988bba 100644
--- a/ML_BSSN/src/ML_BSSN_RHS1.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS1.cc
@@ -357,7 +357,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
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;
@@ -395,8 +395,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
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);
@@ -418,7 +417,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
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/src/ML_BSSN_RHS2.cc b/ML_BSSN/src/ML_BSSN_RHS2.cc
index 4fac720..a54dc92 100644
--- a/ML_BSSN/src/ML_BSSN_RHS2.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS2.cc
@@ -482,7 +482,7 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
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;
@@ -490,7 +490,7 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
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 +
@@ -570,8 +570,7 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
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/src/ML_BSSN_boundary.cc b/ML_BSSN/src/ML_BSSN_boundary.cc
index abfef01..ac1e90f 100644
--- a/ML_BSSN/src/ML_BSSN_boundary.cc
+++ b/ML_BSSN/src/ML_BSSN_boundary.cc
@@ -141,7 +141,7 @@ static void ML_BSSN_boundary_Body(cGH const * restrict const cctkGH, int const d
/* 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/src/ML_BSSN_constraints1.cc b/ML_BSSN/src/ML_BSSN_constraints1.cc
index de541c8..2814517 100644
--- a/ML_BSSN/src/ML_BSSN_constraints1.cc
+++ b/ML_BSSN/src/ML_BSSN_constraints1.cc
@@ -466,7 +466,7 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con
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;
@@ -474,7 +474,7 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con
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 +
@@ -536,8 +536,7 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con
+ 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/src/ML_BSSN_constraints2.cc b/ML_BSSN/src/ML_BSSN_constraints2.cc
index f9cd342..bc123f0 100644
--- a/ML_BSSN/src/ML_BSSN_constraints2.cc
+++ b/ML_BSSN/src/ML_BSSN_constraints2.cc
@@ -305,7 +305,7 @@ static void ML_BSSN_constraints2_Body(cGH const * restrict const cctkGH, int con
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/src/ML_BSSN_convertFromADMBaseGamma.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
index f89f8b1..b412962 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
@@ -282,7 +282,7 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
CCTK_REAL Xt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu12 +
Gt313*gtu13 + Gt323*gtu23) + Gt333*gtu33;
- CCTK_REAL AL = IfThen(ToReal(LapseACoeff) !=
+ CCTK_REAL AL = IfThen(LapseACoeff !=
0,-3*INV(ToReal(harmonicF))*pow(alphaL,-ToReal(harmonicN))*(9*dtalpL -
(beta1L*PDupwindNthAnti1alpha + beta2L*PDupwindNthAnti2alpha +
beta3L*PDupwindNthAnti3alpha + PDupwindNthSymm1alpha*Abs(beta1L) +
@@ -292,21 +292,21 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
CCTK_REAL theta = fmin(1,exp(1 -
rL*INV(ToReal(SpatialShiftGammaCoeffRadius))));
- CCTK_REAL B1L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) !=
+ CCTK_REAL B1L = IfThen(ShiftBCoeff*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) !=
+ CCTK_REAL B2L = IfThen(ShiftBCoeff*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) !=
+ CCTK_REAL B3L = IfThen(ShiftBCoeff*ShiftGammaCoeff !=
0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetazL -
3*(beta1L*PDupwindNthAnti1beta3 + beta2L*PDupwindNthAnti2beta3 +
beta3L*PDupwindNthAnti3beta3 + PDupwindNthSymm1beta3*Abs(beta1L) +
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBase.cc b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
index 804af11..589ccc2 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc
@@ -129,8 +129,7 @@ static void ML_BSSN_convertToADMBase_Body(cGH const * restrict const cctkGH, int
/* 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;