Index: wflow-py/wflow/wflow_routing.py
===================================================================
diff -u -r2e4b13843097b6d76d6b830c4a1df423225b9cfd -r2e4ba490c6194249f3b909728a756bfc0f68ea9a
--- wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision 2e4b13843097b6d76d6b830c4a1df423225b9cfd)
+++ wflow-py/wflow/wflow_routing.py	(.../wflow_routing.py)	(revision 2e4ba490c6194249f3b909728a756bfc0f68ea9a)
@@ -27,10 +27,7 @@
     
     wflow_routing [-h][-v level][-F runinfofile][-L logfile][-C casename][-R runId]
           [-c configfile][-T last_step][-S first_step][-s seconds][-l loglevel]
-          
-    -F: if set wflow is expected to be run by FEWS. It will determine
-        the timesteps from the runinfo.xml file and save the output initial
-        conditions to an alternate location. Also set fewsrun=1 in the .ini file!
+
         
     -X: save state at the end of the run over the initial conditions at the start        
 
@@ -209,9 +206,6 @@
             self.logger.info("Saving initial conditions over start conditions...")
             self.wf_suspend(self.SaveDir + "/instate/")
 
-        if self.fewsrun:
-            self.logger.info("Saving initial conditions for FEWS...")
-            self.wf_suspend(self.Dir + "/outstate/")
 			
 
 
@@ -243,7 +237,6 @@
         self.maxitsupply = int(configget(self.config, "model", "maxitsupply", "5"))
         # max number of iteration in abstraction calculations
         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")
@@ -717,7 +710,6 @@
     _lastTimeStep = 0
     _firstTimeStep = 0
     LogFileName = "wflow.log"
-    fewsrun = False
     runinfoFile = "runinfo.xml"
     timestepsecs = 86400
     wflow_cloneMap = 'wflow_subcatch.map'
@@ -739,9 +731,6 @@
         pcrut.usage(msg)
 
     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
@@ -754,17 +743,8 @@
         if o == '-l': exec "loglevel = logging." + a
 
 
-    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(