[GRASS-SVN] r69530 - in grass/trunk: raster/r.mfilter raster/r.resamp.filter temporal/t.rast.aggregate temporal/t.rast.aggregate.ds

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-09-19 03:29:41 -0700 (Mon, 19 Sep 2016)
New Revision: 69530

Modified:
   grass/trunk/raster/r.mfilter/r.mfilter.html
   grass/trunk/raster/r.resamp.filter/r.resamp.filter.html
   grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
   grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
   grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.html
Log:
t.rast.aggregate, t.rast.aggregate.ds manual: examples updated as type option was confusingly defined; flag -s replaced by suffix option (contributed by veroandreo, Veronica Andreo); minor raster man update

Modified: grass/trunk/raster/r.mfilter/r.mfilter.html
===================================================================
--- grass/trunk/raster/r.mfilter/r.mfilter.html	2016-09-19 10:21:19 UTC (rev 69529)
+++ grass/trunk/raster/r.mfilter/r.mfilter.html	2016-09-19 10:29:41 UTC (rev 69530)
@@ -135,10 +135,12 @@
 
 <h2>SEE ALSO</h2>
 
-<em><a href="g.region.html">g.region</a></em>,
-<em><a href="r.clump.html">r.clump</a></em>,
-<em><a href="r.neighbors.html">r.neighbors</a></em>
-<em><a href="r.mfilter.html">r.mfilter</a></em>
+<em>
+<a href="g.region.html">g.region</a>,
+<a href="r.clump.html">r.clump</a>,
+<a href="r.neighbors.html">r.neighbors</a>,
+<a href="r.resamp.filter.html">r.resamp.filter</a>
+</em>
 
 <h2>AUTHOR</h2>
 

Modified: grass/trunk/raster/r.resamp.filter/r.resamp.filter.html
===================================================================
--- grass/trunk/raster/r.resamp.filter/r.resamp.filter.html	2016-09-19 10:21:19 UTC (rev 69529)
+++ grass/trunk/raster/r.resamp.filter/r.resamp.filter.html	2016-09-19 10:29:41 UTC (rev 69530)
@@ -81,6 +81,7 @@
 
 <em>
 <a href="g.region.html">g.region</a>,
+<a href="r.mfilter.html">r.mfilter</a>,
 <a href="r.resample.html">r.resample</a>,
 <a href="r.resamp.interp.html">r.resamp.interp</a>,
 <a href="r.resamp.rst.html">r.resamp.rst</a>,

Modified: grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.html
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.html	2016-09-19 10:21:19 UTC (rev 69529)
+++ grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.html	2016-09-19 10:29:41 UTC (rev 69530)
@@ -53,9 +53,8 @@
 specified parallel processes (<em>nprocs</em>) and the number of
 intervals to aggregate.
 <p>
-The flag <b>-s</b> allows storing a date as map name suffix rather than
-using consecutive numbering. See the examples below for details.
 
+
 <h2>EXAMPLES</h2>
 
 <h3>Aggregation of monthly data into yearly data</h3>
@@ -129,7 +128,7 @@
 <h3>Different aggregations and map name suffix variants</h3>
 
 Examples of resulting naming schemes for different aggregations when
-using the <b>-s</b> flag:
+using the <b>suffix</b> option:
 
 <h4>Weekly aggregation</h4>
 
@@ -148,10 +147,11 @@
 weekly_avg_temp_2003_07|climate|2003-02-14 00:00:00|2003-02-21 00:00:00
 </pre></div>
 
-Variant with <b>-s</b> flag:
+Variant with <b>suffix</b> set to granularity:
 <div class="code"><pre>
-t.rast.aggregate -s input=daily_temp output=weekly_avg_temp \
-  basename=weekly_avg_temp method=average granularity="1 weeks"
+t.rast.aggregate input=daily_temp output=weekly_avg_temp \
+  basename=weekly_avg_temp suffix=gran method=average \
+  granularity="1 weeks"
 
 t.rast.list weekly_avg_temp
 name|mapset|start_time|end_time
@@ -167,8 +167,9 @@
 <h4>Monthly aggregation</h4>
 
 <div class="code"><pre>
-t.rast.aggregate -s input=daily_temp output=monthly_avg_temp \
-basename=monthly_avg_temp method=average granularity="1 months"
+t.rast.aggregate input=daily_temp output=monthly_avg_temp \
+  basename=monthly_avg_temp suffix=gran method=average \
+  granularity="1 months"
 
 t.rast.list monthly_avg_temp
 name|mapset|start_time|end_time
@@ -183,8 +184,9 @@
 <h4>Yearly aggregation</h4>
 
 <div class="code"><pre>
-t.rast.aggregate -s input=daily_temp output=yearly_avg_temp \
-  basename=yearly_avg_temp method=average granularity="1 years"
+t.rast.aggregate input=daily_temp output=yearly_avg_temp \
+  basename=yearly_avg_temp suffix=gran method=average \
+  granularity="1 years"
 
 t.rast.list yearly_avg_temp
 name|mapset|start_time|end_time

Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html	2016-09-19 10:21:19 UTC (rev 69529)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.html	2016-09-19 10:29:41 UTC (rev 69530)
@@ -323,9 +323,9 @@
 t.rast.list input=8day_ts
 
 # finally, copy the aggregation to a daily time series
-t.rast.aggregate.ds -s input=daily_ts sample=8day_ts \
-   output=8day_agg basename=8day_agg \
-   method=average sampling=contains
+t.rast.aggregate.ds input=daily_ts sample=8day_ts \
+   output=8day_agg basename=8day_agg method=average \
+   sampling=contains suffix=gran
 
 # add metadata
 t.support input=8day_agg \

Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py	2016-09-19 10:21:19 UTC (rev 69529)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py	2016-09-19 10:29:41 UTC (rev 69530)
@@ -31,7 +31,7 @@
 #%end
 
 #%option G_OPT_STDS_TYPE
-#% description: Type of the aggregation space time dataset
+#% description: Type of the space time dataset from which aggregation will be copied
 #%end
 
 #%option G_OPT_STRDS_OUTPUT