Index: wflow-py/wflow/wflow_w3ra.py =================================================================== diff -u -r37e269ce4338ed9cfba3e4e6b6720ed3af463818 -r2e4ba490c6194249f3b909728a756bfc0f68ea9a --- wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision 37e269ce4338ed9cfba3e4e6b6720ed3af463818) +++ wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision 2e4ba490c6194249f3b909728a756bfc0f68ea9a) @@ -108,9 +108,6 @@ #: function. self.wf_suspend(self.SaveDir + "/outstate/") - if self.fewsrun: - self.logger.info("Saving initial conditions for FEWS...") - self.wf_suspend(self.Dir + "/outstate/") def initial(self): @@ -163,7 +160,6 @@ self.Altitude=readmap(self.Dir + "/staticmaps/wflow_dem") - self.fewsrun = int(configget(self.config, "model", "fewsrun", "0")) self.latitude = ycoordinate(boolean(self.Altitude)) @@ -722,7 +718,7 @@ _lastTimeStep = 15 _firstTimeStep = 0 timestepsecs=86400 - fewsrun = False + wflow_cloneMap = 'wflow_subcatch.map' runinfoFile = "runinfo.xml" _NoOverWrite=False @@ -739,12 +735,9 @@ usage() return - opts, args = getopt.getopt(argv, 'C:S:T:c:s:R:F:') + opts, args = getopt.getopt(argv, 'C:S:T:c:s:R:') for o, a in opts: - if o == '-F': - runinfoFile = a - fewsrun = True if o == '-C': caseName = a if o == '-R': runId = a if o == '-c': configfile = a @@ -755,18 +748,9 @@ if (len(opts) <=1): usage() - if fewsrun: - ts = getTimeStepsfromRuninfo(runinfoFile, timestepsecs) - starttime = getStartTimefromRuninfo(runinfoFile) - if (ts): - _lastTimeStep = ts - _firstTimeStep = 1 - else: - print "Failed to get timesteps from runinfo file: " + runinfoFile - exit(2) - else: - starttime = dt.datetime(1990,01,01) + starttime = dt.datetime(1990,01,01) + if _lastTimeStep < _firstTimeStep: print "The starttimestep (" + str(_firstTimeStep) + ") is smaller than the last timestep (" + str( _lastTimeStep) + ")"