Remove all #warning statements

21 files changed, 65 insertions, 54 deletions

diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc
index acfb94b1d..8c9758039 100644
--- a/Carpet/Carpet/src/Recompose.cc
+++ b/Carpet/Carpet/src/Recompose.cc
@@ -213,7 +213,7 @@ namespace Carpet {
       CCTK_INT const do_recompose =
         Carpet_RegridMaps (cctkGH, & superregsss, & regssss, force_recompose);
       assert (do_recompose >= 0);
-#warning "TODO"
+      // TODO
 #if 1 // #ifdef CARPET_DEBUG
       {
         int ival = do_recompose;
@@ -271,7 +271,7 @@ namespace Carpet {
     
     Waypoint ("Regridding map %d...", m);
     
-#warning "TODO: keep levels fixed here"
+    // TODO: keep levels fixed here
 #if 0
     //
     // Keep this level fixed if it is not evolved
@@ -336,7 +336,7 @@ namespace Carpet {
       assert (vhh.AT(m)->reflevels() == reflevels);
     }
     
-#warning "TODO"
+    // TODO
 #if 1 // #ifdef CARPET_DEBUG
       {
         // All processes must use the same number of levels
diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 2ebb4fc81..3153ef48d 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -157,7 +157,7 @@ namespace Carpet {
                      ? arrdata.AT(group).AT(m).data.AT(var - vectorindex)
                      : NULL);
                 const int varindex = firstvarindex + var;
-#warning "TODO: allocate these in SetupGH, and after recomposing"
+                // TODO: allocate these in SetupGH, and after recomposing
                 if (not arrdata.AT(group).AT(m).data.AT(var)) {
                   switch (specific_cactus_type(gp.vartype)) {
 #define TYPECASE(N,T)                                                   \
diff --git a/Carpet/CarpetIOHDF5/src/util/hdf5_slicer.cc b/Carpet/CarpetIOHDF5/src/util/hdf5_slicer.cc
index 6c6c995e2..a3a89e89f 100644
--- a/Carpet/CarpetIOHDF5/src/util/hdf5_slicer.cc
+++ b/Carpet/CarpetIOHDF5/src/util/hdf5_slicer.cc
@@ -18,16 +18,9 @@
 #include <cstring>
 #include <regex.h>
 
-// some macros to fix compatibility issues as long
-// as 1.8.0 is in beta phase
 #define H5_USE_16_API 1
-
 #include <hdf5.h>
 
-#if (H5_VERS_MAJOR == 1 && (H5_VERS_MINOR == 8) && (H5_VERS_RELEASE == 0))
-#warning "Hacking HDF5 1.8.0 compatiblity with 1.6.x; fix once 1.8.0 stable"
-#endif
-
 using namespace std;
 
 /*****************************************************************************
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index 864dd85d7..e9674bbc1 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -1364,7 +1364,8 @@ namespace CarpetInterp {
                 1));
       }
       
-#warning "TODO: Loop only over those maps and components that exist for this variable group"
+      // TODO: Loop only over those maps and components that exist for
+      // this variable group
       for (int m=0; m<maps; ++m) {
         for (int lc=0; lc<vhh.AT(m)->local_components(rl); ++lc) {
           int const c = vhh.AT(m)->get_component(rl,lc);
diff --git a/Carpet/CarpetLib/src/bboxset.cc b/Carpet/CarpetLib/src/bboxset.cc
index 9e5b2cd5b..abeb5c0ee 100644
--- a/Carpet/CarpetLib/src/bboxset.cc
+++ b/Carpet/CarpetLib/src/bboxset.cc
@@ -661,7 +661,7 @@ bboxset<T,D> bboxset<T,D>::expanded_for (const box& b) const
   return res;
 }
 
-#warning "TODO: this is incorrect"
+// TODO: this is incorrect
 #if 1
 template<typename T, int D>
 bboxset<T,D> bboxset<T,D>::contracted_for (const box& b) const
diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh
index 17b143f95..6b92bb1c4 100644
--- a/Carpet/CarpetLib/src/bboxset.hh
+++ b/Carpet/CarpetLib/src/bboxset.hh
@@ -203,7 +203,7 @@ public:
       ("compatible" means having the same stride.)  */
   bboxset expanded_for (const box& b) const CCTK_MEMBER_ATTRIBUTE_PURE;
   
-#warning "TODO: this is incorrect"
+  // TODO: this is incorrect
 #if 1
   /** Find the largest b-compatible box inside this bbox.  */
   bboxset contracted_for (const box& b) const CCTK_MEMBER_ATTRIBUTE_PURE;
diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index 05a5f0534..156e9cbbd 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -159,7 +159,8 @@ allocated_memory_shape (vect<int,D> shape)
 #if VECTORISE_ALIGNED_ARRAYS
     // Enlarge shape in the x direction to ensure it is a multiple of
     // the vector size
-#warning "TODO: Support other datatypes as well, don't target only CCTK_REAL"
+    // TODO: Support other datatypes as well, don't target only
+    // CCTK_REAL
     if (sizeof(CCTK_REAL) * CCTK_REAL_VEC_SIZE == magic_size) {
       CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING,
                   "The build-time option VECTORISE_ALIGNED_ARRAYS requires that the size of a grid variable in the x direction is a multiple of %d bytes, while the run-time parameter avoid_arraysize_bytes=%d requests the opposite. This is inconsistent -- aborting",
diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc
index 295ebc43c..7e0dba448 100644
--- a/Carpet/CarpetLib/src/gh.cc
+++ b/Carpet/CarpetLib/src/gh.cc
@@ -464,8 +464,8 @@ locate_position (rvect const & rpos,
     
     // TODO: Ignore this level if this point is not in the active
     // region (i.e. if it is a buffer point or similar)
-#warning "TODO: check the level_bbox"
-#warning "TODO: (assume this gh has only one dh)"
+    // TODO: check the level_bbox
+    // TODO: (assume this gh has only one dh)
     
     // Search all superregions linearly.  Each superregion corresponds
     // to a "refined region", and the number of superregions is thus
diff --git a/Carpet/CarpetLib/src/th.cc b/Carpet/CarpetLib/src/th.cc
index d34ad6c65..e355221b9 100644
--- a/Carpet/CarpetLib/src/th.cc
+++ b/Carpet/CarpetLib/src/th.cc
@@ -75,7 +75,8 @@ void th::regrid ()
         }
       } else {
         if (time_interpolation_during_regridding) {
-#warning "We probably don't want to do this, but it is nice for compatibility"
+          // We probably don't want to do this, but it is nice for
+          // compatibility
           times.AT(ml).AT(rl).resize(timelevels);
           for (int tl=0; tl<timelevels; ++tl) {
             // linear interpolation between the two surrounding coarse
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index 0a5567e2b..a834f2530 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -194,7 +194,7 @@ namespace CarpetRegrid {
     // make multiprocessor aware
     vector<vector<region_t> > regss(superregss.size());
     for (size_t rl=0; rl<superregss.size(); ++rl) {
-#warning "TODO: delete .processors"
+      // TODO: delete .processors
       SplitRegions (cctkGH, superregss.at(rl), regss.at(rl));
     }
     
diff --git a/Carpet/CarpetRegrid2/src/boundary.cc b/Carpet/CarpetRegrid2/src/boundary.cc
index e36af78a2..47a1fa820 100644
--- a/Carpet/CarpetRegrid2/src/boundary.cc
+++ b/Carpet/CarpetRegrid2/src/boundary.cc
@@ -204,7 +204,7 @@ namespace CarpetRegrid2 {
     
     boundary_staggering_mismatch =
       xpose ((hh.refcent == vertex_centered) != (is_staggered == 0));
-#warning "TODO: This is too strict"
+    // TODO: This is too strict
     assert (all (all (not boundary_staggering_mismatch)));
     
     get_physical_boundary (physical_lower, physical_upper, spacing);
diff --git a/Carpet/CarpetRegrid2/src/regrid.cc b/Carpet/CarpetRegrid2/src/regrid.cc
index 1a2d177c6..a92e9934b 100644
--- a/Carpet/CarpetRegrid2/src/regrid.cc
+++ b/Carpet/CarpetRegrid2/src/regrid.cc
@@ -149,8 +149,9 @@ namespace CarpetRegrid2 {
     //
     
     // This requires that CoordBase is used
-#warning "TODO: check this (for Carpet, and maybe also for CartGrid3D)"
-#warning "TODO: (the check that these two are consistent should be in Carpet)"
+    // TODO: check this (for Carpet, and maybe also for CartGrid3D)
+    // TODO: (the check that these two are consistent should be in
+    // Carpet)
     
     jjvect nboundaryzones, is_internal;
     jjvect is_staggered, shiftout;
@@ -177,8 +178,8 @@ namespace CarpetRegrid2 {
       while (min_rl < int(regss.size())) {
         // Increase min_rl until we find a level that can be changed
 #if 0
-#warning "think about this a bit more"
-#warning "use this taper-checking also in Comm.cc"
+        // TODO: think about this a bit more
+        // TODO: use this taper-checking also in Comm.cc
         bool in_sync = true;
         if (freeze_unaligned_parent_levels) {
           int const parent_do_every =
diff --git a/CarpetDev/CarpetIOF5/src/input.cc b/CarpetDev/CarpetIOF5/src/input.cc
index d42cbd076..b7f25b59f 100644
--- a/CarpetDev/CarpetIOF5/src/input.cc
+++ b/CarpetDev/CarpetIOF5/src/input.cc
@@ -117,7 +117,7 @@ namespace CarpetIOF5 {
       
       F5iterate_grids(path, NULL, grid_iterator, this, NULL, NULL);
       
-#warning "TODO: synchronise all read grid functions"
+      // TODO: synchronise all read grid functions
     }
   
     void read_grid(F5Path *const path)
@@ -191,8 +191,8 @@ namespace CarpetIOF5 {
       cout << indent << "field=" << fieldname << "\n";
       
       interpret_fieldname(cctkGH, fieldname, varindex);
-#warning "TODO: check all variables in the group"
-#warning "TODO: loop over all variables in the group"
+      // TODO: check all variables in the group
+      // TODO: loop over all variables in the group
       if (varindex>=0 and input_var.at(varindex)) {
 
         int major_version, minor_version, release_version;
@@ -205,7 +205,9 @@ namespace CarpetIOF5 {
         assert(iret);
         
         // Do we need to iterate over fragments?
-#warning "TODO: Should instead check whether attribute FIBER_HDF5_TYPEID_ATTRIB exists (existence indicates fragmentation)"
+        // TODO: Should instead check whether attribute
+        // FIBER_HDF5_TYPEID_ATTRIB exists (existence indicates
+        // fragmentation)
         int const is_fragmented = F5Fis_fragmented(path, fieldname);
         cout << indent
              << (is_fragmented ? "fragmented" : "not fragmented") << "\n";
@@ -221,8 +223,10 @@ namespace CarpetIOF5 {
         indent_t indent;
         cout << indent << "ignoring this field\n";
       }
-#warning "TODO: keep track of which fields have been read, and complain about unread ones"
-#warning "TODO: keep track of which part of a field has been read, and complain about unread parts"
+      // TODO: keep track of which fields have been read, and complain
+      // about unread ones
+      // TODO: keep track of which part of a field has been read, and
+      // complain about unread parts
     }
     
     void read_fragment(F5Path *const path)
@@ -440,7 +444,7 @@ namespace CarpetIOF5 {
       fragdesc.reflevel = reflevel;
       fragdesc.map = map;
       fragdesc.component = component;
-#warning "TODO: set timelevel correctly"
+      // TODO: set timelevel correctly
       fragdesc.timelevel = 0;
       fragdesc.imin = fbox.lower();
       fragdesc.imax = fbox.upper();
@@ -599,7 +603,7 @@ namespace CarpetIOF5 {
     // Grid structure
     string gs;
     ReadLargeAttribute(group, grid_structure, gs);
-#warning "TODO: set grid structure"
+    // TODO: set grid structure
     
     herr = H5Gclose(group);
     assert(not herr);
@@ -614,7 +618,7 @@ namespace CarpetIOF5 {
              bool const input_metadata,
              scatter_t& scatter)
   {
-#warning "TODO: not yet implemented"
+    // TODO: not yet implemented
     assert (not input_metadata);
     input_iterator_t iterator(cctkGH, input_var,
                               input_past_timelevels, input_metadata,
diff --git a/CarpetDev/CarpetIOF5/src/iof5.cc b/CarpetDev/CarpetIOF5/src/iof5.cc
index 01033b24b..c9ebb028f 100644
--- a/CarpetDev/CarpetIOF5/src/iof5.cc
+++ b/CarpetDev/CarpetIOF5/src/iof5.cc
@@ -474,7 +474,8 @@ namespace CarpetIOF5 {
       // Keep track of which files could be read, and which could not
       int foundproc = -1, notfoundproc = -1;
       
-#warning "TODO: Store how many processes contributed to the output, and expect exactly that many files"
+      // TODO: Store how many processes contributed to the output, and
+      // expect exactly that many files
       int const myproc = CCTK_MyProc(cctkGH);
       int const nprocs = CCTK_nProcs(cctkGH);
       // Loop over all (possible) files
@@ -501,7 +502,7 @@ namespace CarpetIOF5 {
         
         // Iterate over all time slices
         bool const input_past_timelevels = in_recovery;
-#warning "TODO: read metadata when recoverying parameters"
+        // TODO: read metadata when recoverying parameters
         bool const input_metadata = false;
         input(cctkGH, file, input_var, input_past_timelevels, input_metadata,
               scatter);
diff --git a/CarpetDev/CarpetIOF5/src/output.cc b/CarpetDev/CarpetIOF5/src/output.cc
index 6b7d95b30..c0e8436dd 100644
--- a/CarpetDev/CarpetIOF5/src/output.cc
+++ b/CarpetDev/CarpetIOF5/src/output.cc
@@ -148,7 +148,8 @@ namespace CarpetIOF5 {
           imin[d] = 0;
           imax[d] = lssh[d];
           if (not output_ghost_points) {
-#warning "TODO: Don't output ghosts on refinement boundaries; only output ghosts for inter-process boundaries"
+            // TODO: Don't output ghosts on refinement boundaries;
+            // only output ghosts for inter-process boundaries
             int const overlap = min(ughosts[d], minimum_component_overlap);
             imin[d] += lghosts[d];
             imax[d] -= ughosts[d] - overlap;
@@ -241,7 +242,7 @@ namespace CarpetIOF5 {
         int const do_every =
           group_type == CCTK_GF ? maxtimereflevelfact / timereffacts.AT(rl) : 1;
         if (cctkGH->cctk_iteration % do_every == 0) {
-#warning "TODO: don't switch modes"
+          // TODO: don't switch modes
           ENTER_LEVEL_MODE(cctkGH, rl) {
             DECLARE_CCTK_ARGUMENTS;
             
@@ -264,7 +265,9 @@ namespace CarpetIOF5 {
                   (file, cctk_time, gridname.c_str(), &v2h(reffact)[0],
                    chartname.c_str());
                 assert(globalpath);
-#warning "TODO: Probably must not call this for cell-centred AMR; this probably makes the call to F5Rcreate_coordinate_topology below fail"
+                // TODO: Probably must not call this for cell-centred
+                // AMR; this probably makes the call to
+                // F5Rcreate_coordinate_topology below fail
                 FAILWARN(F5Rlink_default_vertex_topology(globalpath,
                                                          &v2h(reffact)[0]));
                 
@@ -336,7 +339,7 @@ namespace CarpetIOF5 {
                                           topologyname.c_str(),
                                           indexdepth,
                                           mi.dim, mi.dim, &v2h(reffact)[0]);
-#warning "TODO: how should these two topologies be linked?"
+          // TODO: how should these two topologies be linked?
           // assert(mi.dim == 3);
           // assert(all(reffact == 1));
           // path =
@@ -358,7 +361,8 @@ namespace CarpetIOF5 {
       assert(coordpath);
       assert(path);
       
-#warning "TODO: Attach the number of I/O processes to the topology. WB sent email with suggestions."
+      // TODO: Attach the number of I/O processes to the topology. WB
+      // sent email with suggestions.
       
       // Define default topology (once per grid)
       if (group_type == CCTK_GF and reflevel == 0 and timelevel == 0) {
@@ -440,7 +444,7 @@ namespace CarpetIOF5 {
                                  mi.dim, &v2h(mi.gsh)[0],
                                  type,
                                  &vlower, &vdelta));
-#warning "TODO: path and chart don't match"
+        // TODO: path and chart don't match
         FAILWARN(F5Fset_range(path, &vlower, &vupper));
       }
       
@@ -545,8 +549,9 @@ namespace CarpetIOF5 {
       
       assert(groupdata.stagtype == 0);
       
-#warning "TODO: Do not output symmetry zones (unless requested by the user)"
-#warning "TODO: Do not output buffer zones (is that easily possible?)"
+      // TODO: Do not output symmetry zones (unless requested by the
+      // user)
+      // TODO: Do not output buffer zones (is that easily possible?)
       
       int const will_cover_complete_domain =
         (group_type != CCTK_GF or not is_multipatch) and reflevel==0;
diff --git a/CarpetDev/CarpetIOF5_standalone/src/IOF5.cc b/CarpetDev/CarpetIOF5_standalone/src/IOF5.cc
index 1173f5228..7cbd5c9d5 100644
--- a/CarpetDev/CarpetIOF5_standalone/src/IOF5.cc
+++ b/CarpetDev/CarpetIOF5_standalone/src/IOF5.cc
@@ -467,7 +467,8 @@ namespace CarpetIOF5 {
     }
     {
       writer_t writer (cctkGH, variable);
-#warning "TODO: handle the case where not all processors are writing to their own file"
+      // TODO: handle the case where not all processors are writing to
+      // their own file
       assert (proc == output_processor);
       assert (file);
       writer.write (* file);
diff --git a/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc b/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc
index e030c08a9..b8d3041cc 100644
--- a/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc
+++ b/CarpetDev/CarpetIOF5_standalone/src/coordinate_system.cc
@@ -125,7 +125,7 @@ namespace CarpetIOF5 {
         = open_or_create_group (m_topology.get_hdf5_topology(), name);
       assert (m_hdf5_coordinate_system >= 0);
       
-#warning "TODO: don't output coordinates as attributes"
+      // TODO: don't output coordinates as attributes
       write_or_check_attribute
         (m_hdf5_coordinate_system, "origin", m_level_origin);
       write_or_check_attribute
diff --git a/CarpetDev/CarpetIOF5_standalone/src/f5writer.cc b/CarpetDev/CarpetIOF5_standalone/src/f5writer.cc
index b351c7391..cc9c7001f 100644
--- a/CarpetDev/CarpetIOF5_standalone/src/f5writer.cc
+++ b/CarpetDev/CarpetIOF5_standalone/src/f5writer.cc
@@ -251,7 +251,7 @@ namespace CarpetIOF5 {
                                                    rootlevel_refinement);
     }
     
-#warning "TODO: what is this doing?"
+    // TODO: what is this doing?
     F5T_REFINEMENT3D_POINT = refinement_path->myChart->Point_hid_t; 
     
     if (Carpet::is_level_mode())
@@ -303,7 +303,7 @@ namespace CarpetIOF5 {
     // assert (group >= 0 and group < CCTK_NumGroups());
     // F5::physical_quantity_t physical_quantity (coordinate_system, group);
     
-#warning "TODO: this should depend on the patch number"
+    // TODO: this should depend on the patch number
     char const * const coordinate_system = NULL;
     
     // Depends on the refinement level
@@ -326,7 +326,7 @@ namespace CarpetIOF5 {
     // Global information for this refinement level 
     vect <hsize_t, dim> const level_dims
       = vect <int, dim>::ref (m_cctkGH->cctk_gsh);
-#warning "TODO: switch to double precision"
+    // TODO: switch to double precision
     vect <float, dim> const level_min
       (CCTK_ORIGIN_SPACE(0), CCTK_ORIGIN_SPACE(1), CCTK_ORIGIN_SPACE(2));
     vect <float, dim> const level_spacing
@@ -419,7 +419,8 @@ namespace CarpetIOF5 {
   {
     DECLARE_CCTK_PARAMETERS;
     
-#warning "TODO: use superregions instead of regions (?  only if the regions are on the same processor?); use HDF5 chunks as well"
+    // TODO: use superregions instead of regions (? only if the
+    // regions are on the same processor?); use HDF5 chunks as well
     
     bbox<int,dim> dh::dboxes::* boxptr;
     if (CCTK_EQUALS (output_regions, "exterior"))
diff --git a/CarpetDev/CarpetIOF5_standalone/src/tensor_component.cc b/CarpetDev/CarpetIOF5_standalone/src/tensor_component.cc
index 6cd2b6486..3613688e7 100644
--- a/CarpetDev/CarpetIOF5_standalone/src/tensor_component.cc
+++ b/CarpetDev/CarpetIOF5_standalone/src/tensor_component.cc
@@ -120,7 +120,9 @@ namespace CarpetIOF5 {
     
     
     
-#warning "TODO: This assumes that the shape of data is the same as the shape of the region; this may not be so if not all of the data are written out"
+    // TODO: This assumes that the shape of data is the same as the
+    // shape of the region; this may not be so if not all of the data
+    // are written out
     void tensor_component_t::
     write (void const * const data,
            int const cactus_datatype)
diff --git a/CarpetDev/CarpetJacobi/src/Jacobi.cc b/CarpetDev/CarpetJacobi/src/Jacobi.cc
index 5c33e7bc5..4288f82e8 100644
--- a/CarpetDev/CarpetJacobi/src/Jacobi.cc
+++ b/CarpetDev/CarpetJacobi/src/Jacobi.cc
@@ -190,7 +190,7 @@ namespace CarpetJacobi {
       return -1;
     }
     
-#warning "TODO: assert that all levels are at the same time"
+    // TODO: assert that all levels are at the same time
     
     // Switch to global mode
     BEGIN_GLOBAL_MODE(cctkGH) {
@@ -430,7 +430,7 @@ namespace CarpetJacobi {
             norm_counts.at(reflevel) = reduce_out[0];
             norm_l2s.at(reflevel) = reduce_out[1];
             
-#warning "TODO"
+            // TODO
 #if 0
             CCTK_OutputVarAs (cctkGH, "WaveToyFO::phi", "phi-ell");
             CCTK_OutputVarAs (cctkGH, "IDSWTEsimpleFO::residual", "residual-ell");
@@ -556,7 +556,7 @@ namespace CarpetJacobi {
       
       
       // Reset the initial time
-#warning "TODO: reset the initial time a bit more intelligently"
+      // TODO: reset the initial time a bit more intelligently
       global_time = 0;
       delta_time = 1;
       * const_cast<CCTK_REAL *> (& cctkGH->cctk_time) = global_time;
diff --git a/CarpetDev/CarpetMG/src/mg.cc b/CarpetDev/CarpetMG/src/mg.cc
index 07e889e02..75047efa2 100644
--- a/CarpetDev/CarpetMG/src/mg.cc
+++ b/CarpetDev/CarpetMG/src/mg.cc
@@ -621,7 +621,7 @@ namespace CarpetMG {
           leave_level_mode (const_cast<cGH *>(cctkGH));
         } END_GLOBAL_MODE;
             
-#warning "TODO"
+        // TODO
         // save old solution
         copy (cctkGH, sav, var, options);