Changed "abort()" statements to "assert(0)" statements, because the

Changed "abort()" statements to "assert(0)" statements, because the
latter do output a message to the screen.

darcs-hash:20020802131112-07bb3-a89ca2582fce00c0d5b4cc82bf61473b7c8bdcb5.gz

13 files changed, 62 insertions, 62 deletions

diff --git a/Carpet/Carpet/options/carpet-lilypond-gcc3 b/Carpet/Carpet/options/carpet-lilypond-gcc3
index 2d188906b..72ec09a21 100644
--- a/Carpet/Carpet/options/carpet-lilypond-gcc3
+++ b/Carpet/Carpet/options/carpet-lilypond-gcc3
@@ -1,21 +1,21 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.5 2002/05/05 22:16:57 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.6 2002/08/02 15:11:12 schnetter Exp $
 
-CPP			= /home/eschnett/gcc/bin/cpp -traditional -DCARPET_REAL
-CC			= /home/eschnett/gcc/bin/gcc
-CXX			= /home/eschnett/gcc/bin/g++
-F77			= /home/eschnett/gcc/bin/g77
-F90			= /home/eschnett/gcc/bin/g77
+CPP			= /home/eschnett/gcc31/bin/cpp -traditional -DCARPET_REAL
+CC			= /home/eschnett/gcc31/bin/gcc
+CXX			= /home/eschnett/gcc31/bin/g++
+F77			= /home/eschnett/gcc31/bin/g77
+F90			= /home/eschnett/gcc31/bin/g77
 
 CFLAGS			= -fmessage-length=0
 CXXFLAGS		= -fmessage-length=0 -DCARPET_REAL -ftemplate-depth-30
 F77FLAGS		= -fmessage-length=0
 F90FLAGS		= -fmessage-length=0
-LDFLAGS			= -Wl,-rpath,/home/eschnett/gcc/lib
+LDFLAGS			= -Wl,-rpath,/home/eschnett/gcc31/lib
 
-C_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro
-CXX_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro
-F90_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro -malign-double
-F77_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro -malign-double
+C_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro
+CXX_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro
+F90_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro -malign-double
+F77_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro -malign-double
 
 C_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations
 CXX_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations
diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc
index 2f6b2d030..ee9f327d6 100644
--- a/Carpet/Carpet/src/Evolve.cc
+++ b/Carpet/Carpet/src/Evolve.cc
@@ -9,7 +9,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.12 2002/06/06 00:23:34 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.13 2002/08/02 15:11:12 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_Evolve_cc)
 
@@ -44,7 +44,7 @@ namespace Carpet {
     } else if (CCTK_Equals(terminate, "both")) {
       return term_iter && term_time;
     } else {
-      abort();
+      assert (0);
     }
   }
   
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc
index 728a96537..5ca2ce8f0 100644
--- a/Carpet/Carpet/src/Recompose.cc
+++ b/Carpet/Carpet/src/Recompose.cc
@@ -21,7 +21,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.27 2002/06/06 22:12:57 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.28 2002/08/02 15:11:12 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_Recompose_cc)
 
@@ -351,7 +351,7 @@ namespace Carpet {
     } else if (CCTK_EQUALS (processor_topology, "manual")) {
       SplitRegions_AsSpecified (cgh, bbs, obs);
     } else {
-      abort();
+      assert (0);
     }
   }
   
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index e2176132d..184cff89b 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -18,7 +18,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.30 2002/06/06 22:44:39 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.31 2002/08/02 15:11:13 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_SetupGH_cc)
 
@@ -147,7 +147,7 @@ namespace Carpet {
 	}
 	  
 	default:
-	  abort();
+	  assert (0);
 	}
 	
 	assert (disttype==CCTK_DISTRIB_CONSTANT
@@ -218,7 +218,7 @@ namespace Carpet {
       }
 	
       default:
-	abort();
+	assert (0);
       }
       
       arrdata[group].info.gsh         = (int*)malloc(  dim * sizeof(int));
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index eb5fcbc80..1a3a48031 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -12,7 +12,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.23 2002/06/07 15:28:23 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.24 2002/08/02 15:11:13 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_helpers_cc)
 
@@ -111,7 +111,7 @@ namespace Carpet {
     case alltimes:
       return 0;
     default:
-      abort();
+      assert (0);
     }
   }
   
@@ -130,7 +130,7 @@ namespace Carpet {
     case alltimes:
       return num_tl-1;
     default:
-      abort();
+      assert (0);
     }
   }
   
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 36c848b53..ecf1d0152 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -28,7 +28,7 @@
 
 #include "ioascii.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.33 2002/06/26 16:02:16 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.34 2002/08/02 15:11:13 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetIOASCII_ioascii_cc)
 
@@ -214,7 +214,7 @@ int CarpetIOASCII<outdim>
 	  desired = out1D_z;
 	  break;
 	default:
-	  abort();
+	  assert (0);
 	}
 	break;
       case 2:
@@ -225,7 +225,7 @@ int CarpetIOASCII<outdim>
 	} else if (dirs[0]==1 && dirs[1]==2) {
 	  desired = out2D_yz;
 	} else {
-	  abort();
+	  assert (0);
 	}
 	break;
       case 3:
@@ -233,7 +233,7 @@ int CarpetIOASCII<outdim>
 	desired = true;
 	break;
       default:
-	abort();
+	assert (0);
       }
       
       // Skip output if not desired
@@ -317,7 +317,7 @@ int CarpetIOASCII<outdim>
 				       out_zline_y);
 	    break;
 	  default:
-	    abort();
+	    assert (0);
 	  }
 	  break;
 	case 2:
@@ -340,14 +340,14 @@ int CarpetIOASCII<outdim>
 	       "out%dD_yzplane_x",  "out_yzplane_x",
 	       out_yzplane_x);
 	  } else {
-	    abort();
+	    assert (0);
 	  }
 	  break;
 	case 3:
 	  // The offset doesn't matter in this case
 	  break;
 	default:
-	  abort();
+	  assert (0);
 	}
 	
 	// Traverse all components on this refinement and multigrid
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index 742f388a6..c862435f2 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -5,7 +5,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.17 2002/05/05 22:16:59 schnetter Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.18 2002/08/02 15:11:15 schnetter Exp $
 
  ***************************************************************************/
 
@@ -329,7 +329,7 @@ void data<CCTK_REAL8,3>
 			       regbbox);
     
   } else {
-    abort();
+    assert (0);
   }
 }
 
@@ -495,7 +495,7 @@ void data<CCTK_REAL8,3>
 	   srcbbox, dstbbox, regbbox);
 	break;
       default:
-	abort();
+	assert (0);
       }
       break;
       
@@ -523,7 +523,7 @@ void data<CCTK_REAL8,3>
 	   srcbbox, dstbbox, regbbox);
 	break;
       default:
-	abort();
+	assert (0);
       }
       break;
       
@@ -553,16 +553,16 @@ void data<CCTK_REAL8,3>
 	   srcbbox, dstbbox, regbbox);
 	break;
       default:
-	abort();
+	assert (0);
       }
       break;
       
     default:
-      abort();
+      assert (0);
     }
     
   } else {
-    abort();
+    assert (0);
   }
 }
 
diff --git a/Carpet/CarpetLib/src/dist.hh b/Carpet/CarpetLib/src/dist.hh
index 9b56ba1c4..68e817c9d 100644
--- a/Carpet/CarpetLib/src/dist.hh
+++ b/Carpet/CarpetLib/src/dist.hh
@@ -5,7 +5,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.hh,v 1.5 2002/05/05 22:17:01 schnetter Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.hh,v 1.6 2002/08/02 15:11:16 schnetter Exp $
 
  ***************************************************************************/
 
@@ -65,7 +65,7 @@ namespace dist {
   
   template<class T>
   inline MPI_Datatype datatype (const T& dummy)
-  { abort(); return -1; }
+  { assert(0); return -1; }
   
   template<>
   inline MPI_Datatype datatype (const char& dummy)
diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc
index 26f605de7..50fd81df9 100644
--- a/Carpet/CarpetLib/src/gh.cc
+++ b/Carpet/CarpetLib/src/gh.cc
@@ -7,7 +7,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.cc,v 1.13 2002/05/05 22:17:02 schnetter Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.cc,v 1.14 2002/08/02 15:11:16 schnetter Exp $
 
  ***************************************************************************/
 
@@ -185,7 +185,7 @@ gh<D>::cexts gh<D>::make_reflevel_multigrid_boxes (const vector<ibbox>& exts,
 	lo += str/2;
 	break;
       default:
-	abort();
+	assert (0);
       }
       str *= mgfact;
       up = up - (up - lo) % str;
diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index f32964fd8..6a408c06a 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.11 2002/08/02 14:57:26 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.12 2002/08/02 15:11:16 schnetter Exp $
 
 #include <assert.h>
 #include <float.h>
@@ -19,7 +19,7 @@
 
 #include "reduce.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.11 2002/08/02 14:57:26 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.12 2002/08/02 15:11:16 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetReduce_reduce_cc)
 
@@ -72,7 +72,7 @@ namespace CarpetReduce {
     bool uses_cnt () const { return false; }
     template<class T>
     struct op {
-      static inline void initialise (T& accum) { abort(); }
+      static inline void initialise (T& accum) { assert (0); }
       static inline void reduce (T& accum, const T& val) { accum = min(accum, val); }
       static inline void finalise (T& accum, const T& cnt) { }
     };
@@ -108,7 +108,7 @@ namespace CarpetReduce {
     bool uses_cnt () const { return false; }
     template<class T>
     struct op {
-      static inline void initialise (T& accum) { abort(); }
+      static inline void initialise (T& accum) { assert (0); }
       static inline void reduce (T& accum, const T& val) { accum = max(accum, val); }
       static inline void finalise (T& accum, const T& cnt) { }
     };
@@ -322,7 +322,7 @@ namespace CarpetReduce {
 	  INITIALISE(norm2,T);			\
 	  INITIALISE(norm_inf,T);		\
 	default:				\
-	  abort();				\
+	  assert (0);				\
 	}					\
 	break;					\
       }
@@ -330,7 +330,7 @@ namespace CarpetReduce {
 #undef TYPECASE
 #undef INITIALISE
       default:
-	abort();
+	assert (0);
       }
       
     } // for n
@@ -395,7 +395,7 @@ namespace CarpetReduce {
 	  REDUCE(norm2,T);			\
 	  REDUCE(norm_inf,T);			\
 	default:				\
-	  abort();				\
+	  assert (0);				\
 	}					\
 	break;					\
       }
@@ -403,7 +403,7 @@ namespace CarpetReduce {
 #undef TYPECASE
 #undef REDUCE
       default:
-	abort();
+	assert (0);
       }
       
     } // for n
@@ -484,7 +484,7 @@ namespace CarpetReduce {
 	    FINALISE(norm2,T);			\
 	    FINALISE(norm_inf,T);		\
 	  default:				\
-	    abort();				\
+	    assert (0);				\
 	  }					\
 	  break;				\
 	}
@@ -492,7 +492,7 @@ namespace CarpetReduce {
 #undef TYPECASE
 #undef FINALISE
 	default:
-	  abort();
+	  assert (0);
 	}
 	
       } // for n
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index 0eacde6f5..dc3082a52 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -22,7 +22,7 @@
 #include "carpet.hh"
 #include "regrid.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.15 2002/07/12 09:09:52 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.16 2002/08/02 15:11:17 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetRegrid_regrid_cc)
 
@@ -153,7 +153,7 @@ namespace CarpetRegrid {
       
     } else if (CCTK_EQUALS(refined_regions, "manual-coordinate-list")) {
       
-      abort ();
+      assert (0);
       
     } else if (CCTK_EQUALS(refined_regions, "automatic")) {
       
@@ -178,7 +178,7 @@ namespace CarpetRegrid {
 			      bbl, obl);
       
     } else {
-      abort();
+      assert (0);
     }
     
 #ifdef AUTOMATIC_BOUNDARIES
diff --git a/Carpet/CarpetSlab/src/carpetslab.cc b/Carpet/CarpetSlab/src/carpetslab.cc
index ab7da921f..4c5086244 100644
--- a/Carpet/CarpetSlab/src/carpetslab.cc
+++ b/Carpet/CarpetSlab/src/carpetslab.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.13 2002/03/26 13:22:32 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.14 2002/08/02 15:11:18 schnetter Exp $
 
 #include <alloca.h>
 #include <assert.h>
@@ -19,7 +19,7 @@
 
 #include "carpetslab.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.13 2002/03/26 13:22:32 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.14 2002/08/02 15:11:18 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetSlab_carpetslab_cc)
 
@@ -313,7 +313,7 @@ namespace CarpetSlab {
       }
       assert (dd==hdim);
     } else {
-      abort();
+      assert (0);
     }
     
     // Calculate lengths
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index bab0d81ad..d2d2bacf1 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -33,7 +33,7 @@
 
 #include "ioflexio.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.17 2002/04/29 11:27:57 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.18 2002/08/02 15:11:14 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetIOFlexIO_ioflexio_cc)
 
@@ -157,7 +157,7 @@ namespace CarpetIOFlexIO {
       extension = ".h5";
 #endif
     } else {
-      abort();
+      assert (0);
     }
     extension = GetStringParameter ("out3D_extension", extension);
     
@@ -187,7 +187,7 @@ namespace CarpetIOFlexIO {
 	    writer = new H5IO(filename, IObase::Create);
 #endif
 	  } else {
-	    abort();
+	    assert (0);
 	  }
 	  delete writer;
 	  writer = 0;
@@ -204,7 +204,7 @@ namespace CarpetIOFlexIO {
 	writer = new H5IO(filename, IObase::Append);
 #endif
       } else {
-	abort();
+	assert (0);
       }
       assert (writer->isValid());
       amrwriter = new AMRwriter(*writer);
@@ -438,7 +438,7 @@ namespace CarpetIOFlexIO {
 	extension = ".h5";
 #endif
       } else {
-	abort();
+	assert (0);
       }
       extension = GetStringParameter ("in3D_extension", extension);
       
@@ -471,7 +471,7 @@ namespace CarpetIOFlexIO {
 	  reader = new H5IO(filename, IObase::Read);
 #endif
 	} else {
-	  abort();
+	  assert (0);
 	}
 	if (!reader->isValid()) {
 	  CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
@@ -616,7 +616,7 @@ namespace CarpetIOFlexIO {
     } // ARRAY or GROUP
       
     default:
-      abort();
+      assert (0);
     }
     
     return 0;