[GRASS-SVN] r61528 - grass-addons/grass7/raster/r.bioclim

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-08-05 00:52:59 -0700 (Tue, 05 Aug 2014)
New Revision: 61528

Modified:
   grass-addons/grass7/raster/r.bioclim/r.bioclim.html
   grass-addons/grass7/raster/r.bioclim/r.bioclim.py
Log:
r.bioclim: code + manual cosmetics

Modified: grass-addons/grass7/raster/r.bioclim/r.bioclim.html
===================================================================
--- grass-addons/grass7/raster/r.bioclim/r.bioclim.html	2014-08-05 07:02:35 UTC (rev 61527)
+++ grass-addons/grass7/raster/r.bioclim/r.bioclim.html	2014-08-05 07:52:59 UTC (rev 61528)
@@ -30,25 +30,25 @@
 
 <h4>List of bioclimatic indices</h4>
 
-<p><b>BIO 01</b> Annual mean temperature as the mean of the monthly temperatures.
-<p><b>BIO 02</b> Mean diurnal range as the mean of monthly (max temp - min temp)
+<p><b>BIO 01</b> Annual mean temperature as the mean of the monthly temperatures (°C)
+<p><b>BIO 02</b> Mean diurnal range as the mean of monthly (max temp - min temp) (°C)
 <p><b>BIO 03</b> Isothermality (BIO2/BIO7 * 100)
 <p><b>BIO 04</b> Temperature Seasonality (standard deviation * 100)
-<p><b>BIO 05</b> Max Temperature of Warmest Month
-<p><b>BIO 06</b> Min Temperature of Coldest Month
-<p><b>BIO 07</b> Temperature Annual Range (BIO5 - BIO6)
-<P><b>BIO 08</b> Mean Temperature of Wettest Quarter
-<p><b>BIO 09</b> Mean Temperature of Driest Quarter
-<p><b>BIO 10</b> Mean Temperature of Warmest Quarter
-<p><b>BIO 11</b> Mean Temperature of Coldest Quarter
-<p><b>BIO 12</b> Annual Precipitation
-<p><b>BIO 13</b> Precipitation of Wettest Month
-<p><b>BIO 14</b> Precipitation of Driest Month
+<p><b>BIO 05</b> Max Temperature of Warmest Month (°C)
+<p><b>BIO 06</b> Min Temperature of Coldest Month (°C)
+<p><b>BIO 07</b> Temperature Annual Range (BIO5 - BIO6) (°C)
+<P><b>BIO 08</b> Mean Temperature of Wettest Quarter (°C)
+<p><b>BIO 09</b> Mean Temperature of Driest Quarter (°C)
+<p><b>BIO 10</b> Mean Temperature of Warmest Quarter (°C)
+<p><b>BIO 11</b> Mean Temperature of Coldest Quarter (°C)
+<p><b>BIO 12</b> Annual Precipitation (mm)
+<p><b>BIO 13</b> Precipitation of Wettest Month (mm)
+<p><b>BIO 14</b> Precipitation of Driest Month (mm)
 <p><b>BIO 15</b> Precipitation Seasonality (Coefficient of Variation * 100)
-<p><b>BIO 16</b> Precipitation of Wettest Quarter
-<p><b>BIO 17</b> Precipitation of Driest Quarter
-<p><b>BIO 18</b> Precipitation of Warmest Quarter
-<p><b>BIO 19</b> Precipitation of Coldest Quarter
+<p><b>BIO 16</b> Precipitation of Wettest Quarter (mm)
+<p><b>BIO 17</b> Precipitation of Driest Quarter (mm)
+<p><b>BIO 18</b> Precipitation of Warmest Quarter (mm)
+<p><b>BIO 19</b> Precipitation of Coldest Quarter (mm)
 
 <h2>EXAMPLES</h2>
 

Modified: grass-addons/grass7/raster/r.bioclim/r.bioclim.py
===================================================================
--- grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-08-05 07:02:35 UTC (rev 61527)
+++ grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-08-05 07:52:59 UTC (rev 61528)
@@ -198,7 +198,9 @@
     grass.run_command('r.series', input = tr, output = output, method = 'average')
     grass.mapcalc("$bio = round(double($oscale) * $input / $iscale)",
                   bio = outpre + '.bio02',
-                  oscale = toutscale, input = output, iscale = tinscale)
+                  oscale = toutscale,
+                  input = output,
+                  iscale = tinscale)
     grass.run_command('r.support', map = outpre + '.bio02',
                       description = 'BIOCLIM02: Generated by r.bioclim')
     grass.run_command('r.support', map = outpre + '.bio02',history = os.environ['CMDLINE'])