Index: wflow-py/make_wflow_exe.py =================================================================== diff -u -r05a6a3393987718e8ef1b08090a521fda7fae548 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/make_wflow_exe.py (.../make_wflow_exe.py) (revision 05a6a3393987718e8ef1b08090a521fda7fae548) +++ wflow-py/make_wflow_exe.py (.../make_wflow_exe.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -6,6 +6,7 @@ nrbits = str(ctypes.sizeof(ctypes.c_voidp) * 8) + f = Freezer("Wflow"+MVERSION+'-'+nrbits) f.addScript("wflow/__init__.py") f.addScript("wflow/wflow_sbm.py") @@ -15,6 +16,7 @@ f.addScript("wflow/wflow_wave.py") f.addScript("wflow/wflow_gr4.py") f.addScript("wflow/wflow_floodmap.py") +#f.addScript("wflow/plottss.py") f.addScript("Scripts/wflow_prepare_step1.py") f.addScript("Scripts/wflow_prepare_step2.py") #f.addScript("wflow/wflow_fit.py") # Does not work becuse of QT Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -1,3 +1,3 @@ -__all__ = ["wflow_funcs","wflow_adapt","wflow_lib","pcrut","wf_DynamicFramework","wf_Timeoutput","stats"] +__all__ = ["wflow_funcs","wflow_adapt","wflow_lib","pcrut","wf_DynamicFramework","stats"] __version__="1.0" -__release__="1.0RC1" \ No newline at end of file +__release__="1.0RC2" \ No newline at end of file Index: wflow-py/wflow/plottss.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/wflow/plottss.py (.../plottss.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/wflow/plottss.py (.../plottss.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -39,7 +39,6 @@ - def usage(*args): sys.stdout = sys.stderr for msg in args: print msg Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -23,7 +23,7 @@ import numpy import ConfigParser -from wf_Timeoutput import * +#from wf_Timeoutput import * import pcrut import shutil, glob import sys Index: wflow-py/wflow/wflow_snow.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -353,11 +353,6 @@ self.logger.info("Create timeseries outputs...") toprinttss = configsection(self.config,'outputtss') - for a in toprinttss: - tssName = self.Dir + "/" + self.runId + "/" + self.config.get("outputtss",a) - estr = "self." + self.config.get("outputtss",a) + "Tss=wf_TimeoutputTimeseries('" + tssName + "', self, self.OutputId,noHeader=False)" - self.logger.info("Creating tss output: " + a + "(" + self.config.get('outputtss',a) + ")") - exec estr # Save some summary maps self.logger.info("Saving summary maps...") @@ -461,20 +456,10 @@ # Get rest from ini file - toprinttss = configsection(self.config,'outputtss') - - for a in toprinttss: - estr = "self." + self.config.get("outputtss",a) + "Tss.sample(" + a +")" - eval(estr) - # Print .ini defined outputmaps per timestep - toprint = configsection(self.config,'outputmaps') - for a in toprint: - eval("self.report(" + a + ", self.Dir + \"/\" + self.runId + \"/outmaps/" + self.config.get("outputmaps",a) +"\")") - # The main function is used to run the program from the command line def main(): Index: wflow-py/wflow/wflow_wave.py =================================================================== diff -u -r9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42 -r6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d --- wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision 9dd1a78b1a2e6aa0e67e970d6235e4923b8bfc42) +++ wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision 6d0167e9bc24d8ed8afe4d6fdfb09e539314cb6d) @@ -374,8 +374,6 @@ # Make seperate LDD for Dynamic Wave self.LddIn= lddrepair(ifthen(boolean(self.DynRiver),self.Ldd)) - self.rundynTss=wf_TimeoutputTimeseries(self.Dir + "/" + self.runId + "/rundyn",self, self.OutputLoc,noHeader=False) - self.levdynTss=wf_TimeoutputTimeseries(self.Dir + "/" + self.runId + "/levdyn",self, self.OutputLoc,noHeader=False) self.crtsum = self.ZeroMap