Index: wflow-py/UnitTests/TestFrameWork.py
===================================================================
diff -u -r0d46ee66e7021b4c277c74f874d16ad34213879f -r2f1942d7b14dd5dcea85e74c126c2299b80e0579
--- wflow-py/UnitTests/TestFrameWork.py	(.../TestFrameWork.py)	(revision 0d46ee66e7021b4c277c74f874d16ad34213879f)
+++ wflow-py/UnitTests/TestFrameWork.py	(.../TestFrameWork.py)	(revision 2f1942d7b14dd5dcea85e74c126c2299b80e0579)
@@ -39,9 +39,9 @@
 
         my_data = wf.genfromtxt(os.path.join(caseName,runId,"tes.csv"), delimiter=',')
 
-        self.assertAlmostEquals(134.16633081436157,my_data[:,2].sum())
+        self.assertAlmostEquals(14.885358393192291,my_data[:,2].sum())
         my_data_mean = wf.genfromtxt(os.path.join(caseName, runId, "tes_mean_5.csv"), delimiter=',')
-        self.assertAlmostEquals(112.25376296043396, my_data_mean[:, 2].sum())
+        self.assertAlmostEquals(20.727288454771042, my_data_mean[:, 2].sum())
 
 
 if __name__ == '__main__':
Index: wflow-py/UnitTests/wflow_sceleton/outstate/TSoil.map
===================================================================
diff -u -re2336bc0557f4dec254c617f3bb9cd811721a2d8 -r2f1942d7b14dd5dcea85e74c126c2299b80e0579
Binary files differ
Index: wflow-py/_version.py
===================================================================
diff -u -r3a508f30cc2ef04feb5de467cba65a6301bec643 -r2f1942d7b14dd5dcea85e74c126c2299b80e0579
--- wflow-py/_version.py	(.../_version.py)	(revision 3a508f30cc2ef04feb5de467cba65a6301bec643)
+++ wflow-py/_version.py	(.../_version.py)	(revision 2f1942d7b14dd5dcea85e74c126c2299b80e0579)
@@ -1,4 +1,4 @@
 # This file is made by mkversion.py, do not edit!VERSION="1.0.master.1"
 MVERSION="1.0.master"
 NVERSION="1.0.1"
-BUILD="2017-06-13 10:10:58.703000"
+BUILD="2017-06-13 13:19:20.351000"
Index: wflow-py/wflow/__init__.py
===================================================================
diff -u -r3a508f30cc2ef04feb5de467cba65a6301bec643 -r2f1942d7b14dd5dcea85e74c126c2299b80e0579
--- wflow-py/wflow/__init__.py	(.../__init__.py)	(revision 3a508f30cc2ef04feb5de467cba65a6301bec643)
+++ wflow-py/wflow/__init__.py	(.../__init__.py)	(revision 2f1942d7b14dd5dcea85e74c126c2299b80e0579)
@@ -2,7 +2,7 @@
 __version__="1.0.master"
 __release__="1.0.master.1"
 __versionnr__="1.0.1"
-__build__="2017-06-13 10:10:58.703000"
+__build__="2017-06-13 13:19:20.351000"
 import osgeo.gdal as gdal
 
 import os, sys
Index: wflow-py/wflow/wflow_delwaq.py
===================================================================
diff -u -rae14ff9a295b33ac4a4d998707b549e1845e8b6b -r2f1942d7b14dd5dcea85e74c126c2299b80e0579
--- wflow-py/wflow/wflow_delwaq.py	(.../wflow_delwaq.py)	(revision ae14ff9a295b33ac4a4d998707b549e1845e8b6b)
+++ wflow-py/wflow/wflow_delwaq.py	(.../wflow_delwaq.py)	(revision 2f1942d7b14dd5dcea85e74c126c2299b80e0579)
@@ -51,10 +51,6 @@
         the kinematic wave function.
         Use multiple -S options to include multiple maps
     -s: Set the model timesteps in seconds (default 86400)
-    -F: if set the model 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. The runinfo.xml file should be located
-        in the inmaps directory of the case. 
     -c: Name of the wflow configuration file
     -n: Name of the wflow netCDF output file, expected in caseDir/runId/. If not
         present, mapstacks will be used.
@@ -1172,23 +1168,19 @@
     timestepsecs = 86400
     configfile = "wflow_sbm.ini"
     sourcesMap = []
-    fewsrun = False
     WriteAscii=False
     Write_Dynamic= False
     Write_Structure = True
     T0 = datetime.strptime("2000-01-01 00:00:00",'%Y-%m-%d %H:%M:%S')
 
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'adD:C:R:S:hT:F:s:O:A:jc:n:')
+        opts, args = getopt.getopt(sys.argv[1:], 'adD:C:R:S:hT:s:O:A:jc:n:')
     except getopt.error, msg:
         pcrut.usage(msg)
 
     nc_outmap_file = None
     
     for o, a in opts:
-        if o == '-F': 
-            runinfoFile = a
-            fewsrun = True
         if o == '-C': caseId = a
         if o == '-R': runId = a
         if o == '-D': dwdir = a
@@ -1213,10 +1205,7 @@
     
     timestepsecs = int(configget(config,"model","timestepsecs",str(timestepsecs)))
     
-    if fewsrun: 
-        timeSteps =  wflow_adapt.getTimeStepsfromRuninfo(runinfoFile,timestepsecs)
-        T0 =  wflow_adapt.getStartTimefromRuninfo(runinfoFile)
-        print timeSteps
+
     
     #: we need one delwaq calculation timesteps less than hydrology
     # timeSteps = timeSteps # need one more hydrological timestep as dw timestep