[GRASS-SVN] r33097 - grass/branches/develbranch_6/raster/r.terraflow

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Aug 26 14:27:16 EDT 2008


Author: neteler
Date: 2008-08-26 14:27:16 -0400 (Tue, 26 Aug 2008)
New Revision: 33097

Modified:
   grass/branches/develbranch_6/raster/r.terraflow/sweep.cc
Log:
ltoma: commented out printing a warning when tci is negative (merge from trunk, r33094)

Modified: grass/branches/develbranch_6/raster/r.terraflow/sweep.cc
===================================================================
--- grass/branches/develbranch_6/raster/r.terraflow/sweep.cc	2008-08-26 17:50:11 UTC (rev 33096)
+++ grass/branches/develbranch_6/raster/r.terraflow/sweep.cc	2008-08-26 18:27:16 UTC (rev 33097)
@@ -117,10 +117,12 @@
 #ifdef OUTPUT_TCI
     correct_tci = log(flow.get()*weight.dx()*weight.dy()/weight.totalContour());
     /* assert(correct_tci > 0); //is this true? */
-    if (correct_tci < 0) {
-      fprintf(stderr, "warning: tci negative, [flow=%f,dx=%f,dy=%f,cont=%f]\n",
-	      flow.get(), weight.dx(), weight.dy(), weight.totalContour());
-    }
+    /* there is no need for this warning. tci can be negative if the flow is small. */
+    /* if (correct_tci < 0) {
+       fprintf(stderr, "warning: tci negative, [flow=%f,dx=%f,dy=%f,cont=%f]\n",
+       flow.get(), weight.dx(), weight.dy(), weight.totalContour());
+       }
+    */
     tci = (tci_type)correct_tci;
 #endif
   }



More information about the grass-commit mailing list