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

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-02-19 04:25:46 -0800 (Tue, 19 Feb 2013)
New Revision: 55119

Modified:
   grass/trunk/raster/r.terraflow/main.cpp
Log:
r.terraflow: do not define default answer for d8cut


Modified: grass/trunk/raster/r.terraflow/main.cpp
===================================================================
--- grass/trunk/raster/r.terraflow/main.cpp	2013-02-18 22:43:25 UTC (rev 55118)
+++ grass/trunk/raster/r.terraflow/main.cpp	2013-02-19 12:25:46 UTC (rev 55119)
@@ -110,11 +110,10 @@
   d8cut->key  = "d8cut";
   d8cut->type = TYPE_DOUBLE;
   d8cut->required = NO;
-  d8cut->answer = G_store("infinity"); /* default value */
   d8cut->label = _("Routing using SFD (D8) direction");
   d8cut->description = 
     _("If flow accumulation is larger than this value it is routed using "
-      "SFD (D8) direction (meaningfull only  for MFD flow)");
+      "SFD (D8) direction (meaningfull only  for MFD flow). No answer for infinity.");
   
   /* main memory */
   struct Option *mem;
@@ -122,7 +121,7 @@
   mem->key         = "memory";
   mem->type        = TYPE_INTEGER;
   mem->required    = NO;
-  mem->answer      = G_store("300"); /* 300MB default value */
+  mem->answer      = "300"; /* 300MB default value */
   mem->description = _("Maximum runtime memory size (in MB)");
 
   /* temporary STREAM path */
@@ -160,7 +159,7 @@
 #endif
 
   opt->d8 = sfd_flag->answer;
-  if (strcmp(d8cut->answer, "infinity") == 0) {
+  if (!d8cut->answer) {
     opt->d8cut = MAX_ACCU;
   } else {
     opt->d8cut = atof(d8cut->answer);