Index: examples/wflow_rhine_sbm/wflow_sbm.ini
===================================================================
diff -u -rac75d5eab1a097f62294f4e9116f6f8724005cca -re2ec55df353aa5f8db1810b035fdbc6329d31061
--- examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision ac75d5eab1a097f62294f4e9116f6f8724005cca)
+++ examples/wflow_rhine_sbm/wflow_sbm.ini	(.../wflow_sbm.ini)	(revision e2ec55df353aa5f8db1810b035fdbc6329d31061)
@@ -35,6 +35,7 @@
 Tslice=1
 # Maximum upstream distance to update the flow in metres
 UpdMaxDist=300000.0
+#SubCatchFlowOnly = 1
 
 [misc]
 #mapSaveInterval=365
@@ -46,8 +47,8 @@
 # 3: matlab
 
 # netcdfoutput requires also outputformat = 1 (default) and additionally the name of the file
-netcdfoutput = outmaps.nc
-netcdfwritebuffer=100
+#netcdfoutput = outmaps.nc
+#netcdfwritebuffer=100
 
 [layout]
 # if set to zero the cell-size is given in lat/long (the default)
Index: wflow-py/wflow/wflow_hbv.py
===================================================================
diff -u -r934e81e3af5db3b226cf5e66a9c4ace3fe47990b -re2ec55df353aa5f8db1810b035fdbc6329d31061
--- wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision 934e81e3af5db3b226cf5e66a9c4ace3fe47990b)
+++ wflow-py/wflow/wflow_hbv.py	(.../wflow_hbv.py)	(revision e2ec55df353aa5f8db1810b035fdbc6329d31061)
@@ -521,8 +521,8 @@
     # This is very handy for Ribasim etc...
     if self.SubCatchFlowOnly > 0:
         self.logger.info("Creating subcatchment-only drainage network (ldd)")
-        ds = downstream(self.TopoLdd,self.sCatch)
-        usid = ifthenelse(ds != self.sCatch,self.sCatch,0)
+        ds = downstream(self.TopoLdd,self.TopoId)
+        usid = ifthenelse(ds != self.TopoId,self.TopoId,0)
         self.TopoLdd = lddrepair(ifthenelse(boolean(usid),ldd(5),self.TopoLdd))
 
     # Used to seperate output per LandUse/management classes
Index: wflow-py/wflow/wflow_sbm.py
===================================================================
diff -u -r934e81e3af5db3b226cf5e66a9c4ace3fe47990b -re2ec55df353aa5f8db1810b035fdbc6329d31061
--- wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 934e81e3af5db3b226cf5e66a9c4ace3fe47990b)
+++ wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision e2ec55df353aa5f8db1810b035fdbc6329d31061)
@@ -663,8 +663,8 @@
         # This is very handy for Ribasim etc...
         if self.SubCatchFlowOnly > 0:
             self.logger.info("Creating subcatchment-only drainage network (ldd)")
-            ds = downstream(self.TopoLdd,self.sCatch)
-            usid = ifthenelse(ds != self.sCatch,self.sCatch,0)
+            ds = downstream(self.TopoLdd,self.TopoId)
+            usid = ifthenelse(ds != self.TopoId,self.TopoId,0)
             self.TopoLdd = lddrepair(ifthenelse(boolean(usid),ldd(5),self.TopoLdd))