[GRASS-SVN] r67925 - in grass-addons/grass7/raster/r.green/r.green.biomassfor: . libforest r.green.biomassfor.financial

[svn_grass at osgeo.org]

Author: Giulia
Date: 2016-02-23 02:31:49 -0800 (Tue, 23 Feb 2016)
New Revision: 67925

Modified:
   grass-addons/grass7/raster/r.green/r.green.biomassfor/Makefile
   grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/Makefile
   grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/harvesting.py
   grass-addons/grass7/raster/r.green/r.green.biomassfor/r.green.biomassfor.financial/r.green.biomassfor.financial.py
Log:
r.green: fix libraries

Modified: grass-addons/grass7/raster/r.green/r.green.biomassfor/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.biomassfor/Makefile	2016-02-23 09:39:11 UTC (rev 67924)
+++ grass-addons/grass7/raster/r.green/r.green.biomassfor/Makefile	2016-02-23 10:31:49 UTC (rev 67925)
@@ -2,15 +2,15 @@
 
 PGM=r.green.biomassfor
 
-SUBDIRS = r.green.biomassfor.financial \
+SUBDIRS = libforest\
+	  r.green.biomassfor.financial \
           r.green.biomassfor.theoretical \
           r.green.biomassfor.recommended \
           r.green.biomassfor.technical \
           r.green.biomassfor.legal \
           r.green.biomassfor.impact \
-          r.green.biomassfor.co2 \
-          libforest
-
+          r.green.biomassfor.co2
+          
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs htmldir

Modified: grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/Makefile
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/Makefile	2016-02-23 09:39:11 UTC (rev 67924)
+++ grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/Makefile	2016-02-23 10:31:49 UTC (rev 67925)
@@ -3,10 +3,10 @@
 include $(MODULE_TOPDIR)/include/Make/Other.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-MODULES = financial harvesting __init__
+MODULES = harvesting financial __init__
 
 PGM = r.green
-LIBDIR = libhydro
+LIBDIR = libforest
 ETCDIR = $(ETC)/$(PGM)/$(LIBDIR)
 
 PYFILES := $(patsubst %,$(ETCDIR)/%.py,$(MODULES))

Modified: grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/harvesting.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/harvesting.py	2016-02-23 09:39:11 UTC (rev 67924)
+++ grass-addons/grass7/raster/r.green/r.green.biomassfor/libforest/harvesting.py	2016-02-23 10:31:49 UTC (rev 67925)
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-# -- coding: utf-8 --
-#
+# -*- coding: utf-8 -*-
 ############################################################################
 #
 # AUTHOR(S):   Giulia Garegnani

Modified: grass-addons/grass7/raster/r.green/r.green.biomassfor/r.green.biomassfor.financial/r.green.biomassfor.financial.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.biomassfor/r.green.biomassfor.financial/r.green.biomassfor.financial.py	2016-02-23 09:39:11 UTC (rev 67924)
+++ grass-addons/grass7/raster/r.green/r.green.biomassfor/r.green.biomassfor.financial/r.green.biomassfor.financial.py	2016-02-23 10:31:49 UTC (rev 67925)
@@ -364,7 +364,7 @@
     from libforest.financial import revenues, productivity, costs, net_revenues
     from libforest.harvesting import combination, slope_computation, yield_pix_process
 except ImportError:
-    warning('libgreen and libhydro not in the python path!')
+    warning('libgreen and libforest not in the python path!')
 
 
 def main(opts, flgs):
@@ -423,10 +423,9 @@
             run_command("r.mapcalc", overwrite=True,
                         expression=('%s=%f' % (output, val)))
     # create combination maps to avoid if construction
-    m1t1, m1t2, m1, m2, not2 = combination(management=
-                                           ('tmprgreen_%i_management' % pid),
-                                           treatment=('tmprgreen_%i_treatment'
-                                                      % pid))
+    import ipdb; ipdb.set_trace()
+    m1t1, m1t2, m1, m2, not2 = combination('tmprgreen_%i_management' % pid,
+                                           'tmprgreen_%i_treatment' % pid)
 
     slope_computation(opts['elevation'])