[GRASS-SVN] r50778 - grass/branches/develbranch_6/scripts/r.fillnulls

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-02-12 16:43:38 -0800 (Sun, 12 Feb 2012)
New Revision: 50778

Modified:
   grass/branches/develbranch_6/scripts/r.fillnulls/r.fillnulls
Log:
zoom into holes before running v.surf.rst to make it go faster. (doesn't help v.surf.bspline apparently)

Modified: grass/branches/develbranch_6/scripts/r.fillnulls/r.fillnulls
===================================================================
--- grass/branches/develbranch_6/scripts/r.fillnulls/r.fillnulls	2012-02-12 23:09:11 UTC (rev 50777)
+++ grass/branches/develbranch_6/scripts/r.fillnulls/r.fillnulls	2012-02-13 00:43:38 UTC (rev 50778)
@@ -103,6 +103,11 @@
       g.remove rast=MASK --quiet > /dev/null
       g.rename "$USERMASK",MASK --quiet > /dev/null
    fi
+
+   # remove temporary region
+   unset WIND_OVERRIDE
+   g.remove region="tmp_rfillnulls.$$" --quiet
+
    exit 1
 }
 # shell check for user break (signal list: trap -l)
@@ -218,6 +223,13 @@
 
    g.message "Using RST interpolation"
 
+   ### zooming made it take slightly longer for bspline, so only use for rst
+   # setup internal region
+   g.region save="tmp_rfillnulls.$$"
+   WIND_OVERRIDE="tmp_rfillnulls.$$"
+   export WIND_OVERRIDE
+   g.region vect="$VECTTMP" align="$GIS_OPT_INPUT"
+
    eval `g.findfile element=cell file=$USERMASK`
    if [ "$file" ] ; then
       g.message "Using user mask while interpolating"
@@ -246,6 +258,9 @@
       g.rename "$USERMASK",MASK --quiet > /dev/null
    fi
 
+   # restore real region
+   unset WIND_OVERRIDE
+   g.remove region="tmp_rfillnulls.$$" --quiet
 
 else
    g.message "Using $GIS_OPT_METHOD (v.surf.bspline) interpolation"