Index: examples/wflow_rhine_sbm/staticmaps/wflow_catchment.map
===================================================================
diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -rd6208134ad08cbbbb8932d0d5e5882f950063fd8
Binary files differ
Index: examples/wflow_rhine_sbm/wflow_sbm.ini
===================================================================
diff -u -r3ee12a2c2da0226494568a2d459db0953ca8cfe8 -rd6208134ad08cbbbb8932d0d5e5882f950063fd8
--- examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision 3ee12a2c2da0226494568a2d459db0953ca8cfe8)
+++ examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision d6208134ad08cbbbb8932d0d5e5882f950063fd8)
@@ -63,7 +63,7 @@
 #self.Inwater=inw
 #self.DistToUpdPt=dist
 #self.SnowMelt=sno
-#self.FirstZoneFlux=fzf
+self.FirstZoneFlux=fzf
 #self.FirstZoneDepth=fir
 #self.watbal=wat
 
@@ -79,7 +79,15 @@
 self.Transfer=tra_lu.tss
 
 # Save and sample these at gauge locations
-[outputtss_1]
-samplemap=staticmaps/wflow_gauges.map
-self.SurfaceRunoff=run.tss
-self.WaterLevel=lev.tss
+[outputcsv_1]
+samplemap=staticmaps/area.map
+#samplemap=staticmaps/wflow_subcatch.map
+self.InwaterMM=specrun.csv
+self.Precipitation=prec.csv
+self.ActEvap+self.Interception=teact.csv
+self.FirstZoneFlux=gwlat.csv
+self.UStoreDepth + self.FirstZoneDepth + self.CanopyStorage = store.csv
+downstream(self.TopoLdd,self.FirstZoneFlux) - self.FirstZoneFlux = out.csv
+self.FirstZoneFlux - upstream(self.TopoLdd,self.FirstZoneFlux) = in.csv
+self.Precipitation - self.ActEvap - self.Interception - self.InwaterMM = watbalnostore.csv
+
Index: wflow-py/wflow/wf_DynamicFramework.py
===================================================================
diff -u -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d -rd6208134ad08cbbbb8932d0d5e5882f950063fd8
--- wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d)
+++ wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision d6208134ad08cbbbb8932d0d5e5882f950063fd8)
@@ -165,7 +165,8 @@
                    self.ofile[-1].write(str(idd) +"\n")
  
       self.steps = self.steps + 1
-      self.resmap = areaaverage(scalar(variable),self.area)
+      tmpvar = scalar(spatial(variable))
+      self.resmap = areaaverage(tmpvar,self.area)
       self.remap_np = pcr2numpy(self.resmap,0)
       self.flatres = self.remap_np.flatten()[self.idx]
 
@@ -346,9 +347,9 @@
             samplemapname = caseName + "/" + configget(self._userModel().config,thissection,"samplemap","None")
             if "None" not in samplemapname :    
                 try:
-                    samplemap = readmap(samplemapname)
+                    self.samplemap = readmap(samplemapname)
                     idd = tsformat + ":" +samplemapname
-                    self.oscv[idd] =wf_OutputTimeSeriesArea(samplemap,oformat=tsformat)
+                    self.oscv[idd] =wf_OutputTimeSeriesArea(self.samplemap,oformat=tsformat)
                     self.logger.info("Adding " + tsformat + " output at "+ samplemapname)
                 except:
                     self.logger.warn("Could not read sample id-map for timeseries: " + samplemapname)
Index: wflow-py/wflow/wflow_sbm.py
===================================================================
diff -u -r21a737cc033ad3a927e53eb8d3cd820574c155e9 -rd6208134ad08cbbbb8932d0d5e5882f950063fd8
--- wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 21a737cc033ad3a927e53eb8d3cd820574c155e9)
+++ wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision d6208134ad08cbbbb8932d0d5e5882f950063fd8)
@@ -919,10 +919,12 @@
                                                                                                  self.Precipitation,
                                                                                                  self.CanopyStorage)
             PotTrans = cover(max(0.0, self.PotEvap - Interception), 0.0)  # now in mm
+            self.Interception=Interception
         else:
             NetInterception, ThroughFall, StemFlow, LeftOver, Interception, self.CanopyStorage = rainfall_interception_modrut(
                 self.Precipitation, self.PotEvap, self.CanopyStorage, self.CanopyGapFraction, self.Cmax)
             PotTrans = cover(max(0.0, LeftOver), 0.0)  # now in mm
+            self.Interception=NetInterception
 
         ##########################################################################
         # Start with the soil calculations  ######################################
@@ -1174,7 +1176,7 @@
         CellStorage = self.UStoreDepth + self.FirstZoneDepth + self.CanopyStorage
         DeltaStorage = CellStorage - self.InitialStorage
         OutFlow = self.FirstZoneFlux
-        CellInFlow = upstream(self.TopoLdd, scalar(self.FirstZoneFlux));
+        CellInFlow = upstream(self.TopoLdd, scalar(self.FirstZoneFlux))
         #CellWatBal = ActInfilt - self.ActEvap - self.ExfiltWater - ActLeakage + Reinfilt + IF - OutFlow + (OldCellStorage - CellStorage)
         #SumCellWatBal = SumCellWatBal + CellWatBal;