Index: wflow-py/Sandbox/wflow_w3ra_v2.py =================================================================== diff -u -rc608fc8c253256d1807960279242142f44a3ae4f -rb453c6a4d8b3776e590d513eb66272e01939f268 --- wflow-py/Sandbox/wflow_w3ra_v2.py (.../wflow_w3ra_v2.py) (revision c608fc8c253256d1807960279242142f44a3ae4f) +++ wflow-py/Sandbox/wflow_w3ra_v2.py (.../wflow_w3ra_v2.py) (revision b453c6a4d8b3776e590d513eb66272e01939f268) @@ -377,7 +377,7 @@ ChannelSurface = min(0,(0.007*self.Sr**0.75)) OpenWaterFrac = max(ChannelSurface, self.OpenWaterFrac) - !! HANDometric functions go here !! + # !! HANDometric functions go here !! #fsat = min(1.0,max(min(0.005,0.007*self.Sr**0.75),Sgfree/self.Sgref)) #Sghru = self.Sg @@ -445,7 +445,7 @@ # Maximum transpiration (4.3) Gsmax = self.Gs_scalar*self.cGsmax*self.Vc VPD = max(0,pes-pe) - fD = self.Cg./(1+VPD/self.D50) + fD = self.Cg/(1+VPD/self.D50) gs = fveg*fD*Gsmax ft = 1/(1+(keps/(1+keps))*ga/gs) Etmax = ft*self.E0 @@ -468,8 +468,8 @@ Eg0 = max(0,fsat-fwater)*self.FsoilEmax*max(0,self.Eeq-Et) Es = Es0 + Eg0 # Open water evaporation (4.7) - Erl = fw_local*self.FwaterE.*self.Ept - Err = (fwater-fw_local)*self.FwaterE.*self.Ept + Erl = fw_local*self.FwaterE*self.Ept + Err = (fwater-fw_local)*self.FwaterE*self.Ept Er = Erl + Err # Rainfall interception evaporation (4.2) @@ -600,7 +600,7 @@ # saturation case imap = (self.Sdmax-self.Sd-self.Kdsat)<=(Ds-Ud) Dd = ifthenelse(imap,self.Kdsat,Dd) - IFd = ifthenelse(imap,self.Sd-self.Sdmax-self.Kdsat+Ds-Ud),IFd) + IFd = ifthenelse(imap,self.Sd-self.Sdmax-self.Kdsat+Ds-Ud,IFd) Sd = ifthenselse(imap,self.Sdmax,Sd) # enforce mass balance (for numerical & rounding errors Sd = max(0, min(Sd,self.Sdmax))