[GRASS-SVN] r41795 - in grass/trunk/raster: r.topmodel r.watershed/front r.watershed/ram

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-10 16:39:51 -0400 (Sat, 10 Apr 2010)
New Revision: 41795

Modified:
   grass/trunk/raster/r.topmodel/main.c
   grass/trunk/raster/r.watershed/front/main.c
   grass/trunk/raster/r.watershed/ram/init_vars.c
   grass/trunk/raster/r.watershed/ram/usage.c
Log:
delevation rename to depression


Modified: grass/trunk/raster/r.topmodel/main.c
===================================================================
--- grass/trunk/raster/r.topmodel/main.c	2010-04-10 20:23:28 UTC (rev 41794)
+++ grass/trunk/raster/r.topmodel/main.c	2010-04-10 20:39:51 UTC (rev 41795)
@@ -79,7 +79,7 @@
     param.basin->guisection = _("Input");
 
     param.fill = G_define_standard_option(G_OPT_R_OUTPUT);
-    param.fill->key = "delevation_output";
+    param.fill->key = "depression_output";
     param.fill->description = _("Name for output depressionless elevation raster map");
     param.fill->required = NO;
     param.fill->guisection = _("Output");
@@ -92,7 +92,7 @@
     param.dir->guisection = _("Output");
 
     param.belev = G_define_standard_option(G_OPT_R_OUTPUT);
-    param.belev->key = "belevation_output";
+    param.belev->key = "basin_output";
     param.belev->label = _("Name for output basin elevation raster map (o/i)");
     param.belev->description = _("MASK applied");
     param.belev->required = NO;

Modified: grass/trunk/raster/r.watershed/front/main.c
===================================================================
--- grass/trunk/raster/r.watershed/front/main.c	2010-04-10 20:23:28 UTC (rev 41794)
+++ grass/trunk/raster/r.watershed/front/main.c	2010-04-10 20:39:51 UTC (rev 41795)
@@ -75,7 +75,7 @@
     opt1->key = "elevation_input";
 
     opt2 = G_define_standard_option(G_OPT_R_INPUT);
-    opt2->key = "delevation_input";
+    opt2->key = "depression_input";
     opt2->label = _("Name of input depressions raster map");
     opt2->description = _("All non-NULL and non-zero cells are considered as real depressions");
     opt2->required = NO;

Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c	2010-04-10 20:23:28 UTC (rev 41794)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c	2010-04-10 20:39:51 UTC (rev 41795)
@@ -42,7 +42,7 @@
 	    wat_flag++;
 	else if (sscanf(argv[r], "drainage_output=%s", asp_name) == 1)
 	    asp_flag++;
-	else if (sscanf(argv[r], "delevation_input=%s", pit_name) == 1)
+	else if (sscanf(argv[r], "depression_input=%s", pit_name) == 1)
 	    pit_flag++;
 	else if (sscanf(argv[r], "threshold=%d", &bas_thres) == 1) ;
 	else if (sscanf(argv[r], "slope_length_output=%lf", &max_length) == 1) ;

Modified: grass/trunk/raster/r.watershed/ram/usage.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/usage.c	2010-04-10 20:23:28 UTC (rev 41794)
+++ grass/trunk/raster/r.watershed/ram/usage.c	2010-04-10 20:39:51 UTC (rev 41795)
@@ -8,19 +8,19 @@
 {
     G_fatal_error(_("USAGE for basin delineation:\n\n%s -4 elevation_input=elevation_map "
 		    "threshold=swale_threshold [flow_input=overland_flow_map] "
-		    "[drainage_output=drain_direction_map] [delevation_input=depression_map] "
+		    "[drainage_output=drain_direction_map] [depression_input=depression_map] "
 		    "[accumulation_output=accumulation_map] [basin_output=watershed_basin_map] "
 		    "[stream_output=stream_segment_map]\n\n"
 		    "USAGE for slope length determination:\n\n%s [-4] "
 		    "elevation_input=elevation_map threshold=swale_threshold "
-		    "[drainage_output=drain_direction_map] [delevation_input=depression_map] "
+		    "[drainage_output=drain_direction_map] [depression_input=depression_map] "
 		    "[accumulation_output=accumulation_map] [slope_length_output=max_slope_length] "
 		    "[block_input=overland_blocking_map] [slope_steep_output=slope_steepness_map] "
 		    "length_slope=length_slope_map [land_input=rill_erosion_map] "
 		    "[slope_deposition=slope_deposition value or map]\n\n"
 		    "USAGE for ARMSED FILE creation:\n\n%s [-4] elevation_input=elevation_map "
 		    "threshold=swale_threshold [flow_input=overland_flow_map] "
-		    "[drainage_output=drain_direction_map] [delevation_input=depression_map] "
+		    "[drainage_output=drain_direction_map] [depression_input=depression_map] "
 		    "[accumulation_output=accumulation_map] [basin_output=watershed_basin_map] "
 		    "[stream_output=stream_segment_map] [half_basin_output=half_basin_map] "
 		    "ar=ARMSED_file_name\n\n"), G_program_name(), G_program_name(), G_program_name());