[GRASS-SVN] r30268 - grass/trunk/raster/simwe/r.sim.sediment
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Feb 20 11:24:57 EST 2008
Author: helena
Date: 2008-02-20 11:24:57 -0500 (Wed, 20 Feb 2008)
New Revision: 30268
Modified:
grass/trunk/raster/simwe/r.sim.sediment/waterglobs.h
Log:
synchronize with simlib and water
Modified: grass/trunk/raster/simwe/r.sim.sediment/waterglobs.h
===================================================================
--- grass/trunk/raster/simwe/r.sim.sediment/waterglobs.h 2008-02-20 16:23:55 UTC (rev 30267)
+++ grass/trunk/raster/simwe/r.sim.sediment/waterglobs.h 2008-02-20 16:24:57 UTC (rev 30268)
@@ -20,7 +20,8 @@
char *err;
char *outwalk;
char *mapset;
-char *mscale;
+
+/* Flag*/
char *tserie;
char *wdepth;
@@ -33,16 +34,21 @@
char *flux;
char *erdep;
+/*New Input val*/
+char *rainval;
+char *maninval;
+char *infilval;
+
struct
{
struct Option *elevin,*dxin,*dyin,*rain,*infil,*traps,*manin,*sfile,*depth,*disch,*err,
*outwalk,*nwalk,*niter,*outiter,*density,*diffc,*hmax,*halpha,*hbeta,*wdepth,
-*detin,*tranin,*tauin,*tc,*et,*conc,*flux,*erdep;
+*detin,*tranin,*tauin,*tc,*et,*conc,*flux,*erdep,*rainval,*maninval,*infilval;
} parm;
struct
{
- struct Flag *mscale, *tserie;
+ struct Flag *tserie;
} flag;
@@ -82,7 +88,7 @@
int mx, my;
int mx2, my2;
-double bxmi,bymi,bxma,byma,bresx,bresy;
+/*double bxmi,bymi,bxma,byma,bresx,bresy;*/
int maxwab;
double step,conv;
@@ -112,6 +118,11 @@
int miter,nwalka,lwwfin;
double timec;
int ts, timesec;
+
+double rain_val;
+double manin_val;
+double infil_val;
+
#else
extern FILE *fdelevin, *fddxin, *fddyin, *fdrain, *fdinfil, *fdtraps, *fdmanin, *fddepth, *fddisch, *fderr, *fdoutwalk,*fdwalkers;
extern FILE *fdwdepth,*fddetin,*fdtranin,*fdtauin, *fdtc, *fdet, *fdconc, *fdflux,*fderdep;
@@ -130,7 +141,6 @@
extern char *err;
extern char *outwalk;
extern char *mapset;
-extern char *mscale;
extern char *tserie;
extern char *wdepth;
@@ -143,17 +153,20 @@
extern char *flux;
extern char *erdep;
+extern char *rainval;
+extern char *maninval;
+extern char *infilval;
extern struct
{
struct Option *elevin,*dxin,*dyin,*rain,*infil,*traps,*manin,*sfile,*depth,*disch,*err,
*outwalk,*nwalk,*niter,*outiter,*density,*diffc,*hmax,*halpha,*hbeta,*wdepth,
-*detin,*tranin,*tauin,*tc,*et,*conc,*flux,*erdep;
+*detin,*tranin,*tauin,*tc,*et,*conc,*flux,*erdep,*rainval,*maninval,*infilval;
} parm;
extern struct
{
- struct Flag *mscale, *tserie;
+ struct Flag *tserie;
} flag;
@@ -194,7 +207,7 @@
extern int mx, my;
extern int mx2, my2;
-extern double bxmi,bymi,bxma,byma,bresx,bresy;
+/*extern double bxmi,bymi,bxma,byma,bresx,bresy;*/
extern int maxwab;
extern double step,conv;
@@ -224,4 +237,8 @@
extern int miter,nwalka,lwwfin;
extern double timec;
extern int ts, timesec;
+
+extern double rain_val;
+extern double manin_val;
+extern double infil_val;
#endif
More information about the grass-commit
mailing list