Index: doc/release_notes.rst =================================================================== diff -u -rd08f85b38e8de675a44c32721dd27a8818635b50 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- doc/release_notes.rst (.../release_notes.rst) (revision d08f85b38e8de675a44c32721dd27a8818635b50) +++ doc/release_notes.rst (.../release_notes.rst) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -11,6 +11,7 @@ + FirstZoneCapacity -> SoilWaterCapacity + FirstZoneFlux -> SatWaterFlux + FirstZoneDepth -> SatWaterDepth ++ [model]reinit moved to [run]reinit (same for fewsrun) in all models 2016.03 Index: wflow-py/UnitTests/wflow_routing/wflow_routing.ini =================================================================== diff -u -rcd5aba82922626ce43876518171777f023072194 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/UnitTests/wflow_routing/wflow_routing.ini (.../wflow_routing.ini) (revision cd5aba82922626ce43876518171777f023072194) +++ wflow-py/UnitTests/wflow_routing/wflow_routing.ini (.../wflow_routing.ini) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -14,6 +14,7 @@ #endtime= 1995-02-28 00:00:00 # required, base timestep of the model timestepsecs = 86400 +reinit=1 # Model parameters and settings [model] Index: wflow-py/wflow/wflow_cqf.py =================================================================== diff -u -r11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_cqf.py (.../wflow_cqf.py) (revision 11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3) +++ wflow-py/wflow/wflow_cqf.py (.../wflow_cqf.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -306,8 +306,8 @@ self.scalarInput = int(configget(self.config,"model","ScalarInput","0")) self.Tslice = int(configget(self.config,"model","Tslice","1")) self.interpolMethod = configget(self.config,"model","InterpolationMethod","inv") - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.OverWriteInit = int(configget(self.config,"model","OverWriteInit","0")) self.updating = int(configget(self.config,"model","updating","0")) self.updateFile = configget(self.config,"model","updateFile","no_set") Index: wflow-py/wflow/wflow_floodmap.py =================================================================== diff -u -r9d6d3f02533e3452466d6115f29c905c9eb646f2 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision 9d6d3f02533e3452466d6115f29c905c9eb646f2) +++ wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -204,8 +204,8 @@ #: for a parameter but it can be overwritten by the uses in the ini file. self.timestepsecs = int(configget(self.config,'model','timestepsecs','86400')) self.maxdist = float(configget(self.config,'model','maxflooddist','1E31')) - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.wf_updateparameters() Index: wflow-py/wflow/wflow_gr4.py =================================================================== diff -u -rbdd2b962a90dd8a3b47f0a47506c29092438c0c8 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_gr4.py (.../wflow_gr4.py) (revision bdd2b962a90dd8a3b47f0a47506c29092438c0c8) +++ wflow-py/wflow/wflow_gr4.py (.../wflow_gr4.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -258,8 +258,8 @@ self.timestepsecs = int(configget(self.config,'model','timestepsecs','3600')) self.basetimestep=3600 - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.OverWriteInit = int(configget(self.config,"model","OverWriteInit","0")) self.SaveMapDir = self.Dir + "/" + self.runId + "/outmaps" self.TEMP_mapstack=self.Dir + configget(self.config,"inputmapstacks","Temperature","/inmaps/TEMP") Index: wflow-py/wflow/wflow_hbv.py =================================================================== diff -u -r32ef34c05a505cf391a132636c035b99789a626b -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision 32ef34c05a505cf391a132636c035b99789a626b) +++ wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -318,8 +318,8 @@ self.scalarInput = int(configget(self.config,"model","ScalarInput","0")) self.Tslice = int(configget(self.config,"model","Tslice","1")) self.interpolMethod = configget(self.config,"model","InterpolationMethod","inv") - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.OverWriteInit = int(configget(self.config,"model","OverWriteInit","0")) self.updating = int(configget(self.config,"model","updating","0")) self.updateFile = configget(self.config,"model","updateFile","no_set") Index: wflow-py/wflow/wflow_hbvl.py =================================================================== diff -u -rd659dd80702515f254fde0a3baae4600f4faac52 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_hbvl.py (.../wflow_hbvl.py) (revision d659dd80702515f254fde0a3baae4600f4faac52) +++ wflow-py/wflow/wflow_hbvl.py (.../wflow_hbvl.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -266,8 +266,8 @@ # Set and get defaults from ConfigFile here ################################### self.interpolMethod = configget(self.config,"model","InterpolationMethod","inv") - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.OverWriteInit = int(configget(self.config,"model","OverWriteInit","0")) self.intbl = configget(self.config,"model","intbl","intbl") Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -r185f591916dbc30e2a907ec663e071272d1edf80 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 185f591916dbc30e2a907ec663e071272d1edf80) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -242,8 +242,8 @@ # Set and get defaults from ConfigFile here ################################### self.maxitsupply = int(configget(self.config, "model", "maxitsupply", "5")) # max number of iteration in abstraction calculations - self.reinit = int(configget(self.config, "model", "reinit", "0")) - self.fewsrun = int(configget(self.config, "model", "fewsrun", "0")) + self.reinit = int(configget(self.config, "run", "reinit", "0")) + self.fewsrun = int(configget(self.config, "run", "fewsrun", "0")) self.OverWriteInit = int(configget(self.config, "model", "OverWriteInit", "0")) self.updating = int(configget(self.config, "model", "updating", "0")) self.updateFile = configget(self.config, "model", "updateFile", "no_set") Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r3b32dc5146b05e02870117344a8f8afc117baee0 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 3b32dc5146b05e02870117344a8f8afc117baee0) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -449,8 +449,8 @@ # Set and get defaults from ConfigFile here ################################### self.Tslice = int(configget(self.config, "model", "Tslice", "1")) - self.reinit = int(configget(self.config, "model", "reinit", "0")) - self.fewsrun = int(configget(self.config, "model", "fewsrun", "0")) + self.reinit = int(configget(self.config, "run", "reinit", "0")) + self.fewsrun = int(configget(self.config, "run", "fewsrun", "0")) self.OverWriteInit = int(configget(self.config, "model", "OverWriteInit", "0")) self.updating = int(configget(self.config, "model", "updating", "0")) self.updateFile = configget(self.config, "model", "updateFile", "no_set") Index: wflow-py/wflow/wflow_sbm2.py =================================================================== diff -u -r4efaa4c2e535431943e073dca2c8a31a334f8a77 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_sbm2.py (.../wflow_sbm2.py) (revision 4efaa4c2e535431943e073dca2c8a31a334f8a77) +++ wflow-py/wflow/wflow_sbm2.py (.../wflow_sbm2.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -497,8 +497,8 @@ # Set and get defaults from ConfigFile here ################################### self.Tslice = int(configget(self.config, "model", "Tslice", "1")) - self.reinit = int(configget(self.config, "model", "reinit", "0")) - self.fewsrun = int(configget(self.config, "model", "fewsrun", "0")) + self.reinit = int(configget(self.config, "run", "reinit", "0")) + self.fewsrun = int(configget(self.config, "run", "fewsrun", "0")) self.OverWriteInit = int(configget(self.config, "model", "OverWriteInit", "0")) self.updating = int(configget(self.config, "model", "updating", "0")) self.updateFile = configget(self.config, "model", "updateFile", "no_set") Index: wflow-py/wflow/wflow_snow.py =================================================================== diff -u -r11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision 11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3) +++ wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -249,8 +249,8 @@ self.scalarInput = int(configget(self.config,"model","ScalarInput","0")) self.Tslice = int(configget(self.config,"model","Tslice","1")) self.interpolMethod = configget(self.config,"model","InterpolationMethod","inv") - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) self.OverWriteInit = int(configget(self.config,"model","OverWriteInit","0")) self.MassWasting = int(configget(self.config,"model","MassWasting","0")) self.sCatch = int(configget(self.config,"model","sCatch","0")) Index: wflow-py/wflow/wflow_topoflex.py =================================================================== diff -u -rb0a0649fbc4d5ed289c09f5beffbd40a711e95ca -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision b0a0649fbc4d5ed289c09f5beffbd40a711e95ca) +++ wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -285,7 +285,7 @@ self.InputSeries = int(configget(self.config, "model", "InputSeries", "1")) # forcing data in maps (0) or timeseries (1) self.reinit = int(configget(self.config, - "model", "reinit", "0")) + "run", "reinit", "0")) self.intbl = configget(self.config, "model","intbl","intbl") Index: wflow-py/wflow/wflow_wave.py =================================================================== diff -u -r11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3 -r2e4b13843097b6d76d6b830c4a1df423225b9cfd --- wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision 11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3) +++ wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd) @@ -300,8 +300,8 @@ #: Note the use of the configget functione below. This way you sepcify a default #: for a parameter but it can be overwritten by the uses in the ini file. self.timestepsecs = int(configget(self.config,'model','timestepsecs','86400')) - self.reinit = int(configget(self.config,"model","reinit","0")) - self.fewsrun = int(configget(self.config,"model","fewsrun","0")) + self.reinit = int(configget(self.config,"run","reinit","0")) + self.fewsrun = int(configget(self.config,"run","fewsrun","0")) Qname=configget(self.config,"inputmapstacks","Q","run") Hname=configget(self.config,"inputmapstacks","H","lev")