aboutsummaryrefslogtreecommitdiff
path: root/CarpetDev
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2010-04-26 19:06:32 -0500
committerBarry Wardell <barry.wardell@gmail.com>2011-12-14 16:45:41 +0000
commit6bc97ce988fb24ae99a48647375c39995f7e9f7d (patch)
tree7c89563b691b85d988d23241e89c4c2cfb1ef343 /CarpetDev
parent579fafb785fd2b35591584cc65c62bbe44744448 (diff)
CarpetJacovi: Use nan handling of CarpetLib
Diffstat (limited to 'CarpetDev')
-rw-r--r--CarpetDev/CarpetJacobi/src/Jacobi.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/CarpetDev/CarpetJacobi/src/Jacobi.cc b/CarpetDev/CarpetJacobi/src/Jacobi.cc
index b6969b6a5..5c33e7bc5 100644
--- a/CarpetDev/CarpetJacobi/src/Jacobi.cc
+++ b/CarpetDev/CarpetJacobi/src/Jacobi.cc
@@ -468,9 +468,7 @@ namespace CarpetJacobi {
if (verbose || veryverbose) {
const time_t currenttime = time(0);
if ((iter % icoarsestep == 0 && iter >= maxiters)
-#if HAVE_ISNAN
|| isnan(norm2)
-#endif
|| norm2 <= minerror
|| (iter % outevery == 0 && currenttime >= nexttime)) {
if (verbose || veryverbose) {
@@ -502,7 +500,6 @@ namespace CarpetJacobi {
}
}
-#if HAVE_ISNAN
// Exit if things go bad
if (isnan(norm2)) {
if (verbose || veryverbose) {
@@ -511,7 +508,6 @@ namespace CarpetJacobi {
}
break;
}
-#endif
// Return when desired accuracy is reached
if (norm2 <= minerror) {