[GRASS-SVN] r59034 - grass-addons/grass7/raster/r.shalstab

[svn_grass at osgeo.org]

Author: kikapu
Date: 2014-02-14 01:19:32 -0800 (Fri, 14 Feb 2014)
New Revision: 59034

Modified:
   grass-addons/grass7/raster/r.shalstab/r.shalstab.py
Log:
R.shalstab: change critic rain classification

Modified: grass-addons/grass7/raster/r.shalstab/r.shalstab.py
===================================================================
--- grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-02-14 08:53:41 UTC (rev 59033)
+++ grass-addons/grass7/raster/r.shalstab/r.shalstab.py	2014-02-14 09:19:32 UTC (rev 59034)
@@ -68,15 +68,6 @@
 #%  required: yes
 #%end
 #%option
-#%  key: gamma_wet
-#%  type: string
-#%  gisprompt: old,raster,raster
-#%  key_desc: name
-#%  description: Wet soil density (kg/m^3)
-#%  answer: 2100
-#%  required: no
-#%end
-#%option
 #%  key: root
 #%  type: string
 #%  gisprompt: old,raster,raster
@@ -169,7 +160,7 @@
     grass.mapcalc("assoluta_stab=(1-1000/($gamma))*tan($phy)", 
                     gamma = gamma,
                     phy = phy)
-    grass.mapcalc("assoluta_cond=if(assoluta_stab>tan(slopes),9999,0)")
+    grass.mapcalc("assoluta_cond=if(assoluta_stab>tan(slopes),null(),0)")
     #unstable condition
     grass.mapcalc("assoluta_instab=C/cos(slopes)+(tan($phy))",
                     phy = phy)