[GRASS-SVN] r34214 - grass/branches/develbranch_6/raster/simwe/r.sim.sediment

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Nov 9 19:29:28 EST 2008


Author: helena
Date: 2008-11-09 19:29:28 -0500 (Sun, 09 Nov 2008)
New Revision: 34214

Modified:
   grass/branches/develbranch_6/raster/simwe/r.sim.sediment/main.c
Log:
old site related code commented out (merge from trunk 34076)

Modified: grass/branches/develbranch_6/raster/simwe/r.sim.sediment/main.c
===================================================================
--- grass/branches/develbranch_6/raster/simwe/r.sim.sediment/main.c	2008-11-10 00:21:26 UTC (rev 34213)
+++ grass/branches/develbranch_6/raster/simwe/r.sim.sediment/main.c	2008-11-10 00:29:28 UTC (rev 34214)
@@ -73,7 +73,7 @@
 #include <grass/Vect.h>
 #include <grass/linkm.h>
 #include <grass/bitmap.h>
-#include <grass/site.h>
+/*#include <grass/site.h> */
 #include <grass/glocale.h>
 
 /********************************/
@@ -165,13 +165,14 @@
     parm.maninval->description = _("Name of the Mannings n value");
     parm.maninval->guisection = _("Input_options");
 
-    /* needs to be updated to GRASS 6 vector format !! */
+    /* needs to be updated to GRASS 6 vector format !! 
     parm.sfile = G_define_standard_option(G_OPT_V_INPUT);
     parm.sfile->key = "vector";
     parm.sfile->required = NO;
     parm.sfile->description =
 	_("Name of the sampling locations vector points map");
     parm.sfile->guisection = _("Input_options");
+*/
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.tc->key = "tc";
@@ -230,6 +231,7 @@
 	_("Time interval for creating output maps [minutes]");
     parm.outiter->guisection = _("Parameters");
 
+/*
     parm.density = G_define_option();
     parm.density->key = "density";
     parm.density->type = TYPE_INTEGER;
@@ -237,6 +239,7 @@
     parm.density->required = NO;
     parm.density->description = _("Density of output walkers");
     parm.density->guisection = _("Parameters");
+*/
 
     parm.diffc = G_define_option();
     parm.diffc->key = "diffc";
@@ -311,12 +314,12 @@
     conc = parm.conc->answer;
     flux = parm.flux->answer;
     erdep = parm.erdep->answer;
-    sfile = parm.sfile->answer;
+/*    sfile = parm.sfile->answer; */
 
     /*      sscanf(parm.nwalk->answer, "%d", &maxwa); */
     sscanf(parm.niter->answer, "%d", &timesec);
     sscanf(parm.outiter->answer, "%d", &iterout);
-    sscanf(parm.density->answer, "%d", &ldemo);
+/*    sscanf(parm.density->answer, "%d", &ldemo); */
     sscanf(parm.diffc->answer, "%lf", &frac);
     sscanf(parm.maninval->answer, "%lf", &manin_val);
 
@@ -414,11 +417,13 @@
 	    G_fatal_error(_("Cannot write raster maps"));
     }
 
+/*
     if (fdwalkers != NULL)
 	fclose(fdwalkers);
 
     if (sfile != NULL)
 	G_sites_close(fw);
+*/
     /* Exit with Success */
     exit(EXIT_SUCCESS);
 }



More information about the grass-commit mailing list