Index: doc/release_notes.rst =================================================================== diff -u -r043cc93152a2b84e31b26a39f523e4930957b981 -r5cf74bfdd89176533f27073418890cb292257f45 --- doc/release_notes.rst (.../release_notes.rst) (revision 043cc93152a2b84e31b26a39f523e4930957b981) +++ doc/release_notes.rst (.../release_notes.rst) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -11,6 +11,8 @@ functionality should replace all manual reading of forcing data and static parameters + Added .mult postfix for tbl files to apply multiplication + Added bmi support ++ wflow_sbm s-curve sharpness of height distribution now based on upper and lower + half of the distribution (average) Index: doc/wflow_sbm.rst =================================================================== diff -u -r9d02128f2238de18ce7d0e2443a26da02064de80 -r5cf74bfdd89176533f27073418890cb292257f45 --- doc/wflow_sbm.rst (.../wflow_sbm.rst) (revision 9d02128f2238de18ce7d0e2443a26da02064de80) +++ doc/wflow_sbm.rst (.../wflow_sbm.rst) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -486,8 +486,8 @@ .. note:: - at present the model uses the drainage base (minimum DEM) and treats this as the 10% percentile - to which the curve is fitted. So at present only two points are used (10 % and 50%) + The model determines the C for the upper hals and the lower half of the curve + seperate and averages the results. .. warning:: Index: examples/wflow_rhine_sbm/wflow_sbm.ini =================================================================== diff -u -rbf65fb743568cb9c44c6e4d96791dcc1c332a015 -r5cf74bfdd89176533f27073418890cb292257f45 --- examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision bf65fb743568cb9c44c6e4d96791dcc1c332a015) +++ examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -114,6 +114,8 @@ [summary] self.MaxLeakage=MaxLeakage.map +self.CCup=CCup.map +self.CClow=CClow.map # Save and average these per LU type [summary_sum] Index: wflow-py/setup.py =================================================================== diff -u -r043cc93152a2b84e31b26a39f523e4930957b981 -r5cf74bfdd89176533f27073418890cb292257f45 --- wflow-py/setup.py (.../setup.py) (revision 043cc93152a2b84e31b26a39f523e4930957b981) +++ wflow-py/setup.py (.../setup.py) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -8,7 +8,7 @@ from setuptools import find_packages here = os.path.abspath(os.path.dirname(__file__)) -README = open(os.path.join(here, 'README.txt')).read() +README = open(os.path.join(here, 'README.rst')).read() TODO = open(os.path.join(here, 'TODO.txt')).read() requires = [ Index: wflow-py/wflow/wflow_lib.py =================================================================== diff -u -r043cc93152a2b84e31b26a39f523e4930957b981 -r5cf74bfdd89176533f27073418890cb292257f45 --- wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 043cc93152a2b84e31b26a39f523e4930957b981) +++ wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -73,7 +73,7 @@ return readmap(lddname) else: if Verbose: - print("Creating ldd", lddname) + print("Creating ldd", lddname) LDD = lddcreate(dem, 10.0E35, outflowdepth, 10.0E35, 10.0E35) report(LDD, lddname) return LDD Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r4387689dba010ab5cbef829ed21e8ffedbfd5fc3 -r5cf74bfdd89176533f27073418890cb292257f45 --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 4387689dba010ab5cbef829ed21e8ffedbfd5fc3) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 5cf74bfdd89176533f27073418890cb292257f45) @@ -671,10 +671,13 @@ # limit roots to top 99% of first zone self.RootingDepth = min(self.FirstZoneThickness * 0.99, self.RootingDepth) - # subgrid runoff generation + # subgrid runoff generation, determine CC (shorpness of S-Curve) for upper + # en lower part and take average self.DemMax = readmap(self.Dir + "/staticmaps/wflow_demmax") self.DrainageBase = readmap(self.Dir + "/staticmaps/wflow_demmin") - self.CC = min(100.0, -log(1.0 / 0.1 - 1) / min(-0.1, self.DrainageBase - self.Altitude)) + self.CClow = min(100.0, - ln(1.0 / 0.1 - 1) / min(-0.1, self.DrainageBase - self.Altitude)) + self.CCup = min(100.0, - ln(1.0 / 0.1 - 1) / min(-0.1, self.Altitude - self.DemMax)) + self.CC = (self.CClow + self.CCup) * 0.5 #self.GWScale = (self.DemMax-self.DrainageBase)/self.FirstZoneThickness / self.RunoffGeneratingGWPerc # Which columns/gauges to use/ignore in updating @@ -1390,6 +1393,7 @@ configset(myModel.config, 'model', 'updateFile', a, overwrite=True) configset(myModel.config, 'model', 'updating', "1", overwrite=True) if o == '-u': + zz = [] exec "zz =" + a updateCols = zz if o == '-E': configset(myModel.config, 'model', 'reInfilt', '1', overwrite=True)