diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-10-03 23:52:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2006-10-03 23:52:00 +0000 |
| commit | 05070ca270aa027b946159075655779a59f709f0 (patch) | |
| tree | 4e8161da6cf61a0433532bd7e18f0f6706fe1b15 /CarpetDev | |
| parent | 91ab8a47265b1c0abae2c5b32c66faa1edc50b73 (diff) | |
CarpetCG: Correct int/CCTK_INT differences
darcs-hash:20061003235258-dae7b-e98eb30e37c7863b41ee421e940247a898a26d70.gz
Diffstat (limited to 'CarpetDev')
| -rw-r--r-- | CarpetDev/CarpetCG/src/CG.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CarpetDev/CarpetCG/src/CG.cc b/CarpetDev/CarpetCG/src/CG.cc index a41f1f3d4..0bccbaacf 100644 --- a/CarpetDev/CarpetCG/src/CG.cc +++ b/CarpetDev/CarpetCG/src/CG.cc @@ -63,7 +63,7 @@ namespace CarpetCG { int ierr; - vector<int> nboundaryzones(2*dim); + vector<CCTK_INT> nboundaryzones(2*dim); CCTK_REAL factor; vector<CCTK_REAL> factors; @@ -916,7 +916,9 @@ namespace CarpetCG { if (veryverbose || (iter % outevery == 0 && currenttime >= nexttime)) { CCTK_VInfo (CCTK_THORNSTRING, "Iteration %d (%d since restart): residual is %g (%g,%d,%g)", - iter, iter2, (double)sqrt(epsilon / (nvars * gsize)),epsilon,nvars,gsize); + iter, iter2, + (double)sqrt(epsilon / (nvars * gsize)), + (double)epsilon,nvars,(double)gsize); if (outeveryseconds > 0) { while (nexttime <= currenttime) nexttime += outeveryseconds; } @@ -1052,7 +1054,8 @@ namespace CarpetCG { CCTK_VInfo (CCTK_THORNSTRING, " Changing step size, iteration %d: was %g, now %g (%g, %g)", - siter, alpha_old, alpha, eta, eta_prev); + siter, + (double)alpha_old, (double)alpha, (double)eta, (double)eta_prev); } assert (sum_alpha > - maxstepsize); if (sum_alpha > maxstepsize) { |