[GRASS-SVN] r63806 - in grass/branches/releasebranch_7_0/temporal: t.rast.accumulate t.rast.univar t.rename t.sample t.vect.univar

Mon Dec 29 00:56:42 PST 2014

Author: neteler
Date: 2014-12-29 00:56:42 -0800 (Mon, 29 Dec 2014)
New Revision: 63806

Modified:
   grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.html
   grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html
   grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html
   grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
   grass/branches/releasebranch_7_0/temporal/t.vect.univar/t.vect.univar.html
Log:
temporal manual: cosmetics

Modified: grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================

--- grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.html	2014-12-29 08:56:22 UTC (rev 63805)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.accumulate/t.rast.accumulate.html	2014-12-29 08:56:42 UTC (rev 63806)
@@ -90,8 +90,8 @@
 
 # Now we compute the Biologically Effective Degree Days 
 # from 1990 - 2000 for each year (12 month cycle) with
-# a granularity of one day. Base temperature is 10°C, upper limit is 30°C.
-# Hence the accumulation starts at 10°C and does not accumulate values above 30°C. 
+# a granularity of one day. Base temperature is 10°C, upper limit is 30°C.
+# Hence the accumulation starts at 10°C and does not accumulate values above 30°C. 
 t.rast.accumulate input="temperature_mean_1990_2000_daily_celsius" \
       output="temperature_mean_1990_2000_daily_celsius_accumulated_10_30" \
       limits="10,30" start="1990-01-01" stop="2000-01-01" cycle="12 months" \
@@ -102,17 +102,17 @@
 #############################################################################
 # Now we detect the three grasshopper pest control cycles
 
-# First cycle at 325°C - 427°C GDD
+# First cycle at 325°C - 427°C GDD
 t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30 at PERMANENT \
       occ=leafhopper_occurrence_c1_1990_2000 start="1990-01-01" stop="2000-01-01" \
       cycle="12 months" range=325,427 base=lh_c1 indicator=leafhopper_indicator_c1_1990_2000
 
-# Second cycle at 685°C - 813°C GDD
+# Second cycle at 685°C - 813°C GDD
 t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30 at PERMANENT \
       occ=leafhopper_occurrence_c2_1990_2000 start="1990-01-01" stop="2000-01-01" \
       cycle="12 months" range=685,813 base=lh_c2 indicator=leafhopper_indicator_c2_1990_2000
 
-# Third cycle at 1047°C - 1179°C GDD
+# Third cycle at 1047°C - 1179°C GDD
 t.rast.accdetect input=temperature_mean_1990_2000_daily_celsius_accumulated_10_30 at PERMANENT \
       occ=leafhopper_occurrence_c3_1990_2000 start="1990-01-01" stop="2000-01-01" \
       cycle="12 months" range=1047,1179 base=lh_c3 indicator=leafhopper_indicator_c3_1990_2000
@@ -148,7 +148,10 @@
 t.rast.mapcalc input=leafhopper_cycle_1_1990_2000_yearly_clean,leafhopper_cycle_2_1990_2000_yearly_clean,leafhopper_cycle_3_1990_2000_yearly_clean \
                base=lh_cleann_all_cycles \
                output=leafhopper_all_cycles_1990_2000_yearly_clean \
-               expr="if(isnull(leafhopper_cycle_3_1990_2000_yearly_clean), if(isnull(leafhopper_cycle_2_1990_2000_yearly_clean), if(isnull(leafhopper_cycle_1_1990_2000_yearly_clean), null() ,1),2),3)"
+               expr="if(isnull(leafhopper_cycle_3_1990_2000_yearly_clean), \
+	         if(isnull(leafhopper_cycle_2_1990_2000_yearly_clean), \
+		 if(isnull(leafhopper_cycle_1_1990_2000_yearly_clean), \
+		 null() ,1),2),3)"
 
 cat > color.table << EOF
 3 yellow

Modified: grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html	2014-12-29 08:56:22 UTC (rev 63805)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.univar/t.rast.univar.html	2014-12-29 08:56:42 UTC (rev 63806)
@@ -14,16 +14,17 @@
 
 <h2>EXAMPLE</h2>
 
-Obtain the univariate statistics for the raster space time dataset.
+Obtain the univariate statistics for the raster space time dataset
+"tempmean_monthly" (precision reduced to 2 decimals in this example):
 
 <div class="code"><pre>
 t.rast.univar -e tempmean_monthly
 id|start|end|mean|min|max|mean_of_abs|stddev|variance|coeff_var|sum|null_cells|cells|first_quartile|median|third_quartile|percentile_90
-2009_01_tempmean at climate_2009_2012|2009-01-01 00:00:00|2009-02-01 00:00:00|3.89849421589013|-3.38082313537598|7.42605421278212|3.94753539201851|1.78991938025743|3.20381138782113|45.9130957014576|1977967.31483353|503233|1010600|2.79614|3.92288|5.21245|6.22511
-2009_02_tempmean at climate_2009_2012|2009-02-01 00:00:00|2009-03-01 00:00:00|5.91200374639234|-1.82026121351454|8.00638622707791|5.91619095651249|1.62749663159835|2.64874528586399|27.5286806540252|2999555.60479584|503233|1010600|5.43935|6.25721|7.06546|7.4834
+2009_01_tempmean at climate_2009_2012|2009-01-01 00:00:00|2009-02-01 00:00:00|3.90|-3.38|7.43|3.95|1.79|3.20|45.91|1977967.31|503233|1010600|2.80|3.92|5.21|6.23
+2009_02_tempmean at climate_2009_2012|2009-02-01 00:00:00|2009-03-01 00:00:00|5.91|-1.82|8.01|5.92|1.63|2.65|27.53|2999555.60|503233|1010600|5.44|6.26|7.07|7.48
 ...
-2012_11_tempmean at climate_2009_2012|2012-11-01 00:00:00|2012-12-01 00:00:00|8.02668042229112|1.78565343221029|10.9111891852485|8.02668042229112|1.31691138968006|1.73425560826908|16.4066752430162|4072472.76581658|503233|1010600|7.4863|8.13301|8.96423|9.48106
-2012_12_tempmean at climate_2009_2012|2012-12-01 00:00:00|2013-01-01 00:00:00|8.70849654378088|1.76101896497938|11.9838566250271|8.70849654378088|1.71871196592494|2.95397082181358|19.7360354601317|4418403.76592848|503233|1010600|7.83597|8.95478|9.99429|10.6702
+2012_11_tempmean at climate_2009_2012|2012-11-01 00:00:00|2012-12-01 00:00:00|8.03|1.79|10.91|8.03|1.32|1.73|16.41|4072472.77|503233|1010600|7.49|8.13|8.96|9.48
+2012_12_tempmean at climate_2009_2012|2012-12-01 00:00:00|2013-01-01 00:00:00|8.71|1.76|11.98|8.71|1.72|2.95|19.74|4418403.77|503233|1010600|7.84|8.95|9.99|10.67
 </pre></div>
 
 <h2>SEE ALSO</h2>

Modified: grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html	2014-12-29 08:56:22 UTC (rev 63805)
+++ grass/branches/releasebranch_7_0/temporal/t.rename/t.rename.html	2014-12-29 08:56:42 UTC (rev 63806)
@@ -20,6 +20,7 @@
 t.rename input=toberenamed output=newname type=stvds
 
 t.remove input=newname type=stvds
+</pre></div>
 
 <h2>SEE ALSO</h2>
 

Modified: grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html	2014-12-29 08:56:22 UTC (rev 63805)
+++ grass/branches/releasebranch_7_0/temporal/t.sample/t.sample.html	2014-12-29 08:56:42 UTC (rev 63806)
@@ -119,7 +119,7 @@
 pnts2 at PERMANENT|a5 at PERMANENT,a6 at PERMANENT|2001-05-01 00:00:00|2001-07-01 00:00:00|61.0|120.0
 
 
-# A druing P
+# A during P
 t.sample method=during intype=stvds input=P samtype=strds sample=A -c
 
 A at PERMANENT|P at PERMANENT|start_time|end_time|interval_length|distance_from_begin

Modified: grass/branches/releasebranch_7_0/temporal/t.vect.univar/t.vect.univar.html
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.vect.univar/t.vect.univar.html	2014-12-29 08:56:22 UTC (rev 63805)
+++ grass/branches/releasebranch_7_0/temporal/t.vect.univar/t.vect.univar.html	2014-12-29 08:56:42 UTC (rev 63806)
@@ -11,7 +11,7 @@
 and after run the following command:
 
 <div class="code"><pre>
- t.vect.univar in=precip_stations col=month
+t.vect.univar in=precip_stations col=month
 id|start|end|n|nmissing|nnull|min|max|range|mean|mean_abs|population_stddev|population_variance|population_coeff_variation|sample_stddev|sample_variance|kurtosis|skewness
 precip_stations_monthly at climate_2009_2012|2009-01-01 00:00:00|2009-02-01 00:00:00|132|0|4|-2.31832|7.27494|9.59326|3.44624|3.5316|1.79322|3.21564|0.520341|1.80005|3.24019|0.484515|-0.338519
 precip_stations_monthly at climate_2009_2012|2009-02-01 00:00:00|2009-03-01 00:00:00|132|0|4|-0.654152|7.90613|8.56028|5.47853|5.48844|1.73697|3.01708|0.317051|1.74359|3.04011|0.875252|-1.0632

