Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit f05d48f9 authored by Anthony's avatar Anthony
Browse files

Small correction - important for Fekete

parent f061f003
......@@ -146,6 +146,7 @@ class HydroOverlap :
sub_lon, sub_lat, trip_tmp, basins_tmp, topoind_tmp, rlen_tmp, \
rdz_tmp, fac_tmp, hierarchy_tmp, orog_tmp, floodp_tmp)
#
del trip_tmp; del basins_tmp; del topoind_tmp
del fac_tmp; del hierarchy_tmp; del orog_tmp
del floodp_tmp; del rlen_tmp; del rdz_tmp
......@@ -161,11 +162,9 @@ class HydroOverlap :
@jit(nopython=True)
def get_next(jj1, ii1, trip, grid):
jj = jj1; ii = ii1
k = 0
follow = True
while follow and (trip[jj,ii] < 9) and (trip[jj,ii] > 0):
t = trip[jj,ii]
jj0 = jj; ii0 = ii
if (t == 6) or (t == 5) or (t == 4):
jj+= 1
elif (t == 8) or (t == 1) or (t == 2):
......@@ -174,14 +173,11 @@ def get_next(jj1, ii1, trip, grid):
ii += 1
elif (t == 8) or (t == 7) or (t == 6):
ii -= 1
if (ii<0) or (jj<0) or (ii>=trip.shape[1]) or (jj>=trip.shape[0]):
follow = False
else:
if k > 0:
if grid[jj,ii] != 0:
follow = False
k+=1
if grid[jj,ii] != 0:
follow = False
return ii,jj
@jit(nopython=True)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment