Index: wflow-py/wflow/pcrut.py =================================================================== diff -u -r67733b1d9414b2ed53b7c80ba2f90f43d58447a4 -r8e62145254bea78f01d01e69573753ba631ecef5 --- wflow-py/wflow/pcrut.py (.../pcrut.py) (revision 67733b1d9414b2ed53b7c80ba2f90f43d58447a4) +++ wflow-py/wflow/pcrut.py (.../pcrut.py) (revision 8e62145254bea78f01d01e69573753ba631ecef5) @@ -9,6 +9,7 @@ from math import * import sys import csv +from pcraster import* from pcraster import * @@ -29,6 +30,7 @@ """ #radlat = spatial(lat * ((2.0 * math.pi)/360.0)) #radlat = lat * (2.0 * math.pi)/360.0 + setglobaloption('degrees') radlat = spatial(lat) # pcraster cos/sin work in degrees! Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r368a19849555f5d349fdb349010530b3e7207d95 -r8e62145254bea78f01d01e69573753ba631ecef5 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 368a19849555f5d349fdb349010530b3e7207d95) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 8e62145254bea78f01d01e69573753ba631ecef5) @@ -776,14 +776,15 @@ self._update_time_from_DT() if rinfo_str != "None": self.DT.update(datetimestart=wflow_adapt.getStartTimefromRuninfo(rinfo), mode=self.runlengthdetermination) + self.DT.update(datetimeend=wflow_adapt.getEndTimefromRuninfo(rinfo), mode=self.runlengthdetermination) self._update_time_from_DT() # add one step to start time if it is the same s the state time #if self.skipfirsttimestep: # self.logger.debug("Skipping first timestep...") # self.DT.skiptime() self._userModel().currentdatetime = self.DT.currentDateTime - self.DT.update(datetimeend=wflow_adapt.getEndTimefromRuninfo(rinfo), mode=self.runlengthdetermination) + self.DT.update(timestepsecs=int(configget(self._userModel().config, 'run', 'timestepsecs', "86400")), mode=self.runlengthdetermination) self._update_time_from_DT() else: Index: wflow-py/wflow/wflow_bmi_combined.py =================================================================== diff -u -rfef6928683af218c4b3e7a26df6599dfe2add99d -r8e62145254bea78f01d01e69573753ba631ecef5 --- wflow-py/wflow/wflow_bmi_combined.py (.../wflow_bmi_combined.py) (revision fef6928683af218c4b3e7a26df6599dfe2add99d) +++ wflow-py/wflow/wflow_bmi_combined.py (.../wflow_bmi_combined.py) (revision 8e62145254bea78f01d01e69573753ba631ecef5) @@ -59,7 +59,7 @@ self.bmimodels = {} self.currenttimestep = 0 self.exchanges = [] - self.comp_sep = "." + self.comp_sep = "@" def __getmodulenamefromvar__(self,long_var_name): """ @@ -120,7 +120,7 @@ for item in self.exchanges: supplymodel = self.__getmodulenamefromvar__(item) if curmodel == supplymodel: - outofmodel = self.get_value(item) + outofmodel = self.get_value(item).copy() tomodel = self.config.get('exchanges',item) self.set_value(tomodel,outofmodel) @@ -209,7 +209,7 @@ for item in self.exchanges: supplymodel = self.__getmodulenamefromvar__(item) if curmodel == supplymodel: - outofmodel = self.get_value(item) + outofmodel = self.get_value(item).copy() tomodel = self.config.get('exchanges',item) self.set_value(tomodel,outofmodel)