From add68497be6865d1c4ef00ca41c489e73e389215 Mon Sep 17 00:00:00 2001
From: itati01 <itati01@users.noreply.github.com>
Date: Mon, 17 Jan 2022 08:38:02 +0100
Subject: [PATCH] removed comments on efficiency grids for pull request

---
 data/dinf_eff.tif  | Bin 125262 -> 0 bytes
 data/eff.tif       | Bin 3853 -> 0 bytes
 tests/test_grid.py |  20 +-------------------
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 data/dinf_eff.tif
 delete mode 100644 data/eff.tif

diff --git a/data/dinf_eff.tif b/data/dinf_eff.tif
deleted file mode 100644
index 26d4866c6f682a9808fccb411d6971b9b3598ec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125262
zcmeIyJ!lkZ9LMozHX0L*hYBft2}H!ggA{_wS*XcrPQu|rP`RW~un@6Gp=cqTV0>Y<
zP_Xd8B1J$CM0^RHpoOS~f`V`s78Vv3igH|Gp<p5S+hv7R7FQmhfiLr)nP(Sv`0O(>
z@?+^Lr7SL`>L^vFYpH6_)0u1Sxj%D9dv31loHh5(nwQU-e{RnUvwq90d22PN9L>F_
zwNi%L^V?kSXs_wW{KLtf(mdaoQ_6``J*6}A<IFc39i>0>r_8q+JtbdJ*3T_vrcrDC
zl3y}UUaqx1JFq4Xn@85_|NRc?-KEqQq(!MWElGW8MOu~OqP{u}q`0WBOB>S0G?a$Z
zNZOu8)2=k0cBj2*UpkN`(!q2j1#$gYnoOtD*>o;lNEg$kG?k{)m2@>-Pc!Lux|{B$
zhv`vzlAfjK=|y^(UZvORO?sdHO&`+7^f`S=Rh8eDy3>NRDD|c#sV}WatJ3N;kk+Ji
zX+zqWhSG2vN!!zC+LgxB?zA`UO9#?KI+%{6qv=?hOsCV?bS_;;7t^IQm8R2`bTwU1
zGwF7^o9?BD=}~%;o~7sMMS7WDrPt|ARhBJ%_t#|o*UjI~&A;~dj<MR*`oG7=9_&B$
z&*+^!gM;7JR;`_GUTaUNvV&v`%AKk-H;}5lU08L^H1f1`wyw{w?C!eNXg;6cI+t>0
z;_x4Rmk%|+Z}88ZV?)1f+tL5i+TU||{JvW6V3YU20s{;%zyJdbFu(u<3^2d|0}L?0
z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<
z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#
zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|
z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb
zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0
z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<
z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#
zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|
z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb
zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0
z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<
M3^2d|1OLsySH<aDl>h($

diff --git a/data/eff.tif b/data/eff.tif
deleted file mode 100644
index b2836cbc08e2647c1c64370fea39d5a522ba0151..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3853
zcmeI!|4S2b9LMqZ-L2c4w^4$NpkxrNhzbXy5n5Y6WJ8e1Fn>}aSzn+fQR)vRYT^1J
zh7b(;MF__bf;FM`lgvS}`XwWXg;66g_Di%M_e&%_Z(QI{`vcky9`|{1pU>w$yU%?-
z$3-GX#3dqaB8nyo=@tjY%2&y%mHpIdRyKR+RyO<WQ5<s4Jg17Z?>O(X@-FK3T5T%i
z{X5$9S(&afWMz%)ePD=L1~|+=G(;z#BEN`h;wQ(**|;HQzYKXbuGa4)Po7Ju^}fe~
zRPsCAKxc!xM*aSmx<lN5kvXfv=U|QzMFKgL;pG8#V-yR>poDD%crb&Q#1e|A!sp~#
zh$4X;%FtaR$1#i<q_Ke-I$A`|B8DXLsKD!He2iiN8I-V%Kr7>85=$te3ZKFFh$4X;
z%FsQGk73LpjSbY$;bnZpkVGC81p2SNoEscCefiyuS7ynSHT->Ep6GLrjTBDae=>IT
zdMNa-u~Oe*OagPNuyWZFl<XkxU6IOe#kCrzwmwISBo4N?vT?J%wO)!mx_KvgAa&ck
zUMPKWBz&oV$bX{io=kuF^-1CX8>)YKee?O#*Pb(rU!AkTsy@-f!zg@{-|q05-rJ1r
z!XD`~-ej+oJ)0|cKU`QDA9%L-V@<M;r?lxFDSHa%*MBlUT}qp?Dd)#tH}*bh#`l7~
z?(KDNuY3DDp;^C+n(h4;<onpAWg~C*m1<kFsrHZK-O{@ilPT?cOfu^Hd&i%@se=Kn

diff --git a/tests/test_grid.py b/tests/test_grid.py
index f8fa7d0..dff383e 100644
--- a/tests/test_grid.py
+++ b/tests/test_grid.py
@@ -11,8 +11,6 @@
 dir_path = os.path.join(data_dir, 'dir.asc')
 dem_path = os.path.join(data_dir, 'dem.tif')
 roi_path = os.path.join(data_dir, 'roi.tif')
-# eff_path = os.path.join(data_dir, 'eff.tif')
-# dinf_eff_path = os.path.join(data_dir, 'dinf_eff.tif')
 feature_geometry = [{'type': 'Polygon',
                       'coordinates': (((-97.29749977660477, 32.74000135435936),
                         (-97.29083107907053, 32.74000328969928),
@@ -38,26 +36,15 @@ class Datasets():
 fdir = grid.read_ascii(dir_path, dtype=np.uint8, crs=grid.crs)
 dem = grid.read_raster(dem_path)
 roi = grid.read_raster(roi_path)
-# eff = grid.read_raster(eff_path)
-# dinf_eff = grid.read_raster(dinf_eff_path)
 
 # Add datasets to dataset holder
 d.dem = dem
 d.fdir = fdir
 d.roi = roi
-# d.eff = eff
-# d.dinf_eff = dinf_eff
-
-# set nodata to 1
-# why is that not working with grid.view() in test_accumulation?
-#grid.eff[grid.eff==grid.eff.nodata] = 1
-#grid.dinf_eff[grid.dinf_eff==grid.dinf_eff.nodata] = 1
 
 # Initialize parameters
 dirmap = (64,  128,  1,   2,    4,   8,    16,  32)
 acc_in_frame = 77261
-# acc_in_frame_eff = 76498 # max value with efficiency
-# acc_in_frame_eff1 = 19125.5 # accumulation for raster cell with acc_in_frame with transport efficiency
 cells_in_catch = 11422
 catch_shape = (159, 169)
 max_distance_d8 = 209
@@ -187,11 +174,6 @@ def test_accumulation():
     assert(acc_d8.max() > 11300)
 
     # ...with efficiency
-    # eff = d.eff
-    # set nodata to 1
-    # eff = grid.view(eff)
-    # eff[eff == eff.nodata] = 1
-
     # we set the efficiency for starting cells to 0
     # this will reduce the flow accumulation by the number of starting cells
     start_cells = np.where(acc_d8 == 1)
@@ -316,7 +298,7 @@ def test_to_ascii():
     fdir = d.fdir
     grid.clip_to(catch)
     # np.float is depreciated
-    grid.to_ascii(fdir, 'test_dir.asc', target_view=fdir.viewfinder, dtype=float)
+    grid.to_ascii(fdir, 'test_dir.asc', target_view=fdir.viewfinder, dtype=np.float64)
     fdir_out = grid.read_ascii('test_dir.asc', dtype=np.uint8)
     assert((fdir_out == fdir).all())
     grid.to_ascii(fdir, 'test_dir.asc', dtype=np.uint8)