[GRASS-SVN] r44993 - grass/trunk/imagery/i.evapo.time

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jan 12 11:18:47 EST 2011


Author: martinl
Date: 2011-01-12 08:18:47 -0800 (Wed, 12 Jan 2011)
New Revision: 44993

Added:
   grass/trunk/imagery/i.evapo.time/i.evapo.time.html
Removed:
   grass/trunk/imagery/i.evapo.time/i.evapo.time_integration.html
Modified:
   grass/trunk/imagery/i.evapo.time/Makefile
   grass/trunk/imagery/i.evapo.time/main.c
Log:
i.evapo.time_integration renamed to i.evapo.time


Modified: grass/trunk/imagery/i.evapo.time/Makefile
===================================================================
--- grass/trunk/imagery/i.evapo.time/Makefile	2011-01-12 16:16:10 UTC (rev 44992)
+++ grass/trunk/imagery/i.evapo.time/Makefile	2011-01-12 16:18:47 UTC (rev 44993)
@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-PGM = i.evapo.time_integration
+PGM = i.evapo.time
 
 LIBES = $(RASTERLIB) $(GISLIB)
 DEPENDENCIES = $(RASTERDEP) $(GISDEP)

Copied: grass/trunk/imagery/i.evapo.time/i.evapo.time.html (from rev 44987, grass/trunk/imagery/i.evapo.time/i.evapo.time_integration.html)
===================================================================
--- grass/trunk/imagery/i.evapo.time/i.evapo.time.html	                        (rev 0)
+++ grass/trunk/imagery/i.evapo.time/i.evapo.time.html	2011-01-12 16:18:47 UTC (rev 44993)
@@ -0,0 +1,58 @@
+<H2>DESCRIPTION</H2>
+
+<EM>i.evapo.time_integration</EM> integrates ETa in time following a reference ET (typically) from a set of meteorological stations dataset.
+
+Inputs:
+- ETa images
+- ETa images DOY (Day of Year)
+- ETo images
+- ETo DOYmin as a single value 
+
+Method:
+1 - each ETa pixel is divided by the same day ETo and become ETrF
+2 - each ETrF pixel is multiplied by the ETo sum for the representative days
+3 - Sum all n temporal [ETrF*ETo_sum] pixels to make a summed(ET) in [DOYmin;DOYmax]
+
+representative days calculation:
+let assume i belongs to range [DOYmin;DOYmax]
+
+DOYbeforeETa[i] = ( DOYofETa[i] - DOYofETa[i-1] ) / 2
+DOYafterETa[i] = ( DOYofETa[i+1] - DOYofETa[i] ) / 2
+
+
+<H2>NOTES</H2>
+
+ETo images preparation:
+If you only have one meteorological station data, the easiest way is:
+
+n=0
+for ETo_val in Eto[1] Eto[2] ...
+do
+	r.mapcalc "eto$n = $ETo_val" 
+	`expr n = n + 1'
+done
+
+with Eto[1], Eto[2], etc being a simple copy and paste from your data file of all ETo values separated by an empty space from each other.
+
+If you have several meteorological stations data, then you need to grid them, Thiessen polygons or interpolation for each day.
+
+For multi-year calculations, just continue incrementing DOY values above 366, it will continue working, up to maximum input of 400 satellite images.
+
+<H2>TODO</H2>
+
+<H2>SEE ALSO</H2>
+
+<em>
+<A HREF="i.eb.eta.html">i.eb.eta</A><br>
+<A HREF="i.evapo.potrad.html">i.evapo.potrad</A><br>
+<A HREF="i.evapo.SENAY.html">i.evapo.SENAY</A><br>
+<A HREF="r.surf.idw.html">r.surf.idw</A><br>
+<A HREF="r.surf.idw2.html">r.surf.idw2</A><br>
+<A HREF="r.bilinear.html">r.bilinear</A><br>
+</em>
+
+
+<H2>AUTHORS</H2>
+Yann Chemin, International Rice Research Institute, The Philippines<BR>
+<p>
+<i>Last changed: $Date: 2008/08/25 06:17:43 $</i>

Deleted: grass/trunk/imagery/i.evapo.time/i.evapo.time_integration.html
===================================================================
--- grass/trunk/imagery/i.evapo.time/i.evapo.time_integration.html	2011-01-12 16:16:10 UTC (rev 44992)
+++ grass/trunk/imagery/i.evapo.time/i.evapo.time_integration.html	2011-01-12 16:18:47 UTC (rev 44993)
@@ -1,58 +0,0 @@
-<H2>DESCRIPTION</H2>
-
-<EM>i.evapo.time_integration</EM> integrates ETa in time following a reference ET (typically) from a set of meteorological stations dataset.
-
-Inputs:
-- ETa images
-- ETa images DOY (Day of Year)
-- ETo images
-- ETo DOYmin as a single value 
-
-Method:
-1 - each ETa pixel is divided by the same day ETo and become ETrF
-2 - each ETrF pixel is multiplied by the ETo sum for the representative days
-3 - Sum all n temporal [ETrF*ETo_sum] pixels to make a summed(ET) in [DOYmin;DOYmax]
-
-representative days calculation:
-let assume i belongs to range [DOYmin;DOYmax]
-
-DOYbeforeETa[i] = ( DOYofETa[i] - DOYofETa[i-1] ) / 2
-DOYafterETa[i] = ( DOYofETa[i+1] - DOYofETa[i] ) / 2
-
-
-<H2>NOTES</H2>
-
-ETo images preparation:
-If you only have one meteorological station data, the easiest way is:
-
-n=0
-for ETo_val in Eto[1] Eto[2] ...
-do
-	r.mapcalc "eto$n = $ETo_val" 
-	`expr n = n + 1'
-done
-
-with Eto[1], Eto[2], etc being a simple copy and paste from your data file of all ETo values separated by an empty space from each other.
-
-If you have several meteorological stations data, then you need to grid them, Thiessen polygons or interpolation for each day.
-
-For multi-year calculations, just continue incrementing DOY values above 366, it will continue working, up to maximum input of 400 satellite images.
-
-<H2>TODO</H2>
-
-<H2>SEE ALSO</H2>
-
-<em>
-<A HREF="i.eb.eta.html">i.eb.eta</A><br>
-<A HREF="i.evapo.potrad.html">i.evapo.potrad</A><br>
-<A HREF="i.evapo.SENAY.html">i.evapo.SENAY</A><br>
-<A HREF="r.surf.idw.html">r.surf.idw</A><br>
-<A HREF="r.surf.idw2.html">r.surf.idw2</A><br>
-<A HREF="r.bilinear.html">r.bilinear</A><br>
-</em>
-
-
-<H2>AUTHORS</H2>
-Yann Chemin, International Rice Research Institute, The Philippines<BR>
-<p>
-<i>Last changed: $Date: 2008/08/25 06:17:43 $</i>

Modified: grass/trunk/imagery/i.evapo.time/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time/main.c	2011-01-12 16:16:10 UTC (rev 44992)
+++ grass/trunk/imagery/i.evapo.time/main.c	2011-01-12 16:18:47 UTC (rev 44993)
@@ -1,13 +1,13 @@
 
 /****************************************************************************
  *
- * MODULE:       i.evapo.time_integration
+ * MODULE:       i.evapo.time
  * AUTHOR(S):    Yann Chemin - yann.chemin at gmail.com
  * 		 Ines Cherif - icherif at yahoo.com
  * PURPOSE:      Integrate in time the evapotranspiration from satellite,
  *		 following a daily pattern from meteorological ETo.
  *
- * COPYRIGHT:    (C) 2008-2009 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2008-2009, 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU Lesser General Public
  *   	    	 License. Read the file COPYING that comes with GRASS for details.
@@ -74,14 +74,12 @@
     G_gisinit(argv[0]);
 
     module = G_define_module();
-    module->description =_("Computes temporal integration of satellite "
-			   "ET actual (ETa) following the daily ET reference "
-			   "(ETo) from meteorological station(s)");
     G_add_keyword(_("imagery"));
     G_add_keyword(_("evapotranspiration"));
-    G_add_keyword(_("temporal"));
-    G_add_keyword(_("integration"));
-
+    module->description =_("Computes temporal integration of satellite "
+			   "ET actual (ETa) following the daily ET reference "
+			   "(ETo) from meteorological station(s).");
+    
     /* Define the different options */
     input = G_define_standard_option(G_OPT_R_INPUTS);
     input->key = "eta";



More information about the grass-commit mailing list