[GRASS-SVN] r71204 - in grass/trunk: raster/r.series.accumulate temporal/t.rast.accumulate

Wed Jun 21 12:18:24 PDT 2017

Author: veroandreo
Date: 2017-06-21 12:18:24 -0700 (Wed, 21 Jun 2017)
New Revision: 71204

Modified:
   grass/trunk/raster/r.series.accumulate/r.series.accumulate.html
   grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
   grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
Log:
t.rast.accumulate and r.series.accumulate: manual enhancements and typos fixing

Modified: grass/trunk/raster/r.series.accumulate/r.series.accumulate.html
===================================================================

--- grass/trunk/raster/r.series.accumulate/r.series.accumulate.html	2017-06-21 14:10:21 UTC (rev 71203)
+++ grass/trunk/raster/r.series.accumulate/r.series.accumulate.html	2017-06-21 19:18:24 UTC (rev 71204)
@@ -46,7 +46,7 @@
     mean = average
 </pre></div>
 <p>
-For all formulas is <em>min</em> the minimum value, <em>max</em>
+For all the formulas <em>min</em> is the minimum value, <em>max</em>
 the maximum value and <em>average</em> the average value.
 The <em>min</em>, <em>max</em> and <em>average</em> values
 are automatically calculated from the input maps.

Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html	2017-06-21 14:10:21 UTC (rev 71203)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html	2017-06-21 19:18:24 UTC (rev 71204)
@@ -13,25 +13,25 @@
 <p>
 The <b>start</b> time and the <b>end</b> time of the accumulation 
 process must be set, eg. <b>start="2000-03-01" end="2011-01-01"</b>. In 
-addition a <b>cycle</b>, eg. <b>cycle="8 months"</b>, can be specified, 
-that defines after which time interval the accumulation process 
-restarts. The <b>offset</b> option specifies the time between two 
-cycles that should be skipped, eg. <b>offset="4 months"</b>.
+addition, a <b>cycle</b>, eg. <b>cycle="8 months"</b>, can be specified, 
+that defines after which interval of time the accumulation process 
+restarts. The <b>offset</b> option specifies the time that should be 
+skipped between two cycles, eg. <b>offset="4 months"</b>.
 
 <p>
 The <b>lower</b> and <b>upper</b> <b>limits</b> of the accumulation 
 process can be set, either by using space time raster datasets or by 
-using fixed values for all raster cells and time steps.  The raster 
-maps that specifies the lower and upper limits of the actual granule 
+using fixed values for all raster cells and time steps. The raster 
+maps that specify the lower and upper limits of the actual granule 
 will be detected using the following temporal relations: equals, 
-during, overlaps, overlapped and contains. First all maps with equal 
-time stamps to the current granule will be detected, the first lower 
-map and the first upper map that were found are used as limit 
-definitions. If no equal maps are found then maps with a temporal 
-during relation are detected, then maps that temporally overlap the 
-actual granules, until maps are detected that have a temporal contain 
-relation. If no maps are found or lower/upper STRDS are not defined, 
-then the <b>limits</b> option is used, eg. <b>limits=10,30</b>.
+during, overlaps, overlapped and contains. First, all maps with time 
+stamps equal to the current granule will be detected, the first lower 
+map and the first upper map found will be used as limit definitions. 
+If no equal maps are found, then maps with a temporal during relation 
+are detected, then maps that temporally overlap the actual granules, 
+until maps that have a temporal contain relation are detected. If no 
+maps are found or lower/upper STRDS are not defined, then the 
+<b>limits</b> option is used, eg. <b>limits=10,30</b>.
 
 <p>
 The <b>upper</b> <b>limit</b> is only used in the Biologically 
@@ -47,7 +47,7 @@
 <p>
 The <b>output</b> is a new space time raster dataset with the provided 
 start time, end time and granularity containing the accumulated raster 
-maps. The <b>base</b> name of of the generated maps must always be set. 
+maps. The <b>base</b> name of the generated maps must always be set. 
 The <b>output</b> space time raster dataset can then be analyzed using 
 <a href="t.rast.accdetect.html">t.rast.accdetect</a> to detect specific 
 accumulation patterns.

Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py	2017-06-21 14:10:21 UTC (rev 71203)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py	2017-06-21 19:18:24 UTC (rev 71204)
@@ -31,13 +31,13 @@
 
 #%option G_OPT_STRDS_INPUT
 #% key: lower
-#% description: Input space time raster dataset that defines the lower threshold, values lower this threshold are excluded from accumulation
+#% description: Input space time raster dataset that defines the lower threshold, values lower than this threshold are excluded from accumulation
 #% required: no
 #%end
 
 #%option G_OPT_STRDS_INPUT
 #% key: upper
-#% description: Input space time raster dataset that defines the upper threshold, values upper this threshold are excluded from accumulation
+#% description: Input space time raster dataset that defines the upper threshold, values higher than this threshold are excluded from accumulation
 #% required: no
 #%end
 
@@ -68,7 +68,7 @@
 #%option
 #% key: offset
 #% type: string
-#% description: The temporal offset to the begin of the next cycle, eg '6 months'
+#% description: The temporal offset to the beginning of the next cycle, eg '6 months'
 #% required: no
 #% multiple: no
 #%end
@@ -95,7 +95,7 @@
 #%option
 #% key: suffix
 #% type: string
-#% description: Suffix to add at basename: set 'gran' for granularity, 'time' for the full time format, 'num' for numerical suffix with a specific number of digits (default %05)
+#% description: Suffix to add to the basename. Set 'gran' for granularity, 'time' for the full time format, 'num' for numerical suffix with a specific number of digits (default %05)
 #% answer: gran
 #% required: no
 #% multiple: no
@@ -105,7 +105,7 @@
 #% key: limits
 #% type: double
 #% key_desc: lower,upper
-#% description: Use these limits in case lower and/or upper input  space time raster datasets are not defined or contain NULL values
+#% description: Use these limits in case lower and/or upper input space time raster datasets are not defined or contain NULL values
 #% required: yes
 #% multiple: no
 #%end

