Index: wflow-py/UnitTests/wflow_sbm/wflow_sbm.ini =================================================================== diff -u -r4efaa4c2e535431943e073dca2c8a31a334f8a77 -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/UnitTests/wflow_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 4efaa4c2e535431943e073dca2c8a31a334f8a77) +++ wflow-py/UnitTests/wflow_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -73,6 +73,9 @@ KsatVerFactor = 1 +[rollingmean] +self.SurfaceRunoff=30 + #DynamicVegetation=1 [misc] Index: wflow-py/_version.py =================================================================== diff -u -r976884e95a9d9b851dfb73172b3c7f6af0637cd7 -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/_version.py (.../_version.py) (revision 976884e95a9d9b851dfb73172b3c7f6af0637cd7) +++ wflow-py/_version.py (.../_version.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -1,4 +1,4 @@ VERSION="1.0.master.1" MVERSION="1.0.master" NVERSION="1.0.1" -BUILD="2016-11-22 13:23:54.540000" +BUILD="2016-11-22 13:55:48.455000" Index: wflow-py/make_wflow_exe_cx.py =================================================================== diff -u -r18f6d7bdbb7643aa86db300fcfb7c074eea1c324 -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 18f6d7bdbb7643aa86db300fcfb7c074eea1c324) +++ wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -12,7 +12,7 @@ """ target = 'deltashell' -#target ='openda' +target ='openda' from cx_Freeze import setup, Executable, hooks Index: wflow-py/mkversion.py =================================================================== diff -u -rc24bb0fe6fa1293caa90a70ec653660e53365295 -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/mkversion.py (.../mkversion.py) (revision c24bb0fe6fa1293caa90a70ec653660e53365295) +++ wflow-py/mkversion.py (.../mkversion.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -28,9 +28,18 @@ a.write("__release__=\"" + manualversion + "\"\n") a.write("__versionnr__=\"" + version + "\"\n") a.write("__build__=\"" + str(build) + "\"\n") -a.write("import osgeo.gdal as gdal") +a.write("import osgeo.gdal as gdal\n\n") +a.write("import os, sys\n") +a.write("if hasattr(sys, \"frozen\"):\n") +a.write(" _ROOT = os.path.abspath(os.path.dirname(__file__)).split(\"library.zip\")[0]\n") +a.write(" os.environ['GDAL_DATA'] = os.path.join(_ROOT,'gdal-data')\n") +a.write("else:\n") +a.write(" _ROOT = os.path.abspath(os.path.dirname(__file__))\n") +a.write("def get_data(path):\n") +a.write(" return os.path.join(_ROOT, 'data', path)\n") + print "=============================================================================" print "Now install wflow using setup.py install and regenerate the documentation...." print "=============================================================================" Index: wflow-py/setup.py =================================================================== diff -u -rade12d9cc14ed638ec237211032e5b9a5ab241dc -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/setup.py (.../setup.py) (revision ade12d9cc14ed638ec237211032e5b9a5ab241dc) +++ wflow-py/setup.py (.../setup.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -49,7 +49,7 @@ license = "GPL", scripts=['Scripts/pcr2netcdf.py','Scripts/tss2xml.py','Scripts/wflow_subcatch.py', 'wflow/wflow_extract.py','wflow/wflow_sceleton.py', - 'wflow/wflow_gr4.py','wflow/plottss.py','wflow/wflow_wave.py', + 'wflow/wflow_gr4.py','wflow/plottss.py','wflow/wflow_wave.py', 'wflow/wflow_topoflex.py', 'wflow/wflow_cqf.py','wflow/wflow_floodmap.py','wflow/wflow_upscale.py', 'wflow/wflow_fit.py','wflow/wflow_adapt.py','wflow/wflow_delwaq.py', 'Scripts/wflow_prepare_step1.py','Scripts/wflow_prepare_step2.py', Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r976884e95a9d9b851dfb73172b3c7f6af0637cd7 -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 976884e95a9d9b851dfb73172b3c7f6af0637cd7) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -2,15 +2,14 @@ __version__="1.0.master" __release__="1.0.master.1" __versionnr__="1.0.1" -__build__="2016-11-22 13:23:54.540000" +__build__="2016-11-22 13:55:48.455000" import osgeo.gdal as gdal -import os, sys +import os, sys if hasattr(sys, "frozen"): _ROOT = os.path.abspath(os.path.dirname(__file__)).split("library.zip")[0] os.environ['GDAL_DATA'] = os.path.join(_ROOT,'gdal-data') else: _ROOT = os.path.abspath(os.path.dirname(__file__)) - def get_data(path): - return os.path.join(_ROOT, 'data', path) \ No newline at end of file + return os.path.join(_ROOT, 'data', path) Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r3cbea543529d8f59cc90fcb36811a67db6a5c53b -r8baae3166e06d7602585c17aac8a1d012aef06e6 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 3cbea543529d8f59cc90fcb36811a67db6a5c53b) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 8baae3166e06d7602585c17aac8a1d012aef06e6) @@ -230,7 +230,7 @@ self.filename = {} self.statvarname = {} - def addstat (self, name, mode='mean', points=30, filename=None): + def addstat(self, name, mode='mean', points=30, filename=None): """ :param name: @@ -505,7 +505,6 @@ self.logger.error("Variable change string (apply_timestep) could not be executed: " + execstr) if self._userModel()._inInitial(): - for cmdd in self.modelparameters_changes_once: execstr = cmdd + " = " + self.modelparameters_changes_once[cmdd] try: @@ -1098,6 +1097,10 @@ pts = int(self._userModel().config.get("rollingmean", thisvar)) self.onlinestat.addstat(thisvarnoself,points=pts) + # and set the var names + for key in self.onlinestat.statvarname: + setattr(self._userModel(), self.onlinestat.statvarname[key], self.TheClone * 0.0) + # Fill the summary (stat) list from the ini file self.statslst = [] _type = wf_sumavg(None)