diff options
Diffstat (limited to 'CarpetDev')
-rw-r--r-- | CarpetDev/CarpetCG/src/CG.cc | 4 | ||||
-rw-r--r-- | CarpetDev/CarpetJacobi/src/Jacobi.cc | 4 | ||||
-rw-r--r-- | CarpetDev/CarpetMG/src/mg.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/CarpetDev/CarpetCG/src/CG.cc b/CarpetDev/CarpetCG/src/CG.cc index 0dffe6d84..2ad3e34e5 100644 --- a/CarpetDev/CarpetCG/src/CG.cc +++ b/CarpetDev/CarpetCG/src/CG.cc @@ -900,7 +900,7 @@ namespace CarpetCG { delta_0 = delta_new; /* 09. WHILE i < i_max AND delta_new > vareps^2 delta_0 DO */ - while (iter < maxiters && epsilon / (nvars * gsize) > pow(minerror,2)) { + while (iter < maxiters && epsilon / (nvars * gsize) > ipow(minerror,2)) { if (verbose || veryverbose) { currenttime = time(0); @@ -1082,7 +1082,7 @@ namespace CarpetCG { /* 20. WHILE j < j_max AND alpha^2 delta_d > epsilon^2 */ } while (siter < smaxiters - && pow(alpha,2) * delta_d > pow(sminerror,2) + && ipow(alpha,2) * delta_d > ipow(sminerror,2) && !do_abort); if (veryverbose) { diff --git a/CarpetDev/CarpetJacobi/src/Jacobi.cc b/CarpetDev/CarpetJacobi/src/Jacobi.cc index 5bbd0fdf5..99e0ceb6a 100644 --- a/CarpetDev/CarpetJacobi/src/Jacobi.cc +++ b/CarpetDev/CarpetJacobi/src/Jacobi.cc @@ -259,7 +259,7 @@ namespace CarpetJacobi { CCTK_REAL levfac = 0; for (int d=0; d<dim; ++d) { levfac += 1 / - pow (cctkGH->cctk_delta_space[d] / cctkGH->cctk_levfac[d], 2); + ipow (cctkGH->cctk_delta_space[d] / cctkGH->cctk_levfac[d], 2); } levfac = 1 / levfac; @@ -373,7 +373,7 @@ namespace CarpetJacobi { const int ind = CCTK_GFINDEX3D(cctkGH, i, j, k); ++norm_count; // TODO: scale the norm by the resolution? - norm_l2 += pow(fac * resptr[ind], 2); + norm_l2 += ipow(fac * resptr[ind], 2); } } } diff --git a/CarpetDev/CarpetMG/src/mg.cc b/CarpetDev/CarpetMG/src/mg.cc index aba03edd2..e07f2be1d 100644 --- a/CarpetDev/CarpetMG/src/mg.cc +++ b/CarpetDev/CarpetMG/src/mg.cc @@ -798,7 +798,7 @@ namespace CarpetMG { // TODO: correct this for solving on grid arrays instead of grid // functions dx[d] = CCTK_DELTA_SPACE(d); - dxinv2 += 1.0 / pow(dx[d], 2); + dxinv2 += 1.0 / ipow(dx[d], 2); } CCTK_REAL const mdxinv2inv = 1.0 / (-2.0 * dxinv2); @@ -847,7 +847,7 @@ namespace CarpetMG { varptr[ind] -= w * diff; ++ count; - error2 += pow(diff, 2); + error2 += ipow(diff, 2); } } @@ -928,7 +928,7 @@ namespace CarpetMG { CCTK_REAL const diff = resptr[ind] - rhsptr[ind]; ++ count; - error2 += pow(diff, 2); + error2 += ipow(diff, 2); } } |