Index: wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py
===================================================================
diff -u -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py	(.../reservoir_Sus.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
+++ wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py	(.../reservoir_Sus.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -10,7 +10,6 @@
 """
 
 
-
 try:
     from wflow.wf_DynamicFramework import *
 except ImportError:
Index: wflow-py/Scripts/wflow_flood.py
===================================================================
diff -u -r236be615eeede4006b55d024fe76920d8f8c3d20 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/Scripts/wflow_flood.py	(.../wflow_flood.py)	(revision 236be615eeede4006b55d024fe76920d8f8c3d20)
+++ wflow-py/Scripts/wflow_flood.py	(.../wflow_flood.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -251,7 +251,6 @@
 import datetime as dt
 
 
-
 def main():
     ### Read input arguments #####
     parser = OptionParser()
Index: wflow-py/setup.py
===================================================================
diff -u -rf0335bf91cae211f0f99fecb14415f797846a21c -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/setup.py	(.../setup.py)	(revision f0335bf91cae211f0f99fecb14415f797846a21c)
+++ wflow-py/setup.py	(.../setup.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -12,7 +12,7 @@
     print("see www.pcraster.eu")
 
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, "../README.rst"), encoding='utf-8') as f:
+with open(os.path.join(here, "../README.rst"), encoding="utf-8") as f:
     README = f.read()
 
 setup(
Index: wflow-py/wflow/pcrglobwb/virtualOS.py
===================================================================
diff -u -rc78a57dd94efba793a2071c5c573e16f06cb8840 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/wflow/pcrglobwb/virtualOS.py	(.../virtualOS.py)	(revision c78a57dd94efba793a2071c5c573e16f06cb8840)
+++ wflow-py/wflow/pcrglobwb/virtualOS.py	(.../virtualOS.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -1731,22 +1731,22 @@
     if abs(a) > threshold or abs(b) > threshold:
         if PrintOnlyErrors:
 
-            #msg = "\n"
-            #msg += "\n"
-            #msg = "\n"
-            #msg += "\n"
-            #msg += "##############################################################################################################################################\n"
+            # msg = "\n"
+            # msg += "\n"
+            # msg = "\n"
+            # msg += "\n"
+            # msg += "##############################################################################################################################################\n"
             msg = "WARNING !!!!!!!! Water Balance Error %s Min %f Max %f Mean %f" % (
                 processName,
                 a,
                 b,
                 c,
             )
-            #msg += "\n"
-            #msg += "##############################################################################################################################################\n"
-            #msg += "\n"
-            #msg += "\n"
-            #msg += "\n"
+            # msg += "\n"
+            # msg += "##############################################################################################################################################\n"
+            # msg += "\n"
+            # msg += "\n"
+            # msg += "\n"
 
             logger.error(msg)
 
Index: wflow-py/wflow/wf_DynamicFramework.py
===================================================================
diff -u -rc78a57dd94efba793a2071c5c573e16f06cb8840 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision c78a57dd94efba793a2071c5c573e16f06cb8840)
+++ wflow-py/wflow/wf_DynamicFramework.py	(.../wf_DynamicFramework.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -626,27 +626,31 @@
         """
         if self._userModel()._inDynamic():
             for cmdd in self.modelparameters_changes_timestep:
-                var = cmdd.replace("self._userModel().","")
+                var = cmdd.replace("self._userModel().", "")
                 if not hasattr(self._userModel(), var):
                     self.logger.error(
                         "Variable change (apply_timestep) could not be applied to "
-                         + str(var)
+                        + str(var)
                     )
                 else:
-                    setattr(self._userModel(), var, self.modelparameters_changes_timestep[cmdd])
+                    setattr(
+                        self._userModel(),
+                        var,
+                        self.modelparameters_changes_timestep[cmdd],
+                    )
 
-
         if self._userModel()._inInitial():
             for cmdd in self.modelparameters_changes_once:
-                var = cmdd.replace("self._userModel().","")
+                var = cmdd.replace("self._userModel().", "")
                 if not hasattr(self._userModel(), var):
                     self.logger.error(
                         "Variable change ((apply_once) could not be applied to "
                         + str(var)
                     )
                 else:
-                    setattr(self._userModel(), var, self.modelparameters_changes_once[cmdd])
-                
+                    setattr(
+                        self._userModel(), var, self.modelparameters_changes_once[cmdd]
+                    )
 
     def wf_updateparameters(self):
         """
@@ -1729,8 +1733,8 @@
         for var in allvars:
             try:
                 fname = os.path.join(directory, var).replace("\\", "/") + ".map"
-                #savevar = getattr(self._userModel(), var)
-                savevar = reduce(getattr, var.split('.'), self._userModel())
+                # savevar = getattr(self._userModel(), var)
+                savevar = reduce(getattr, var.split("."), self._userModel())
 
                 try:  # Check if we have a list of maps
                     b = len(savevar)
@@ -1748,14 +1752,14 @@
                         )
                         a = a + 1
                 except:
-                    #thevar = getattr(self._userModel(), var)
-                    thevar = reduce(getattr, var.split('.'), self._userModel())
+                    # thevar = getattr(self._userModel(), var)
+                    thevar = reduce(getattr, var.split("."), self._userModel())
                     self.reportState(
                         thevar, fname, style=1, gzipit=False, longname=fname
                     )
             except:
                 self.logger.warning("Problem saving state variable: " + var)
-                #self.logger.warning(execstr)
+                # self.logger.warning(execstr)
                 self.logger.warning(sys.exc_info())
 
         # Save the summary maps
@@ -1771,14 +1775,22 @@
         for a in self.samplenamecsv:
             found = 1
             try:
-                if '+' in self.varnamecsv[a]:
+                if "+" in self.varnamecsv[a]:
                     a_ = self.varnamecsv[a].split("+")
                     tmpvar = cover(0.0)
                     for i in arange(0, len(a_)):
-                        tmpvar = tmpvar + reduce(getattr, a_[i].strip().replace("self._userModel().", "").split('.'), self._userModel())
+                        tmpvar = tmpvar + reduce(
+                            getattr,
+                            a_[i].strip().replace("self._userModel().", "").split("."),
+                            self._userModel(),
+                        )
 
-                else:    
-                    tmpvar = reduce(getattr, self.varnamecsv[a].replace("self._userModel().", "").split('.'), self._userModel())
+                else:
+                    tmpvar = reduce(
+                        getattr,
+                        self.varnamecsv[a].replace("self._userModel().", "").split("."),
+                        self._userModel(),
+                    )
             except:
                 found = 0
                 self.logger.fatal(
@@ -1877,14 +1889,18 @@
                 for i in arange(0, len(a_)):
                     # check for nested objects
                     if len(a_[i].replace("self.", "").split(".")) > 1:
-                        if hasattr((
-                            self._userModel(), a_[i].replace("self.", "").split(".")[0]
-                        )
-                         and reduce(
-                            getattr,
-                            a_[i].replace("self.", "").split("."),
-                            self._userModel(),
-                            ) is not None ):                           
+                        if hasattr(
+                            (
+                                self._userModel(),
+                                a_[i].replace("self.", "").split(".")[0],
+                            )
+                            and reduce(
+                                getattr,
+                                a_[i].replace("self.", "").split("."),
+                                self._userModel(),
+                            )
+                            is not None
+                        ):
 
                             thevar = thevar + reduce(
                                 getattr,
@@ -1906,14 +1922,15 @@
             else:
                 # check for nested objects
                 if len(a.replace("self.", "").split(".")) > 1:
-                    if (hasattr(
-                        self._userModel(), a.replace("self.", "").split(".")[0]
-
-                    ) and reduce(
-                        getattr,
-                        a.replace("self.", "").split("."),
-                        self._userModel(),                        
-                    ) is not None):
+                    if (
+                        hasattr(self._userModel(), a.replace("self.", "").split(".")[0])
+                        and reduce(
+                            getattr,
+                            a.replace("self.", "").split("."),
+                            self._userModel(),
+                        )
+                        is not None
+                    ):
                         thevar = reduce(
                             getattr,
                             a.replace("self.", "").split("."),
@@ -2026,7 +2043,11 @@
 
         for var in allvars:
             try:
-                setattr(self._userModel(), var + "_laststep", reduce(getattr, var.split('.'), self._userModel()))
+                setattr(
+                    self._userModel(),
+                    var + "_laststep",
+                    reduce(getattr, var.split("."), self._userModel()),
+                )
             except:
                 self.logger.warning("Problem saving state variable: " + var)
 
@@ -2040,7 +2061,9 @@
         allvars = self._userModel().stateVariables()
 
         for var in allvars:
-            setattr(self._userModel(), var, getattr(self._userModel(), var + "_laststep"))
+            setattr(
+                self._userModel(), var, getattr(self._userModel(), var + "_laststep")
+            )
 
         ts = self._userModel().currentTimeStep()
         self._userModel()._setCurrentTimeStep(ts)
@@ -2271,7 +2294,9 @@
         arpcr = cover(value)
         self.setviaAPI[mapname] = 1
         if hasattr(self._userModel(), mapname):
-            setattr(self._userModel(), mapname, arpcr * getattr(self._userModel(), mapname))
+            setattr(
+                self._userModel(), mapname, arpcr * getattr(self._userModel(), mapname)
+            )
             return 1
         else:
             self.logger.debug(
@@ -2298,11 +2323,15 @@
         arpcr = cover(value)
         self.setviaAPI[mapname] = 1
         if hasattr(self._userModel(), mapname):
-            setattr(self._userModel(), mapname, ifthenelse(
-                getattr(self._userModel(), areamapname) == str(areacode),
-                arpcr * getattr(self._userModel(), areamapname),
-                getattr(self._userModel(), areamapname)
-            ))
+            setattr(
+                self._userModel(),
+                mapname,
+                ifthenelse(
+                    getattr(self._userModel(), areamapname) == str(areacode),
+                    arpcr * getattr(self._userModel(), areamapname),
+                    getattr(self._userModel(), areamapname),
+                ),
+            )
 
             return 1
         else:
Index: wflow-py/wflow/wflow_cqf.py
===================================================================
diff -u -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/wflow/wflow_cqf.py	(.../wflow_cqf.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
+++ wflow-py/wflow/wflow_cqf.py	(.../wflow_cqf.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -107,7 +107,6 @@
 from wflow.wflow_adapt import *
 
 
-
 wflow = "wflow_cqf: "
 wflowVersion = "$Revision: 909 $  $Date: 2014-01-16 16:23:32 +0100 (Thu, 16 Jan 2014) $"
 
Index: wflow-py/wflow/wflow_fit_brute.py
===================================================================
diff -u -rc37a6326aa2fb35f29c2f36f09f984dd58d72d85 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/wflow/wflow_fit_brute.py	(.../wflow_fit_brute.py)	(revision c37a6326aa2fb35f29c2f36f09f984dd58d72d85)
+++ wflow-py/wflow/wflow_fit_brute.py	(.../wflow_fit_brute.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -59,7 +59,6 @@
 """
 
 
-
 import wflow.pcrut as pcrut
 import wflow.stats as stats
 
Index: wflow-py/wflow/wflow_sbm.py
===================================================================
diff -u -rf1cb1cbec79ead4028cc0914fe64f0b149b51228 -rc8a07229465447093c24e8782ab41ad8fe5a08fe
--- wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision f1cb1cbec79ead4028cc0914fe64f0b149b51228)
+++ wflow-py/wflow/wflow_sbm.py	(.../wflow_sbm.py)	(revision c8a07229465447093c24e8782ab41ad8fe5a08fe)
@@ -2255,7 +2255,9 @@
                 self.L = ifthen(
                     self.ZiLayer == float(n),
                     ifthenelse(
-                        self.ZeroMap + float(n) > 0, self.zi - l_Thickness[n - 1], self.zi
+                        self.ZeroMap + float(n) > 0,
+                        self.zi - l_Thickness[n - 1],
+                        self.zi,
                     ),
                 )
                 st = ifthen(