Index: wflow-py/mkversion.py
===================================================================
diff -u -rc9d975a5a82cb34652cdc5d2ee9afd734c18d3c7 -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/mkversion.py	(.../mkversion.py)	(revision c9d975a5a82cb34652cdc5d2ee9afd734c18d3c7)
+++ wflow-py/mkversion.py	(.../mkversion.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -25,11 +25,6 @@
 a.write("__version__ = get_versions()['version']\n")
 a.write("del get_versions\n")
 
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
-
-
 print "============================================================================="
 print "Now install wflow using setup.py install and regenerate the documentation...."
 print "============================================================================="
Index: wflow-py/mkversion_buildserver.py
===================================================================
diff -u -rc9d975a5a82cb34652cdc5d2ee9afd734c18d3c7 -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/mkversion_buildserver.py	(.../mkversion_buildserver.py)	(revision c9d975a5a82cb34652cdc5d2ee9afd734c18d3c7)
+++ wflow-py/mkversion_buildserver.py	(.../mkversion_buildserver.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -25,11 +25,7 @@
 a.write("__version__ = get_versions()['version']\n")
 a.write("del get_versions\n")
 
-from ._version import get_versions
-__version__ = get_versions()['version']
-del get_versions
 
-
 print "============================================================================="
 print "Now install wflow using setup.py install and regenerate the documentation...."
 print "============================================================================="
Index: wflow-py/wflow/pcrglobwb/groundwater.py
===================================================================
diff -u -rbec706d676b364d4a89a4e7141382db4511fa485 -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/wflow/pcrglobwb/groundwater.py	(.../groundwater.py)	(revision bec706d676b364d4a89a4e7141382db4511fa485)
+++ wflow-py/wflow/pcrglobwb/groundwater.py	(.../groundwater.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -61,12 +61,12 @@
 
         return result
 
-    def __init__(self, iniItems,landmask,spinUp,Dir, cloneMap):
+    def __init__(self, iniItems,landmask,spinUp,Dir, staticmaps, cloneMap):
         object.__init__(self)
 
         self.cloneMap = cloneMap #iniItems.cloneMap
         self.tmpDir   = os.path.join(os.path.abspath(Dir),"tmp") #iniItems.tmpDir
-        self.inputDir = os.path.join(os.path.abspath(Dir),"staticmaps") #iniItems.globalOptions['inputDir']
+        self.inputDir = os.path.join(os.path.abspath(Dir),staticmaps) #iniItems.globalOptions['inputDir']
         self.landmask = landmask
 
         # configuration from the ini file
Index: wflow-py/wflow/pcrglobwb/landSurface.py
===================================================================
diff -u -rbec706d676b364d4a89a4e7141382db4511fa485 -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/wflow/pcrglobwb/landSurface.py	(.../landSurface.py)	(revision bec706d676b364d4a89a4e7141382db4511fa485)
+++ wflow-py/wflow/pcrglobwb/landSurface.py	(.../landSurface.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -108,13 +108,13 @@
         
 
 
-    def __init__(self,iniItems,landmask,Dir,cloneMap,startTime,initialState=None):
+    def __init__(self,iniItems,landmask,Dir,staticmaps,cloneMap,startTime,initialState=None):
         object.__init__(self)
 
         # clone map, temporary directory, absolute path of input directory, and landmask
         self.cloneMap = cloneMap #iniItems.cloneMap
         self.tmpDir   = os.path.join(os.path.abspath(Dir),"tmp") #iniItems.tmpDir
-        self.inputDir = os.path.join(os.path.abspath(Dir),"staticmaps") #iniItems.globalOptions['inputDir']
+        self.inputDir = os.path.join(os.path.abspath(Dir),staticmaps) #iniItems.globalOptions['inputDir']
         self.landmask = landmask
         self.startTime = startTime
 
Index: wflow-py/wflow/pcrglobwb/routing.py
===================================================================
diff -u -rbec706d676b364d4a89a4e7141382db4511fa485 -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/wflow/pcrglobwb/routing.py	(.../routing.py)	(revision bec706d676b364d4a89a4e7141382db4511fa485)
+++ wflow-py/wflow/pcrglobwb/routing.py	(.../routing.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -77,14 +77,14 @@
 
         return result
 
-    def __init__(self,iniItems,initialConditions,lddMap, Dir, cloneMap):
+    def __init__(self,iniItems,initialConditions,lddMap, Dir, staticmaps, cloneMap):
         object.__init__(self)
 
         self.lddMap = lddMap
 
         self.cloneMap =  cloneMap #iniItems.cloneMap
         self.tmpDir   = os.path.join(os.path.abspath(Dir),"tmp") #iniItems.tmpDir
-        self.inputDir = os.path.join(os.path.abspath(Dir),"staticmaps") #iniItems.globalOptions['inputDir']
+        self.inputDir = os.path.join(os.path.abspath(Dir),staticmaps) #iniItems.globalOptions['inputDir']
 
 
         # option to activate water balance check
Index: wflow-py/wflow/wflow_pcrglobwb.py
===================================================================
diff -u -rc0a8468f10e345deec6d446d5e8d11af217a8b7d -r2d84b2c3f986344e96a4fa357e54dd77fe817fe4
--- wflow-py/wflow/wflow_pcrglobwb.py	(.../wflow_pcrglobwb.py)	(revision c0a8468f10e345deec6d446d5e8d11af217a8b7d)
+++ wflow-py/wflow/wflow_pcrglobwb.py	(.../wflow_pcrglobwb.py)	(revision 2d84b2c3f986344e96a4fa357e54dd77fe817fe4)
@@ -182,14 +182,15 @@
 
   """
 
-  def __init__(self, cloneMap,Dir,RunDir,configfile):
+  def __init__(self, cloneMap,Dir,RunDir,configfile,staticmaps):
       DynamicModel.__init__(self)
 
       self.caseName = os.path.abspath(Dir)
-      self.clonemappath = os.path.join(os.path.abspath(Dir),"staticmaps",cloneMap)
-      setclone(self.clonemappath)
       self.runId = RunDir
       self.Dir = os.path.abspath(Dir)
+      self.staticmaps = os.path.join(self.Dir, staticmaps)
+      self.clonemappath = os.path.join(os.path.abspath(Dir),staticmaps,cloneMap)
+      setclone(self.clonemappath)
       self.configfile = configfile
       self.SaveDir = os.path.join(self.Dir,self.runId)         
       
@@ -342,21 +343,21 @@
       self.OverWriteInit = int(configget(self.config, "model", "OverWriteInit", "0"))
       
       initialState = None
-                 
+
       landmask = configget(self.config, "globalOptions", "landmask", "wflow_landmask.map")
       lddMap = configget(self.config, "routingOptions", "lddMap", "wflow_ldd.map")
       
-      wflow_landmask = self.wf_readmap(os.path.join(self.Dir,"staticmaps",landmask),0.0,fail=True)
-      wflow_ldd = ldd(self.wf_readmap(os.path.join(self.Dir,"staticmaps",lddMap),0.0,fail=True))
+      wflow_landmask = self.wf_readmap(os.path.join(self.staticmaps,landmask),0.0,fail=True)
+      wflow_ldd = ldd(self.wf_readmap(os.path.join(self.staticmaps,lddMap),0.0,fail=True))
       
       self.monthIdx = 0
       self.annuaIdx = 0
       
       startTime = self.wf_supplyStartDateTime()
             
-      self.landSurface = landSurface.LandSurface(self.config,wflow_landmask,self.Dir, self.clonemappath,startTime,initialState)
-      self.groundwater = groundwater.Groundwater(self.config,wflow_landmask,initialState,self.Dir, self.clonemappath)
-      self.routing = routing.Routing(self.config, initialState, wflow_ldd,self.Dir, self.clonemappath)
+      self.landSurface = landSurface.LandSurface(self.config,wflow_landmask,self.Dir,self.staticmaps, self.clonemappath,startTime,initialState)
+      self.groundwater = groundwater.Groundwater(self.config,wflow_landmask,initialState,self.Dir,self.staticmaps, self.clonemappath)
+      self.routing = routing.Routing(self.config, initialState, wflow_ldd,self.Dir,self.staticmaps, self.clonemappath)
       
       self.wf_updateparameters()
 
@@ -431,6 +432,7 @@
     caseName = "default_pcrglobwb"
     runId = "run_default"
     configfile="wflow_pcrglobwb.ini"
+    staticmaps = "staticmaps"
     LogFileName="wflow.log"
     _lastTimeStep = 0
     _firstTimeStep = 0
@@ -451,12 +453,11 @@
     ## Process command-line options                                        #
     ########################################################################
     try:
-        opts, args = getopt.getopt(argv, 'XL:hC:Ii:v:S:T:WR:u:s:EP:p:Xx:U:fOc:l:')
+        opts, args = getopt.getopt(argv, 'XL:hC:Ii:v:S:T:WR:u:s:EP:p:Xx:U:fOc:l:d:')
     except getopt.error, msg:
         pcrut.usage(msg)
 
     for o, a in opts:
-
         if o == '-C': caseName = a
         if o == '-R': runId = a
         if o == '-c': configfile = a
@@ -465,6 +466,7 @@
         if o == '-h': usage()
         if o == '-f': _NoOverWrite = 0
         if o == '-l': exec "loglevel = logging." + a
+        if o == '-d': staticmaps = a
 
 
     starttime = dt.datetime(1990,01,01)
@@ -474,7 +476,7 @@
             _lastTimeStep) + ")"
         usage()
 
-    myModel = WflowModel(wflow_cloneMap, caseName, runId, configfile)
+    myModel = WflowModel(wflow_cloneMap, caseName, runId, configfile, staticmaps)
     dynModelFw = wf_DynamicFramework(myModel, _lastTimeStep, firstTimestep=_firstTimeStep,datetimestart=starttime)
     dynModelFw.createRunId(NoOverWrite=_NoOverWrite, level=loglevel, logfname=LogFileName,model="wflow_pcrglobwb",doSetupFramework=False)