[GRASS-SVN] r66043 - grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Aug 27 01:04:06 PDT 2015


Author: Giulia
Date: 2015-08-27 01:04:06 -0700 (Thu, 27 Aug 2015)
New Revision: 66043

Modified:
   grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
Log:
r.green: uncommit r.green.hydro.structures

Modified: grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py	2015-08-27 07:58:38 UTC (rev 66042)
+++ grass-addons/grass7/raster/r.green/r.green.hydro/r.green.hydro.technical/r.green.hydro.technical.py	2015-08-27 08:04:06 UTC (rev 66043)
@@ -656,15 +656,15 @@
         conv_segpoints(plant, options['output_point'])
 
     # set the opions to execute the r.green.hydro.structure
-#    struct_opts = dict(elevation=elevation, plant=plant,
-#                       output_struct=output_struct,
-#                       ndigits=options['ndigits'],
-#                       contour=options['contour'], overwrite=gcore.overwrite())
-#    if options['resolution']:
-#        struct_opts['resolution'] = options['resolution']
-#    gcore.run_command('r.green.hydro.strucintake_idture', **struct_opts)
-#
-#    gcore.run_command('v.build', map=output_struct)
+    struct_opts = dict(elevation=elevation, plant=plant,
+                       output_struct=output_struct,
+                       ndigits=options['ndigits'],
+                       contour=options['contour'], overwrite=gcore.overwrite())
+    if options['resolution']:
+        struct_opts['resolution'] = options['resolution']
+    gcore.run_command('r.green.hydro.strucintake_idture', **struct_opts)
+
+    gcore.run_command('v.build', map=output_struct)
 ## --------------------------------------------------------------------------
     with VectorTopo(output_struct, mode='rw') as struct:
         list_intakeid = compute_losses(struct, options,



More information about the grass-commit mailing list