diff options
| author | schnetter <> | 2003-11-13 16:29:00 +0000 |
|---|---|---|
| committer | schnetter <> | 2003-11-13 16:29:00 +0000 |
| commit | 3a05eb239216794d4e2c5946770a7ac7fedcff21 (patch) | |
| tree | 787aebfbd537f9503973bd376d4bb146235004b8 /Carpet/CarpetInterp/src | |
| parent | 107d6001cede350fb5a40ea4a7458ee40fd6eab5 (diff) | |
Return the local interpolator's error code if something goes wrong.
darcs-hash:20031113162947-07bb3-267cc4954cf1498f2a1f058eb4c23904976e92e9.gz
Diffstat (limited to 'Carpet/CarpetInterp/src')
| -rw-r--r-- | Carpet/CarpetInterp/src/interp.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index 0e77f7a33..2855b3ec3 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.16 2003/11/07 13:21:06 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.17 2003/11/13 17:29:47 schnetter Exp $ #include <assert.h> #include <math.h> @@ -21,7 +21,7 @@ #include "interp.hh" extern "C" { - static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.16 2003/11/07 13:21:06 schnetter Exp $"; + static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.17 2003/11/13 17:29:47 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetInterp_interp_cc); } @@ -421,7 +421,7 @@ namespace CarpetInterp { CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING, "The local interpolator returned the error code %d", ierr); } - overall_ierr |= ierr; + overall_ierr = min(overall_ierr, ierr); // Interpolate in time, if necessary if (need_time_interp) { @@ -523,12 +523,12 @@ namespace CarpetInterp { int global_overall_ierr; MPI_Allreduce (&overall_ierr, &global_overall_ierr, 1, MPI_INT, - MPI_LOR, comm); + MPI_MIN, comm); // Done. - return global_overall_ierr ? -1 : 0; + return global_overall_ierr; } } // namespace CarpetInterp |