Index: wflow/wf_DynamicFramework.py
===================================================================
diff -u -r79870c854312d1769d6934773180c31f3ab16248 -r1e7be65a9571d5550c323bf6f77a6ac7899246a8
--- wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 79870c854312d1769d6934773180c31f3ab16248)
+++ wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 1e7be65a9571d5550c323bf6f77a6ac7899246a8)
@@ -470,7 +470,7 @@
 
         self.steps = self.steps + 1
 
-        tmpvar = spatial(pcr.scalar(variable))
+        tmpvar = pcr.spatial(pcr.scalar(variable))
         if self.areafunction == "average":
             self.resmap = pcr.areaaverage(tmpvar, pcr.nominal(self.area))
         elif self.areafunction == "total":
@@ -911,7 +911,7 @@
             rest = pcr.cover(pcr.readmap(mapname), default)
         else:
             if os.path.isfile(pathtotbl):
-                rest = lookupscalar(pathtotbl, landuse, subcatch, soil)
+                rest = pcr.lookupscalar(pathtotbl, landuse, subcatch, soil)
                 self.logger.info("Creating map from table: " + pathtotbl)
             else:
                 self.logger.warning(
@@ -920,13 +920,13 @@
                     + ") returning default value: "
                     + str(default)
                 )
-                rest = spatial(pcr.cover(pcr.scalar(default)))
+                rest = pcr.spatial(pcr.cover(pcr.scalar(default)))
 
             cmask = self._userModel().TopoId
 
             cmask = pcr.ifthen(cmask > 0, cmask)
-            totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(cmask))), 0)
-            resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(rest))), 0)
+            totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(cmask))), 0)
+            resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(rest))), 0)
 
             if resttotal[0, 0] < totalzeromap[0, 0]:
                 self.logger.error(
@@ -941,7 +941,7 @@
         # Apply multiplication table if present
         multname = os.path.dirname(pathtotbl) + ".mult"
         if os.path.exists(multname):
-            multfac = lookupscalar(multname, landuse, subcatch, soil)
+            multfac = pcr.lookupscalar(multname, landuse, subcatch, soil)
             rest = rest * multfac
             self.logger.info("Applying multiplication from table: " + multname)
 
@@ -984,7 +984,7 @@
             rest = pcr.cover(pcr.readmap(mapname), default)
         else:
             if os.path.isfile(pathtotbl):
-                rest = lookupscalar(pathtotbl, landuse, subcatch, soil, pcr.cover(0.0) + n)
+                rest = pcr.lookupscalar(pathtotbl, landuse, subcatch, soil, pcr.cover(0.0) + n)
                 self.logger.info("Creating map from table: " + pathtotbl)
             else:
                 self.logger.warning(
@@ -993,13 +993,13 @@
                     + ") returning default value: "
                     + str(default)
                 )
-                rest = spatial(pcr.cover(pcr.scalar(default)))
+                rest = pcr.spatial(pcr.cover(pcr.scalar(default)))
 
             cmask = self._userModel().TopoId
 
             cmask = pcr.ifthen(cmask > 0, cmask)
-            totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(cmask))), 0)
-            resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(rest))), 0)
+            totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(cmask))), 0)
+            resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(rest))), 0)
 
             if resttotal[0, 0] < totalzeromap[0, 0]:
                 self.logger.warning(
@@ -1014,7 +1014,7 @@
         # Apply multiplication table if present
         multname = os.path.dirname(pathtotbl) + ".mult"
         if os.path.exists(multname):
-            multfac = lookupscalar(multname, landuse, subcatch, soil)
+            multfac = pcr.lookupscalar(multname, landuse, subcatch, soil)
             rest = rest * multfac
             self.logger.info("Applying multiplication from table: " + multname)
 
@@ -1073,37 +1073,37 @@
 
                 for lmap in newargs:
                     if not os.path.exists(lmap):
-                        rest = spatial(pcr.scalar(default))
+                        rest = pcr.spatial(pcr.scalar(default))
                         self.logger.debug(
                             "map file not found ("
                             + lmap
                             + ") returning default value: "
                             + str(default)
                         )
                     else:
-                        rest = lookupscalar(pathtotbl, *newargs)
+                        rest = pcr.lookupscalar(pathtotbl, *newargs)
             else:
                 self.logger.debug(
                     "tbl file not found ("
                     + pathtotbl
                     + ") returning default value: "
                     + str(default)
                 )
-                rest = spatial(pcr.scalar(default))
+                rest = pcr.spatial(pcr.scalar(default))
 
                 # cmask = self._userModel().TopoId
 
                 # cmask = pcr.ifthen(cmask > 0,cmask)
-                # totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(cmask))),0)
-                # resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(defined(rest))),0)
+                # totalzeromap = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(cmask))),0)
+                # resttotal = pcr.pcr2numpy(pcr.maptotal(pcr.scalar(pcr.defined(rest))),0)
 
                 # if resttotal[0,0] < totalzeromap[0,0]:
                 #    self.logger.warning("Not all catchment cells have a value for [" + pathtotbl + "] : " + str(resttotal[0,0]) + "!=" + str(totalzeromap[0,0]))
 
         # Apply multiplication table if present
         multname = os.path.dirname(pathtotbl) + ".mult"
         if os.path.exists(multname):
-            multfac = lookupscalar(multname, *args)
+            multfac = pcr.lookupscalar(multname, *args)
             rest = rest * multfac
             self.logger.info("Applying multiplication from table: " + multname)
 
@@ -2460,7 +2460,7 @@
         Missing value is -999
         """
 
-        x = pcr.xcoordinate((spatial(pcr.boolean(1.0))))
+        x = pcr.xcoordinate((pcr.spatial(pcr.boolean(1.0))))
         retval = pcr.pcr_as_numpy(x).copy()
 
         return np.flipud(retval).copy()
@@ -2473,7 +2473,7 @@
         Missing value is -999
         """
 
-        y = pcr.ycoordinate((spatial(pcr.boolean(1.0))))
+        y = pcr.ycoordinate((pcr.spatial(pcr.boolean(1.0))))
         retval = pcr.pcr_as_numpy(y).copy()
 
         return np.flipud(retval).copy()