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

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-08-22 07:04:49 -0700 (Fri, 22 Aug 2014)
New Revision: 61716

Modified:
   grass-addons/grass7/raster/r.bioclim/r.bioclim.py
Log:
r.bioclim: reinstate r61531 since the toutscale needs to be considered

Modified: grass-addons/grass7/raster/r.bioclim/r.bioclim.py
===================================================================
--- grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-08-22 13:18:43 UTC (rev 61715)
+++ grass-addons/grass7/raster/r.bioclim/r.bioclim.py	2014-08-22 14:04:49 UTC (rev 61716)
@@ -211,10 +211,11 @@
     grass.message(_("BIO4 = Temperature Seasonality ..."))
     output = outpre + '.bio04.' + str(pid)
     grass.run_command('r.series', input = tavg, output = output, method = 'stddev')
-    grass.mapcalc("$bio = round(100.0 * $biotmp / $iscale)",
+    grass.mapcalc("$bio = round(100.0 * $biotmp / $iscale * $oscale)",
                   bio = outpre + '.bio04',
                   biotmp = output,
-                  iscale = tinscale)
+                  iscale = tinscale,
+                  oscale = toutscale)
     grass.run_command('r.support', map = outpre + '.bio04',
                       description = 'BIOCLIM04: Generated by r.bioclim')
     grass.run_command('r.support', map = outpre + '.bio04',history = os.environ['CMDLINE'])