Index: examples/wflow_rhine_sbm/wflow_sbm.ini =================================================================== diff -u -rd4aa0ad9eab754ff308b757c50867589c8121785 -r5146577206d9aab9bde79b912dbe038515b57bb7 --- examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision d4aa0ad9eab754ff308b757c50867589c8121785) +++ examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 5146577206d9aab9bde79b912dbe038515b57bb7) @@ -29,11 +29,13 @@ [run] # either a runinfo file or a start and end-time are required -#runinfofile=runinfo.xml +#runinfo=runinfo.xml starttime= 1995-01-31 00:00:00 endtime= 1995-02-28 00:00:00 # required, base timestep of the model timestepsecs = 86400 +#start model with cold state +reinit=1 # Model parameters and settings [model] Index: wflow-py/wflow/bmimodel.py =================================================================== diff -u --- wflow-py/wflow/bmimodel.py (revision 0) +++ wflow-py/wflow/bmimodel.py (revision 5146577206d9aab9bde79b912dbe038515b57bb7) @@ -0,0 +1,4 @@ +# Simple script to link to python wflow bmi models + + + Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -rd0044846dd4efdea68088bbb00a6cac2f83a35a7 -r5146577206d9aab9bde79b912dbe038515b57bb7 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision d0044846dd4efdea68088bbb00a6cac2f83a35a7) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 5146577206d9aab9bde79b912dbe038515b57bb7) @@ -21,7 +21,8 @@ """ #TODO: rmove most exec statements and replace by getattr - +#TODO: Remove command-line options from models such as -F that is now in the ini + import osgeo.gdal as gdal from wflow.wf_netcdfio import * @@ -246,6 +247,7 @@ self.exchnageitems = wf_exchnageVariables() self.setQuiet(True) + self.reinit=0 self._d_model = userModel self._testRequirements() self.timestepsecs = timestepsecs @@ -406,6 +408,10 @@ self.ncfile = configget(self._userModel().config,'framework','netcdfinput',"None") self.ncoutfile = configget(self._userModel().config,'framework','netcdfoutput',"None") + + # Set teh re-init hint fro the local model + self.reinit = int(configget(self._userModel().config,'run','reinit',str(self.reinit))) + self._userModel().reinit = self.reinit # Now finally set the start end time. First check if set in ini otherwise check if the ini defines # a runinfo file st = configget(self._userModel().config,'run','starttime',"None") @@ -1567,4 +1573,4 @@ def setQuiet(self, quiet): self._d_quiet = quiet - self._d_quietProgressDots = quiet + self._d_quietProgressDots = quiet Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -r5ad32c678c988e1737702a66b461c575c33441ff -r5146577206d9aab9bde79b912dbe038515b57bb7 --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 5ad32c678c988e1737702a66b461c575c33441ff) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 5146577206d9aab9bde79b912dbe038515b57bb7) @@ -70,9 +70,6 @@ from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * - - -#import scipy import ConfigParser Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r45538220e92828b746de290e67509131e9a61373 -r5146577206d9aab9bde79b912dbe038515b57bb7 --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 45538220e92828b746de290e67509131e9a61373) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 5146577206d9aab9bde79b912dbe038515b57bb7) @@ -105,9 +105,6 @@ from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * - - -#import scipy import ConfigParser