Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r7a38cc365cec4fded5972d8156b663601f2640ae -rf993e86195acdd3995323e5a06d487543c8fec42 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 7a38cc365cec4fded5972d8156b663601f2640ae) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision f993e86195acdd3995323e5a06d487543c8fec42) @@ -1078,7 +1078,6 @@ #self.oscv[self.samplenamecsv[a]].writestep(tmpvar, a, timestep=self.DT.currentTimeStep,dtobj=self.DT.currentDateTime) if found: - self.logger.info(self.varnamecsv[a]) self.oscv[self.samplenamecsv[a]].writestep(tmpvar, a, timestep=self.DT.currentTimeStep) Index: wflow-py/wflow/wflow_hbv.py =================================================================== diff -u -r42fd01a5e3fcb6d0fa9f8f9880c74cd282dc0d0f -rf993e86195acdd3995323e5a06d487543c8fec42 --- wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision 42fd01a5e3fcb6d0fa9f8f9880c74cd282dc0d0f) +++ wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision f993e86195acdd3995323e5a06d487543c8fec42) @@ -665,10 +665,14 @@ :var self.ToCubic: Mutiplier to convert mm to m^3/s for fluxes """ + self.logger.debug("Step: " + str(int(self.currentStep)) + "/" + str(int(self._d_nrTimeSteps))) + self.thestep = self.thestep + 1 + self.wf_updateparameters() # read forcing an dynamic parameters - self.Precipitation = max(0.0,self.Precipitation) * self.Pcorr + self.Precipitation = max(0.0,self.Precipitation) - #self.Precipitation=cover(self.wf_readmap(self.P_mapstack,0.0),0.0) * self.Pcorr + # Hack for afghanistan project + self.Precipitation=cover(self.wf_readmap(self.P_mapstack,0.0),0.0) * self.Pcorr #self.PotEvaporation=cover(self.wf_readmap(self.PET_mapstack,0.0),0.0) #self.Inflow=cover(self.wf_readmap(self.Inflow_mapstack,0.0,verbose=False),0.0) # These ar ALWAYS 0 at present!!! @@ -706,6 +710,7 @@ InSoil = max(self.FreeWater-MaxFreeWater,0.0) #abundant water in snow pack which goes into soil self.FreeWater=self.FreeWater-InSoil RainAndSnowmelt = RainFall + self.SnowMelt + # ADDED BY MARK/LAUREN: CALCULATE SNOW COVER AREA self.SnowCover = ifthenelse(self.DrySnow >0, scalar(1), scalar(0)) self.NrCell= areatotal(self.SnowCover,self.TopoId) @@ -934,7 +939,6 @@ 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) - for o, a in opts: if o == '-P':