diff --git a/Interface.py b/Interface.py index 09f42e23e64f0daf2b5430647c932707afe4b2dc..e83f26061630d15d27e22528c04feb195ec2565d 100644 --- a/Interface.py +++ b/Interface.py @@ -218,7 +218,7 @@ def finalfetch(part, routing_area, basin_count, route_togrid, route_tobasin, fet # class HydroOverlap : # - def __init__(self, nbpt, nbvmax, sub_pts, sub_index_in, sub_area_in, sub_lon_in, sub_lat_in, modelgrid, hydrodata) : + def __init__(self, nbpt, nbvmax, sub_pts, sub_index_in, sub_area_in, sub_lon_in, sub_lat_in, part, modelgrid, hydrodata) : # # Reshape stuff so that it fits into arrays # @@ -233,6 +233,8 @@ class HydroOverlap : for ip in range(sub_pts[ib]) : sub_index[ib,ip,:] = [sub_index_in[ib][0][ip],sub_index_in[ib][1][ip]] # + part.landsendtohalo(sub_area, order='F') + # trip_tmp = np.zeros((nbpt,nbvmax), dtype=np.float32, order='F') basins_tmp = np.zeros((nbpt,nbvmax), dtype=np.float32, order='F') topoind_tmp = np.zeros((nbpt,nbvmax), dtype=np.float32, order='F') diff --git a/tests/Mallorca/BuildHTUs_Mallorca.pbs b/tests/Mallorca/BuildHTUs_Mallorca.pbs index b54bb318a4c9d7fbb3bee2b27ebee9d8de1dfe1d..dacfbb50a98f6327ab0feff81535d652c881d00e 100644 --- a/tests/Mallorca/BuildHTUs_Mallorca.pbs +++ b/tests/Mallorca/BuildHTUs_Mallorca.pbs @@ -30,6 +30,7 @@ if [ $? -gt 0 ] ; then echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" echo "X Run on 1 Proc failed X" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" + exit else echo "============================" echo "= Run on 1 Proc successful ="