[GRASS-SVN] r69990 - grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial

[svn_grass at osgeo.org]

Author: Giulia
Date: 2016-12-03 23:54:43 -0800 (Sat, 03 Dec 2016)
New Revision: 69990

Modified:
   grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py
Log:
r.green:add new default values to cost

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py	2016-12-03 21:55:30 UTC (rev 69989)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.financial/r.green.hydro.financial.py	2016-12-04 07:54:43 UTC (rev 69990)
@@ -976,6 +976,18 @@
     linear_cost(vname=struct, cname='lin_electro_cost',
                 alpha=float(opts['lc_electro']), length='electro_length',
                 vlayer=vlayer, ctype='double precision',  overwrite=overw)
+    # Compensation raster costs for electroline
+    comp = (opts['compensation']+'el' if
+            opts['compensation']
+            else ('tmprgreen_%i_compensation_el' % pid))
+    exc = (opts['excavation']+'el'
+           if opts['excavation']
+           else ('tmprgreen_%i_excavation' % pid))
+    compensation_cost(comp, lan, tri, upper,
+                      irate, float(opts['gamma_comp']), life, 0.6, overw)
+    # Excavation raster costs for electroline
+    excavation_cost(exc, excmin, excmax, opts['slope'],
+                    slim, 0.6, 0.6, overw)
 
     # add excavation cost and compensation cost for electroline
     elines = (opts['elines'] if opts['elines']