[GRASS-SVN] r70956 - grass-addons/grass7/raster/r.green/r.green.gshp/r.green.gshp.theoretical

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Apr 26 06:20:24 PDT 2017


Author: zarch
Date: 2017-04-26 06:20:24 -0700 (Wed, 26 Apr 2017)
New Revision: 70956

Modified:
   grass-addons/grass7/raster/r.green/r.green.gshp/r.green.gshp.theoretical/r.green.gshp.theoretical.py
Log:
r.green: fix wrong function name

Modified: grass-addons/grass7/raster/r.green/r.green.gshp/r.green.gshp.theoretical/r.green.gshp.theoretical.py
===================================================================
--- grass-addons/grass7/raster/r.green/r.green.gshp/r.green.gshp.theoretical/r.green.gshp.theoretical.py	2017-04-26 12:53:25 UTC (rev 70955)
+++ grass-addons/grass7/raster/r.green/r.green.gshp/r.green.gshp.theoretical/r.green.gshp.theoretical.py	2017-04-26 13:20:24 UTC (rev 70956)
@@ -263,7 +263,7 @@
     DEBUG = flags['d']
     OVER = gcore.overwrite()
     tmpbase = "tmprgreen_%i" % pid
-    atexit.register(gpot.cleanup, pattern=(tmpbase + '*'), debug=DEBUG)
+    atexit.register(cleanup, pattern=(tmpbase + '*'), debug=DEBUG)
 
     heating_season = float(opts['heating_season']) * 24 * 60 * 60
     lifetime = float(opts['lifetime']) * 365 * 24 * 60 * 60
@@ -299,10 +299,12 @@
     # START COMPUTATIONS
     uc = tmpbase + '_uc'
     gpot.r_norm_time(uc, heating_season, borehole_radius,
-                     ground_conductivity, ground_capacity, overwrite=OVER)
+                     ground_conductivity, ground_capacity, execute=True,
+                     overwrite=OVER)
     us = tmpbase + '_us'
     gpot.r_norm_time(us, lifetime, borehole_radius,
-                     ground_conductivity, ground_capacity, overwrite=OVER)
+                     ground_conductivity, ground_capacity, execute=True,
+                     overwrite=OVER)
 
     gmax = tmpbase + '_gmax'
     tc = heating_season / (365. * 24 * 60 * 60.)



More information about the grass-commit mailing list