Index: examples/openstreams_w3ra_usa/outstate/DrySnow1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/DrySnow2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/FreeWater1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/FreeWater2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/LAI1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/LAI2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Mleaf1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Mleaf2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/S01.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/S02.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Sd1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Sd2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Sg.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Sr.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Ss1.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/outstate/Ss2.map =================================================================== diff -u -r46a00d19e5088c712abe2ee5ddc9d5cd32bc4387 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 Binary files differ Index: examples/openstreams_w3ra_usa/wflow_W3RA.ini =================================================================== diff -u -r368a19849555f5d349fdb349010530b3e7207d95 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 --- examples/openstreams_w3ra_usa/wflow_W3RA.ini (.../wflow_W3RA.ini) (revision 368a19849555f5d349fdb349010530b3e7207d95) +++ examples/openstreams_w3ra_usa/wflow_W3RA.ini (.../wflow_W3RA.ini) (revision 581f7ef740683f20ecabb30a6e35b8c23025a4d4) @@ -53,7 +53,7 @@ TMAX=0,3 TMIN=0,3 PRECIP=0,4 -WINDSPEED=0,5 +#WINDSPEED=0,5 AIRPRESS=0,5 [inputmapstacks] Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -rb62f2744579dcd9ef1e9033d0cbd32ac2cf4f007 -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision b62f2744579dcd9ef1e9033d0cbd32ac2cf4f007) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 581f7ef740683f20ecabb30a6e35b8c23025a4d4) @@ -544,12 +544,12 @@ self._userModel().logger.info("Adding " + par.name + " to model.") tblname = os.path.join(self._userModel().Dir, par.stack + "_" + str(self._userModel().currentStep)) + # Only added a new table if available if os.path.exists(tblname): theparmap = self.readtblFlexDefault(tblname, par.default, *par.lookupmaps) setattr(self._userModel(), par.name, theparmap) - else: - self._userModel().logger.debug(tblname + " not available for this step, using previous value.") + self.setviaAPI = {} Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -rfef6928683af218c4b3e7a26df6599dfe2add99d -r581f7ef740683f20ecabb30a6e35b8c23025a4d4 --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision fef6928683af218c4b3e7a26df6599dfe2add99d) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 581f7ef740683f20ecabb30a6e35b8c23025a4d4) @@ -326,7 +326,7 @@ wflow_riverwidth = configget(self.config, "model", "wflow_riverwidth", "staticmaps/wflow_riverwidth.map") wflow_floodplainwidth = configget(self.config, "model", "wflow_floodplainwidth", "staticmaps/wflow_floodplainwidth.map") wflow_bankfulldepth = configget(self.config, "model", "wflow_bankfulldepth", "staticmaps/wflow_bankfulldepth.map") - wflow_floodplaindist = configget(self.config, "model", "wflow_bankfulldepth", "staticmaps/wflow_floodplaindist.map") + wflow_floodplaindist = configget(self.config, "model", "wflow_floodplaindist", "staticmaps/wflow_floodplaindist.map") wflow_landuse = configget(self.config, "model", "wflow_landuse", "staticmaps/wflow_landuse.map") wflow_soil = configget(self.config, "model", "wflow_soil", "staticmaps/wflow_soil.map")