area calculation wflow_hbv

replaced self.reallength with self.xl and self.yl for cell area calculations, for lat lon this is more precise.

tests/test_wflow_hbv.py

@@ -66,7 +66,7 @@ def testapirun(self):
 
         my_data = np.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",")
         print("Checking  discharge ....")
-        self.assertAlmostEqual(1086.9438944498697, my_data[:, 2].mean(), places=4)
+        self.assertAlmostEqual(1045.9400254567465, my_data[:, 2].mean(), places=4)
 
 if __name__ == "__main__":
     unittest.main()

tests/test_wflow_hbv2.py

@@ -68,7 +68,7 @@ def testapirunhr(self):
 
         my_data = np.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",")
         print("Checking  discharge ....")
-        self.assertAlmostEqual(1811.1795022010804, my_data[:, 2].mean(), places=4)      
+        self.assertAlmostEqual(1671.0379650115967, my_data[:, 2].mean(), places=4)      
 
 if __name__ == "__main__":
     unittest.main()

wflow/wflow_hbv.py

@@ -893,10 +893,10 @@ def initial(self):
         Terrain_angle = pcr.scalar(pcr.atan(self.Slope))
         temp = (
             pcr.catchmenttotal(pcr.cover(1.0), self.TopoLdd)
-            * self.reallength
+            * self.xl
             * 0.001
             * 0.001
-            * self.reallength
+            * self.yl
         )
         self.QMMConvUp = pcr.cover(self.timestepsecs * 0.001) / temp
 
@@ -987,10 +987,10 @@ def initial(self):
         # pcr.report(self.reallength,"rl.map")
         # pcr.report(catchmentcells,"kk.map")
         self.QMMConv = self.timestepsecs / (
-            self.reallength * self.reallength * 0.001
+            self.xl * self.yl * 0.001
         )  # m3/s --> mm
         self.ToCubic = (
-            self.reallength * self.reallength * 0.001
+            self.xl * self.yl * 0.001
         ) / self.timestepsecs  # m3/s
         self.sumprecip = self.ZeroMap  #: accumulated rainfall for water balance
         self.sumevap = self.ZeroMap  #: accumulated evaporation for water balance