Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r059f8f8f9f823ea6bdd45447a640c989b3b85b5d -r4fa2d50e688b999970412bf97fd466824b318b02 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 059f8f8f9f823ea6bdd45447a640c989b3b85b5d) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 4fa2d50e688b999970412bf97fd466824b318b02) @@ -254,6 +254,7 @@ self._addMethodToClass(self.wf_supplyVariableNamesAndRoles) self._addMethodToClass(self.wf_updateparameters) self._addAttributeToClass("ParamType", self.ParamType) + self._addAttributeToClass("timestepsecs", self.timestepsecs) if firstTimestep == 0: firstTimestep = 1 @@ -1135,7 +1136,6 @@ exec "self._userModel()." + mapname + " = arpcr" return 0 - # TODO: add getrowcol def wf_setValueRowCol(self, mapname, value, row, col): """ @@ -2001,7 +2001,7 @@ assert path is not "" if self._userModel()._inDynamic(): - if self.ncfile != "None": + if 'None' not in self.ncfile: retval, succ = self.NcInput.gettimestep(self._userModel().currentTimeStep(), self.logger, var=varname) if succ: return retval @@ -2020,7 +2020,7 @@ return scalar(default) elif self._userModel()._inInitial(): - if self.ncfilestatic is not 'None': + if 'None' not in self.ncfilestatic: retval, succ = self.NcInputStatic.gettimestep(1, self.logger, var=varname) if succ: return retval @@ -2061,7 +2061,7 @@ sys.exit(1) return scalar(default) else: # Assuming we are in pre-or post loop within the framwork - if self.ncfilestatic is not 'None': + if "None" not in self.ncfilestatic: retval, succ = self.NcInputStatic.gettimestep(1, self.logger, var=varname) if succ: return retval