[GRASS-SVN] r73447 - grass-addons/grass7/vector/v.gsflow.grid
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Sep 28 07:00:31 PDT 2018
Author: awickert
Date: 2018-09-28 07:00:31 -0700 (Fri, 28 Sep 2018)
New Revision: 73447
Modified:
grass-addons/grass7/vector/v.gsflow.grid/v.gsflow.grid.py
Log:
v.gsflow.grid: return parens to overwrite
Modified: grass-addons/grass7/vector/v.gsflow.grid/v.gsflow.grid.py
===================================================================
--- grass-addons/grass7/vector/v.gsflow.grid/v.gsflow.grid.py 2018-09-28 13:53:50 UTC (rev 73446)
+++ grass-addons/grass7/vector/v.gsflow.grid/v.gsflow.grid.py 2018-09-28 14:00:31 UTC (rev 73447)
@@ -160,7 +160,7 @@
# Finally make the region
g.region(w=str(_w), e=str(_e), s=str(_s), n=str(_n), nsres=str(grid_ratio_ns*reg['nsres']), ewres=str(grid_ratio_ew*reg['ewres']))
# And then make the grid
- v.mkgrid(map=grid, overwrite=gscript.overwrite)
+ v.mkgrid(map=grid, overwrite=gscript.overwrite())
# Cell numbers (row, column, continuous ID)
v.db_addcolumn(map=grid, columns='id int', quiet=True)
@@ -192,7 +192,7 @@
# Fine resolution region:
g.region(n=reg['n'], s=reg['s'], w=reg['w'], e=reg['e'], nsres=reg['nsres'], ewres=reg['ewres'])
# Rasterize basin
- v.to_rast(input=basin, output=mask, use='val', value=1, overwrite=gscript.overwrite, quiet=True)
+ v.to_rast(input=basin, output=mask, use='val', value=1, overwrite=gscript.overwrite(), quiet=True)
# Coarse resolution region:
g.region(w=str(_w), e=str(_e), s=str(_s), n=str(_n), nsres=str(grid_ratio_ns*reg['nsres']), ewres=str(grid_ratio_ew*reg['ewres']))
r.resamp_stats(input=mask, output=mask, method='sum', overwrite=True, quiet=True)
@@ -206,7 +206,7 @@
"""
# Resampled raster
if len(raster_output) > 0:
- r.resamp_stats(input=raster_input, output=raster_output, method='average', overwrite=gscript.overwrite, quiet=True)
+ r.resamp_stats(input=raster_input, output=raster_output, method='average', overwrite=gscript.overwrite(), quiet=True)
"""
# Pour point
@@ -242,7 +242,7 @@
g.rename(raster=('tmp3','tmp'), overwrite=True, quiet=True)
#r.null(map='tmp', setnull=0) # Not necessary: center point removed above
r.to_vect(input='tmp', output=bc_cell, type='point', column='z',
- overwrite=gscript.overwrite, quiet=True)
+ overwrite=gscript.overwrite(), quiet=True)
v.db_addcolumn(map=bc_cell, columns=('row integer','col integer','x double precision','y double precision'), quiet=True)
v.build(map=bc_cell, quiet=True)
v.what_vect(map=bc_cell, query_map=grid, column='row', \
More information about the grass-commit
mailing list