aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Hinder <ian.hinder@aei.mpg.de>2012-11-19 17:24:58 +0100
committerIan Hinder <ian.hinder@aei.mpg.de>2012-11-19 17:24:58 +0100
commitb19621c279744d4d3eff3b575f9b277419f07c7c (patch)
treed93a1d7b7841f65a52e27829bedf83a16b6584cd
parenteaf08e4235c0f0d5dfcea5640feb3c51a055627a (diff)
Regenerate code (Kranc commit 17deb8b4ff45a8a3cd1645cb626f6d33a5e17beb)
-rw-r--r--ML_BSSN/src/ML_BSSN_RHS1.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc4
-rw-r--r--ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc2
-rw-r--r--ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc2
-rw-r--r--ML_CCZ4/src/ML_CCZ4_RHS1.cc2
-rw-r--r--ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc4
-rw-r--r--ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc2
-rw-r--r--ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc2
-rw-r--r--ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc2
-rw-r--r--ML_WaveToy/src/WT_Gaussian.cc2
-rw-r--r--ML_WaveToy/src/WT_Standing.cc2
-rw-r--r--ML_WaveToy_CL/src/WT_CL_Gaussian.cc2
-rw-r--r--ML_WaveToy_CL/src/WT_CL_Standing.cc2
14 files changed, 16 insertions, 16 deletions
diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc
index dd7364c..3d0c850 100644
--- a/ML_BSSN/src/ML_BSSN_RHS1.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS1.cc
@@ -1343,7 +1343,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC beta1rhsL;
CCTK_REAL_VEC beta2rhsL;
diff --git a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
index ed3b2de..8c39ef8 100644
--- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
+++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc
@@ -831,10 +831,10 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
kmadd(Gt311,gtu11,kmadd(Gt322,gtu22,kmadd(Gt333,gtu33,kmul(kmadd(Gt312,gtu12,kmadd(Gt313,gtu13,kmul(Gt323,gtu23))),ToReal(2)))));
CCTK_REAL_VEC AL = IfThen(LapseACoeff !=
- 0,kneg(kdiv(kmul(kpow(alphaL,-harmonicN),knmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),dtalpL)),ToReal(harmonicF))),ToReal(0));
+ 0,kneg(kmul(kmul(kpow(alphaL,-harmonicN),knmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),dtalpL)),ToReal(ScalarINV(harmonicF)))),ToReal(0));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC B1L;
CCTK_REAL_VEC B2L;
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
index 90f8953..9d343a8 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc
@@ -839,7 +839,7 @@ static void ML_BSSN_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(ksub(AL,trKL),ToReal(LapseACoeff),trKL))));
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
index b49ffa0..b200b7c 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc
@@ -258,7 +258,7 @@ static void ML_BSSN_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kneg(kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(ksub(AL,trKL),ToReal(LapseACoeff),trKL))));
diff --git a/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
index 515fa63..f64b4b0 100644
--- a/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc
@@ -243,7 +243,7 @@ static void ML_BSSN_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kneg(kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(ksub(AL,trKL),ToReal(LapseACoeff),trKL))));
diff --git a/ML_CCZ4/src/ML_CCZ4_RHS1.cc b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
index e08e553..0bf0277 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHS1.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
@@ -2258,7 +2258,7 @@ static void ML_CCZ4_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC beta1rhsL;
CCTK_REAL_VEC beta2rhsL;
diff --git a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
index a36072e..5c1af61 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
@@ -831,10 +831,10 @@ static void ML_CCZ4_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
kmadd(Gt311,gtu11,kmadd(Gt322,gtu22,kmadd(Gt333,gtu33,kmul(kmadd(Gt312,gtu12,kmadd(Gt313,gtu13,kmul(Gt323,gtu23))),ToReal(2)))));
CCTK_REAL_VEC AL = IfThen(LapseACoeff !=
- 0,kneg(kdiv(kmul(kpow(alphaL,-harmonicN),knmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),dtalpL)),ToReal(harmonicF))),ToReal(0));
+ 0,kneg(kmul(kmul(kpow(alphaL,-harmonicN),knmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),dtalpL)),ToReal(ScalarINV(harmonicF)))),ToReal(0));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC B1L;
CCTK_REAL_VEC B2L;
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
index 8b74440..85f0bbd 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
@@ -840,7 +840,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kmsub(kmadd(beta1L,JacPDupwindNthAnti1alpha,kmadd(beta2L,JacPDupwindNthAnti2alpha,kmadd(beta3L,JacPDupwindNthAnti3alpha,kmadd(JacPDupwindNthSymm1alpha,kfabs(beta1L),kmadd(JacPDupwindNthSymm2alpha,kfabs(beta2L),kmul(JacPDupwindNthSymm3alpha,kfabs(beta3L))))))),ToReal(LapseAdvectionCoeff),kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(AL,ToReal(LapseACoeff),kmul(kmsub(ThetaL,ToReal(2),trKL),ToReal(-1
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
index ff6b310..61b8fb2 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
@@ -259,7 +259,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kneg(kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(AL,ToReal(LapseACoeff),kmul(kmsub(ThetaL,ToReal(2),trKL),ToReal(-1
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
index 8fe34bc..252a1ec 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
@@ -244,7 +244,7 @@ static void ML_CCZ4_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
kdiv(ToReal(SpatialBetaDriverRadius),kfmax(rL,ToReal(SpatialBetaDriverRadius)));
CCTK_REAL_VEC theta =
- kfmin(ToReal(1),kexp(ksub(ToReal(1),kdiv(rL,ToReal(SpatialShiftGammaCoeffRadius)))));
+ kfmin(ToReal(1),kexp(knmsub(rL,ToReal(ScalarINV(SpatialShiftGammaCoeffRadius)),ToReal(1))));
CCTK_REAL_VEC dtalpL =
kneg(kmul(kpow(alphaL,harmonicN),kmul(ToReal(harmonicF),kmadd(AL,ToReal(LapseACoeff),kmul(kmsub(ThetaL,ToReal(2),trKL),ToReal(-1
diff --git a/ML_WaveToy/src/WT_Gaussian.cc b/ML_WaveToy/src/WT_Gaussian.cc
index b8862a5..2c8f46a 100644
--- a/ML_WaveToy/src/WT_Gaussian.cc
+++ b/ML_WaveToy/src/WT_Gaussian.cc
@@ -98,7 +98,7 @@ static void WT_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, i
/* Calculate temporaries and grid functions */
CCTK_REAL_VEC uL =
- kmul(kexp(kdiv(kmul(kmul(rL,rL),ToReal(-0.5)),ToReal(ScalarSQR(width)))),ToReal(amplitude));
+ kmul(kexp(kmul(kmul(kmul(rL,rL),ToReal(-0.5)),ToReal(ScalarINV(ScalarSQR(width))))),ToReal(amplitude));
CCTK_REAL_VEC rhoL = ToReal(0);
diff --git a/ML_WaveToy/src/WT_Standing.cc b/ML_WaveToy/src/WT_Standing.cc
index bda635f..a3d0fa6 100644
--- a/ML_WaveToy/src/WT_Standing.cc
+++ b/ML_WaveToy/src/WT_Standing.cc
@@ -99,7 +99,7 @@ static void WT_Standing_Body(cGH const * restrict const cctkGH, int const dir, i
/* Precompute derivatives */
/* Calculate temporaries and grid functions */
- CCTK_REAL_VEC k = kdiv(ToReal(Pi),ToReal(width));
+ CCTK_REAL_VEC k = ToReal(Pi*ScalarINV(width));
CCTK_REAL_VEC omega = ksqrt(kmul(kmul(k,k),ToReal(3)));
diff --git a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc
index 072ced7..5c95c8f 100644
--- a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc
+++ b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc
@@ -100,7 +100,7 @@ static void WT_CL_Gaussian_Body(cGH const * restrict const cctkGH, int const dir
" \n"
" /* Calculate temporaries and grid functions */\n"
" CCTK_REAL_VEC uL = \n"
- " kmul(kexp(kdiv(kmul(kmul(rL,rL),ToReal(-0.5)),ToReal(ScalarSQR(width)))),ToReal(amplitude));\n"
+ " kmul(kexp(kmul(kmul(kmul(rL,rL),ToReal(-0.5)),ToReal(ScalarINV(ScalarSQR(width))))),ToReal(amplitude));\n"
" \n"
" CCTK_REAL_VEC rhoL = ToReal(0);\n"
" \n"
diff --git a/ML_WaveToy_CL/src/WT_CL_Standing.cc b/ML_WaveToy_CL/src/WT_CL_Standing.cc
index f63f7f4..dc487d9 100644
--- a/ML_WaveToy_CL/src/WT_CL_Standing.cc
+++ b/ML_WaveToy_CL/src/WT_CL_Standing.cc
@@ -101,7 +101,7 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir
" /* Precompute derivatives */\n"
" \n"
" /* Calculate temporaries and grid functions */\n"
- " CCTK_REAL_VEC k = kdiv(ToReal(Pi),ToReal(width));\n"
+ " CCTK_REAL_VEC k = ToReal(Pi*ScalarINV(width));\n"
" \n"
" CCTK_REAL_VEC omega = ksqrt(kmul(kmul(k,k),ToReal(3)));\n"
" \n"