[GRASS-SVN] r36632 - grass/trunk/raster/r.terraflow

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-04-08 10:42:08 -0400 (Wed, 08 Apr 2009)
New Revision: 36632

Modified:
   grass/trunk/raster/r.terraflow/main.cc
Log:
don't harcode /var/tmp/, fixes trac #520

Modified: grass/trunk/raster/r.terraflow/main.cc
===================================================================
--- grass/trunk/raster/r.terraflow/main.cc	2009-04-08 13:12:48 UTC (rev 36631)
+++ grass/trunk/raster/r.terraflow/main.cc	2009-04-08 14:42:08 UTC (rev 36632)
@@ -54,7 +54,7 @@
 /* #define JUMP2FLOW */
 /* define it only if you want to skip the flow direction computation
    and jump directly to computing flow accumulation; the flowstream
-   must exist in /var/tmp/flowStream */
+   must exist in /STREAM_DIR/flowStream */
 
 
 /* ---------------------------------------------------------------------- */
@@ -130,7 +130,7 @@
   streamdir->key        = "stream_dir";
   streamdir->type       = TYPE_STRING;
   streamdir->required   = NO;
-  streamdir->answer     = G_store("/var/tmp"); 
+  streamdir->answer     = G_store("/var/tmp/");
   streamdir->description=
      _("Directory to hold temporary files (they can be large)");
 
@@ -558,7 +558,7 @@
   
 #else 
   AMI_STREAM<waterWindowBaseType> *flowStream;
-  flowStream = new AMI_STREAM<waterWindowBaseType>("/var/tmp/flowStream");
+  flowStream = new AMI_STREAM<waterWindowBaseType>(streamdir->answer);
   fprintf(stderr, "flowStream opened: len=%d\n", flowStream->stream_len());
   fprintf(stderr, "jumping to flow accumulation computation\n");
 #endif
@@ -586,7 +586,7 @@
   stats->recordTime("Total running time: ", rtTotal);
   stats->timestamp("end");
 
-  G_done_msg("");
+  G_done_msg(" ");
   
   /* free the globals */
   free(region);