Index: wflow-py/wflow/wflow_sbm.py
===================================================================
diff -u -r333cba251cf7d46677265453c4e0743834b299db -r934e81e3af5db3b226cf5e66a9c4ace3fe47990b
--- wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 333cba251cf7d46677265453c4e0743834b299db)
+++ wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision 934e81e3af5db3b226cf5e66a9c4ace3fe47990b)
@@ -461,6 +461,7 @@
         self.RiverWidth = pcrut.readmapSave(self.Dir + wflow_riverwidth, 0.0)
         # Experimental
         self.RunoffGenSigmaFunction = int(configget(self.config, 'model', 'RunoffGenSigmaFunction', '0'))
+        self.SubCatchFlowOnly = int(configget(self.config, 'model', 'SubCatchFlowOnly', '0'))
         self.RunoffGeneratingGWPerc = float(configget(self.config, 'defaultfortbl', 'RunoffGeneratingGWPerc', '0.1'))
 
         if self.scalarInput:
@@ -658,6 +659,15 @@
         self.TopoLdd = lddmask(self.TopoLdd, boolean(self.TopoId))
         catchmentcells = maptotal(scalar(self.TopoId))
 
+        # Limit lateral flow per subcatchment (make pits at all subcatch boundaries)
+        # 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)
+            self.TopoLdd = lddrepair(ifthenelse(boolean(usid),ldd(5),self.TopoLdd))
+
+
         # Used to seperate output per LandUse/management classes
         OutZones = self.LandUse