Index: wflow-py/wflow/wflow_topoflex.py =================================================================== diff -u -r8c3b8b94c7d836e6330805b11cbb9ea9ae7b083f -r91c99a6733ec8f2f5854f7603e4dfed67d0ad19c --- wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 8c3b8b94c7d836e6330805b11cbb9ea9ae7b083f) +++ wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 91c99a6733ec8f2f5854f7603e4dfed67d0ad19c) @@ -1,24 +1,22 @@ #!/usr/bin/python """ -Definition of the wflow_sceleton model. +Definition of the wflow_topoflex model. --------------------------------------- This simple model calculates soil temperature using air temperature as a forcing. Usage: -wflow_sceleton -C case -R Runid -c inifile +wflow_topoflex -C case -R Runid -c inifile -C: set the name of the case (directory) to run -R: set the name runId within the current case -c name of the config file (in the case directory) -$Author: schelle $ -$Id: wflow_sceleton.py 898 2014-01-09 14:47:06Z schelle $ -$Rev: 898 $ + """ import wflow.reservoir_Si as reservoir_Si @@ -852,12 +850,8 @@ myModel = WflowModel(wflow_cloneMap, caseName,runId,configfile) dynModelFw = wf_DynamicFramework(myModel, _lastTimeStep,firstTimestep=_firstTimeStep,datetimestart=starttime) - dynModelFw.createRunId(NoOverWrite=NoOverWrite,logfname=LogFileName,level=loglevel,doSetupFramework=False) - print str(dynModelFw.DT) + dynModelFw.createRunId(NoOverWrite=NoOverWrite,logfname=LogFileName,level=loglevel,model='wflow_topoflex',doSetupFramework=False) - myModel = WflowModel(wflow_cloneMap, caseName, runId, configfile) - dynModelFw = wf_DynamicFramework(myModel, _lastTimeStep, firstTimestep=_firstTimeStep) - dynModelFw.createRunId(NoOverWrite=False, level=logging.DEBUG) for o, a in opts: if o == '-P': @@ -887,7 +881,7 @@ if o == '-R': runId = a if o == '-W': configset(myModel.config, 'model', 'waterdem', '1', overwrite=True) - + dynModelFw.setupFramework() dynModelFw._runInitial() dynModelFw._runResume() dynModelFw._runDynamic(_firstTimeStep, _lastTimeStep)