[GRASS-SVN] r72609 - grass-addons/grass7/raster/r.mblend

[svn_grass at osgeo.org]

Author: Lads
Date: 2018-04-08 09:52:56 -0700 (Sun, 08 Apr 2018)
New Revision: 72609

Added:
   grass-addons/grass7/raster/r.mblend/VERSION.md
Modified:
   grass-addons/grass7/raster/r.mblend/README.md
   grass-addons/grass7/raster/r.mblend/r.mblend.py
Log:


Modified: grass-addons/grass7/raster/r.mblend/README.md
===================================================================
--- grass-addons/grass7/raster/r.mblend/README.md	2018-04-08 14:08:03 UTC (rev 72608)
+++ grass-addons/grass7/raster/r.mblend/README.md	2018-04-08 16:52:56 UTC (rev 72609)
@@ -3,6 +3,15 @@
 
 Draft implementation of the [Mblend algorithm](http://www.sciencedirect.com/science/article/pii/S0098300416300012) as an add-on for [GRASS 7](https://grass.osgeo.org/grass7/). 
 
+Manual and detailed description is available at the [GRASS manual pages](https://grass.osgeo.org/grass74/manuals/addons/r.mblend.html).
+
+Citing
+-------
+
+To cite or reference r.mblend please use the following article:
+
+L. M. de Sousa, J. P. Leitão. Improvements to DEM merging with `r.mblend`. *Proceedings of the Fourth International Conference on Geographical Information Systems Theory, Applications and Management: GISTAM*, 1, 2018.
+
 Copyright
 --------------------------------------------------------------------------------
 

Added: grass-addons/grass7/raster/r.mblend/VERSION.md
===================================================================
--- grass-addons/grass7/raster/r.mblend/VERSION.md	                        (rev 0)
+++ grass-addons/grass7/raster/r.mblend/VERSION.md	2018-04-08 16:52:56 UTC (rev 72609)
@@ -0,0 +1 @@
+1.1.1
\ No newline at end of file

Modified: grass-addons/grass7/raster/r.mblend/r.mblend.py
===================================================================
--- grass-addons/grass7/raster/r.mblend/r.mblend.py	2018-04-08 14:08:03 UTC (rev 72608)
+++ grass-addons/grass7/raster/r.mblend/r.mblend.py	2018-04-08 16:52:56 UTC (rev 72609)
@@ -23,12 +23,15 @@
 #%end
 #%option HIGH
 #% key: high
+#% description: High resolution input raster.
 #%end
 #%option LOW
 #% key: low
+#% description: Low resolution input raster.
 #%end
 #%option OUTPUT
 #% key: output
+#% description: Name of output raster.
 #%end
 #%option FAR_EDGE
 #% key: far_edge
@@ -86,7 +89,7 @@
 def compute_d_max(region):
     global d_max
     print("Region:\n" + str(region))
-    d_max = math.sqrt(math.pow(region['w'] - region['e'], 2) -
+    d_max = math.sqrt(math.pow(region['w'] - region['e'], 2) +
                       math.pow(region['n'] - region['s'], 2)) / 100