diff options
author | Ian Hinder <ian.hinder@aei.mpg.de> | 2011-06-11 03:50:30 +0200 |
---|---|---|
committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2011-06-11 04:34:23 +0200 |
commit | 158189c6675c8f03869e231f7cd36b4f96e4a75c (patch) | |
tree | 0cb14075ccdf2e701bd7f1215b64b4c614b7cde3 /ML_BSSN_MP | |
parent | 05003fafaa79d7a4f3730231ebc845324cc29d84 (diff) |
Regenerate code after Kranc ToReal change
Kranc commit 25d10c9c3c8133a9caefbe1e6ecbd4b5e234105d
Diffstat (limited to 'ML_BSSN_MP')
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.cc | 2 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_RHS1.cc | 7 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_RHS2.cc | 7 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_boundary.cc | 2 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_constraints1.cc | 7 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_constraints2.cc | 2 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.cc | 87 | ||||
-rw-r--r-- | ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.cc | 3 |
8 files changed, 58 insertions, 59 deletions
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.cc b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.cc index 956e296..f246866 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.cc @@ -105,7 +105,7 @@ static void ML_BSSN_MP_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_MP/src/ML_BSSN_MP_RHS1.cc b/ML_BSSN_MP/src/ML_BSSN_MP_RHS1.cc index 4a7b5be..72f4298 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_RHS1.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHS1.cc @@ -414,7 +414,7 @@ static void ML_BSSN_MP_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*(J11L*PDstandardNth1phi + J21L*PDstandardNth2phi + J31L*PDstandardNth3phi); @@ -455,8 +455,7 @@ static void ML_BSSN_MP_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); @@ -478,7 +477,7 @@ static void ML_BSSN_MP_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*(J11L*PDstandardNth1beta1 + IfThen(conformalMethod,phiL*(-0.333333333333333333333333333333*(J11L*PDstandardNth1beta1 + J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_RHS2.cc b/ML_BSSN_MP/src/ML_BSSN_MP_RHS2.cc index 90f516e..1efdfb9 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_RHS2.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHS2.cc @@ -742,7 +742,7 @@ static void ML_BSSN_MP_RHS2_Body(cGH const * restrict const cctkGH, int const di dJ333L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J13L) + PDstandardNth22gt33*SQR(J23L) + PDstandardNth33gt33*SQR(J33L))); - 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*(J11L*PDstandardNth1phi + J21L*PDstandardNth2phi + J31L*PDstandardNth3phi); @@ -753,7 +753,7 @@ static void ML_BSSN_MP_RHS2_Body(cGH const * restrict const cctkGH, int const di CCTK_REAL cdphi3 = fac1*(J13L*PDstandardNth1phi + J23L*PDstandardNth2phi + J33L*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*((dJ111L - Gt111*J11L - Gt211*J12L - Gt311*J13L)*PDstandardNth1phi + 2*(J11L*(J21L*PDstandardNth12phi + @@ -875,8 +875,7 @@ static void ML_BSSN_MP_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_MP/src/ML_BSSN_MP_boundary.cc b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.cc index d61c413..7f6f8ce 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_boundary.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.cc @@ -141,7 +141,7 @@ static void ML_BSSN_MP_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_MP/src/ML_BSSN_MP_constraints1.cc b/ML_BSSN_MP/src/ML_BSSN_MP_constraints1.cc index 90336aa..24d0b06 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints1.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints1.cc @@ -726,7 +726,7 @@ static void ML_BSSN_MP_constraints1_Body(cGH const * restrict const cctkGH, int dJ333L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J13L) + PDstandardNth22gt33*SQR(J23L) + PDstandardNth33gt33*SQR(J33L))); - 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*(J11L*PDstandardNth1phi + J21L*PDstandardNth2phi + J31L*PDstandardNth3phi); @@ -737,7 +737,7 @@ static void ML_BSSN_MP_constraints1_Body(cGH const * restrict const cctkGH, int CCTK_REAL cdphi3 = fac1*(J13L*PDstandardNth1phi + J23L*PDstandardNth2phi + J33L*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*((dJ111L - Gt111*J11L - Gt211*J12L - Gt311*J13L)*PDstandardNth1phi + 2*(J11L*(J21L*PDstandardNth12phi + @@ -841,8 +841,7 @@ static void ML_BSSN_MP_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_MP/src/ML_BSSN_MP_constraints2.cc b/ML_BSSN_MP/src/ML_BSSN_MP_constraints2.cc index ec9596a..c9efeab 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints2.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints2.cc @@ -344,7 +344,7 @@ static void ML_BSSN_MP_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*(J11L*PDstandardNth1phi + J21L*PDstandardNth2phi + J31L*PDstandardNth3phi); diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.cc b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.cc index 6ece0ef..e9ed908 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.cc @@ -378,52 +378,55 @@ static void ML_BSSN_MP_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*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1alpha + - (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2alpha + - (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3alpha + - (J11L*PDupwindNthSymm1alpha + J21L*PDupwindNthSymm2alpha + - J31L*PDupwindNthSymm3alpha)*Abs(beta1L) + (J12L*PDupwindNthSymm1alpha + - J22L*PDupwindNthSymm2alpha + J32L*PDupwindNthSymm3alpha)*Abs(beta2L) + - (J13L*PDupwindNthSymm1alpha + J23L*PDupwindNthSymm2alpha + - J33L*PDupwindNthSymm3alpha)*Abs(beta3L))*ToReal(LapseAdvectionCoeff)),0); + CCTK_REAL AL = IfThen(LapseACoeff != 0,3*(-9*dtalpL + + LapseAdvectionCoeff*((beta1L*J11L + beta2L*J12L + + beta3L*J13L)*PDupwindNthAnti1alpha + (beta1L*J21L + beta2L*J22L + + beta3L*J23L)*PDupwindNthAnti2alpha + (beta1L*J31L + beta2L*J32L + + beta3L*J33L)*PDupwindNthAnti3alpha + (J11L*PDupwindNthSymm1alpha + + J21L*PDupwindNthSymm2alpha + J31L*PDupwindNthSymm3alpha)*Abs(beta1L) + + (J12L*PDupwindNthSymm1alpha + J22L*PDupwindNthSymm2alpha + + J32L*PDupwindNthSymm3alpha)*Abs(beta2L) + (J13L*PDupwindNthSymm1alpha + + J23L*PDupwindNthSymm2alpha + + J33L*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*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta1 + - (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta1 + - (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta1 + - (J11L*PDupwindNthSymm1beta1 + J21L*PDupwindNthSymm2beta1 + - J31L*PDupwindNthSymm3beta1)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta1 + - J22L*PDupwindNthSymm2beta1 + J32L*PDupwindNthSymm3beta1)*Abs(beta2L) + - (J13L*PDupwindNthSymm1beta1 + J23L*PDupwindNthSymm2beta1 + - J33L*PDupwindNthSymm3beta1)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0); - - CCTK_REAL B2L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) != - 0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetayL - - 3*((beta1L*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta2 + - (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta2 + - (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta2 + - (J11L*PDupwindNthSymm1beta2 + J21L*PDupwindNthSymm2beta2 + - J31L*PDupwindNthSymm3beta2)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta2 + - J22L*PDupwindNthSymm2beta2 + J32L*PDupwindNthSymm3beta2)*Abs(beta2L) + - (J13L*PDupwindNthSymm1beta2 + J23L*PDupwindNthSymm2beta2 + - J33L*PDupwindNthSymm3beta2)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0); - - CCTK_REAL B3L = IfThen(ToReal(ShiftBCoeff)*ToReal(ShiftGammaCoeff) != - 0,INV(theta)*INV(ToReal(ShiftGammaCoeff))*(27*dtbetazL - - 3*((beta1L*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta3 + - (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta3 + - (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta3 + - (J11L*PDupwindNthSymm1beta3 + J21L*PDupwindNthSymm2beta3 + - J31L*PDupwindNthSymm3beta3)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta3 + - J22L*PDupwindNthSymm2beta3 + J32L*PDupwindNthSymm3beta3)*Abs(beta2L) + - (J13L*PDupwindNthSymm1beta3 + J23L*PDupwindNthSymm2beta3 + - J33L*PDupwindNthSymm3beta3)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff)),0); + CCTK_REAL B1L = IfThen(ShiftBCoeff*ShiftGammaCoeff != + 0,-3*(-9*dtbetaxL + ShiftAdvectionCoeff*((beta1L*J11L + beta2L*J12L + + beta3L*J13L)*PDupwindNthAnti1beta1 + (beta2L*J22L + + beta3L*J23L)*PDupwindNthAnti2beta1 + (beta2L*J32L + + beta3L*J33L)*PDupwindNthAnti3beta1 + beta1L*(J21L*PDupwindNthAnti2beta1 + + J31L*PDupwindNthAnti3beta1) + (J11L*PDupwindNthSymm1beta1 + + J21L*PDupwindNthSymm2beta1 + J31L*PDupwindNthSymm3beta1)*Abs(beta1L) + + (J12L*PDupwindNthSymm1beta1 + J22L*PDupwindNthSymm2beta1 + + J32L*PDupwindNthSymm3beta1)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta1 + + J23L*PDupwindNthSymm2beta1 + + J33L*PDupwindNthSymm3beta1)*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0); + + CCTK_REAL B2L = IfThen(ShiftBCoeff*ShiftGammaCoeff != + 0,-3*(-9*dtbetayL + ShiftAdvectionCoeff*((beta1L*J11L + beta2L*J12L + + beta3L*J13L)*PDupwindNthAnti1beta2 + (beta2L*J22L + + beta3L*J23L)*PDupwindNthAnti2beta2 + (beta2L*J32L + + beta3L*J33L)*PDupwindNthAnti3beta2 + beta1L*(J21L*PDupwindNthAnti2beta2 + + J31L*PDupwindNthAnti3beta2) + (J11L*PDupwindNthSymm1beta2 + + J21L*PDupwindNthSymm2beta2 + J31L*PDupwindNthSymm3beta2)*Abs(beta1L) + + (J12L*PDupwindNthSymm1beta2 + J22L*PDupwindNthSymm2beta2 + + J32L*PDupwindNthSymm3beta2)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta2 + + J23L*PDupwindNthSymm2beta2 + + J33L*PDupwindNthSymm3beta2)*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0); + + CCTK_REAL B3L = IfThen(ShiftBCoeff*ShiftGammaCoeff != + 0,-3*(-9*dtbetazL + ShiftAdvectionCoeff*((beta1L*J11L + beta2L*J12L + + beta3L*J13L)*PDupwindNthAnti1beta3 + (beta2L*J22L + + beta3L*J23L)*PDupwindNthAnti2beta3 + (beta2L*J32L + + beta3L*J33L)*PDupwindNthAnti3beta3 + beta1L*(J21L*PDupwindNthAnti2beta3 + + J31L*PDupwindNthAnti3beta3) + (J11L*PDupwindNthSymm1beta3 + + J21L*PDupwindNthSymm2beta3 + J31L*PDupwindNthSymm3beta3)*Abs(beta1L) + + (J12L*PDupwindNthSymm1beta3 + J22L*PDupwindNthSymm2beta3 + + J32L*PDupwindNthSymm3beta3)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta3 + + J23L*PDupwindNthSymm2beta3 + + J33L*PDupwindNthSymm3beta3)*Abs(beta3L)))*INV(ShiftGammaCoeff)*INV(theta),0); /* Copy local copies back to grid functions */ A[index] = AL; diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.cc b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.cc index 7684bbf..6ad937b 100644 --- a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.cc +++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.cc @@ -129,8 +129,7 @@ static void ML_BSSN_MP_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; |