[GRASS-SVN] r60232 - grass-addons/grass7/vector/v.habitat.dem

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-05-13 14:17:32 -0700 (Tue, 13 May 2014)
New Revision: 60232

Modified:
   grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html
   grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
Log:
update formula

Modified: grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html
===================================================================
--- grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html	2014-05-13 18:29:59 UTC (rev 60231)
+++ grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.html	2014-05-13 21:17:32 UTC (rev 60232)
@@ -114,7 +114,7 @@
 
 <div class="code">
  <pre>
-  1.4 * exp(flow_accumulation / 22.1, 0.4) * exp(sin(slope) 0.09, 1.2)
+  1.4 * exp(flow_accumulation * resolution / 22.1, 0.4) * exp(sin(slope) 0.09, 1.2)
  </pre>
 </div>
 

Modified: grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py
===================================================================
--- grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py	2014-05-13 18:29:59 UTC (rev 60231)
+++ grass-addons/grass7/vector/v.habitat.dem/v.habitat.dem.py	2014-05-13 21:17:32 UTC (rev 60232)
@@ -441,9 +441,10 @@
                                      flowaccumulation = r_flow_accum)
 
     grass.message( "..." )									 
-    grass.mapcalc("$outmap = 1.4 * exp($flowacc / 22.1, 0.4) * exp(sin($slope) / 0.09, 1.2)",
+    grass.mapcalc("$outmap = 1.4 * exp($flowacc * $resolution / 22.1, 0.4) * exp(sin($slope) / 0.09, 1.2)",
                                      outmap = r_LS, 
-                                     flowacc = r_flow_accum, 
+                                     flowacc = r_flow_accum,
+                                     resolution = Xres,
                                      slope = r_slope)
 
     # create and define color rules file for LS factor map