Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r0c107ad8319af1405fc28d9a192a0d6aced12bdb -r740bbac5af36b92bf4eee534d79267073205edd2 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 0c107ad8319af1405fc28d9a192a0d6aced12bdb) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 740bbac5af36b92bf4eee534d79267073205edd2) @@ -585,6 +585,7 @@ :return: """ + self.framework_setup = True caseName = self._userModel().caseName runId = self._userModel().runId @@ -844,9 +845,10 @@ if hasattr(self._userModel(),'default_summarymaps'): for a in self._userModel().default_summarymaps(): b = a.replace('self.','') - pcrmap = getattr(self._userModel(),b) - #report( pcrmap , os.path.join(self._userModel().Dir, self._userModel().runId, "outsum", b + ".map" )) - self.reportStatic( pcrmap , os.path.join(self._userModel().Dir, self._userModel().runId, "outsum", b + ".map" ), style=1) + if hasattr(self._userModel(),b): + pcrmap = getattr(self._userModel(),b) + #report( pcrmap , os.path.join(self._userModel().Dir, self._userModel().runId, "outsum", b + ".map" )) + self.reportStatic( pcrmap , os.path.join(self._userModel().Dir, self._userModel().runId, "outsum", b + ".map" ), style=1) # These are the ones in the _sum _average etc sections for a in range(0,len(self.statslst)): @@ -1517,10 +1519,10 @@ gets the end time of the model run :return: current time as seconds since epoch """ + seconds_since_epoch = calendar.timegm(self.datetime_laststep.utctimetuple()) - seconds_since_epoch = calendar.timegm(self.datetime_firststep.utctimetuple()) - return seconds_since_epoch + (self._d_lastTimestep - self._d_firstTimestep) * self._userModel().timestepsecs + return seconds_since_epoch def wf_supplyStartTime(self): """ @@ -1539,10 +1541,15 @@ Output: - current model time (since start of the run) - """ - seconds_since_epoch = calendar.timegm(self.currentdatetime.utctimetuple()) + if hasattr(self._userModel(),"currentdatetime"): + dtt = self._userModel().currentdatetime + else: + dtt = self.currentdatetime + + seconds_since_epoch = calendar.timegm(dtt.utctimetuple()) + return seconds_since_epoch def wf_supplyEpoch(self): @@ -1813,7 +1820,7 @@ if gzipit: Gzip(path,storePath=True) else: - self.NcOutput.savetimestep( self._userModel().currentTimeStep(),variable,var=name,name=longname) + self.NcOutput.savetimestep(self._userModel().currentTimeStep(),variable,var=name,name=longname) elif self.outputFormat == 2: numpy.savez(path,pcr2numpy(variable,-999))