Index: wflow/reservoir_Sa.py =================================================================== diff -u -ra9498adee6baab0a0abaa331041be8948510167b -r2d4109756d8104a5b6868028e14637fe1d03cfea --- wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision a9498adee6baab0a0abaa331041be8948510167b) +++ wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision 2d4109756d8104a5b6868028e14637fe1d03cfea) @@ -14,7 +14,7 @@ List all function versions """ - +import pcraster as pcr try: from wflow.wf_DynamicFramework import * except ImportError: @@ -746,7 +746,7 @@ self.Fa1 = pcr.ifthenelse( self.SaN > 0, self.Fmin[k] - + (self.Fmax[k] - self.Fmin[k]) * e ** (-self.decF[k] * (1 - self.SaN)), + + (self.Fmax[k] - self.Fmin[k]) * pcr.exp((-self.decF[k] * (1 - self.SaN))), 0, ) Index: wflow/wflow_topoflex.py =================================================================== diff -u -r327cf67207b7d3dfb5a3fecab60c9706a313f1f5 -r2d4109756d8104a5b6868028e14637fe1d03cfea --- wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 327cf67207b7d3dfb5a3fecab60c9706a313f1f5) +++ wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 2d4109756d8104a5b6868028e14637fe1d03cfea) @@ -612,11 +612,11 @@ self.LandUse = pcr.ordinal( self.wf_readmap(os.path.join(self.Dir, wflow_landuse), 0.0, fail=True) ) #: Map with lan-use/cover classes - self.LandUse = pcr.cover(self.LandUse, pcr.ordinal(ordinal(subcatch) > 0)) + self.LandUse = pcr.cover(self.LandUse, pcr.ordinal(pcr.ordinal(subcatch) > 0)) self.Soil = pcr.ordinal( self.wf_readmap(os.path.join(self.Dir, wflow_soil), 0.0, fail=True) ) #: Map with soil classes - self.Soil = pcr.cover(self.Soil, pcr.ordinal(ordinal(subcatch) > 0)) + self.Soil = pcr.cover(self.Soil, pcr.ordinal(pcr.ordinal(subcatch) > 0)) self.TopoId = pcr.ifthen(pcr.scalar(self.TopoId) > 0, self.TopoId) self.surfaceArea = pcr.scalar( pcr.readmap(os.path.join(self.Dir, wflow_surfaceArea))