Commit 9cb5c400 authored by Anthony Schrapffer's avatar Anthony Schrapffer
Browse files

Some clean up.

parent 9d36f12e
...@@ -218,7 +218,7 @@ def finalfetch(part, routing_area, basin_count, route_togrid, route_tobasin, fet ...@@ -218,7 +218,7 @@ def finalfetch(part, routing_area, basin_count, route_togrid, route_tobasin, fet
# #
class HydroOverlap : 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 # Reshape stuff so that it fits into arrays
# #
...@@ -233,6 +233,8 @@ class HydroOverlap : ...@@ -233,6 +233,8 @@ class HydroOverlap :
for ip in range(sub_pts[ib]) : for ip in range(sub_pts[ib]) :
sub_index[ib,ip,:] = [sub_index_in[ib][0][ip],sub_index_in[ib][1][ip]] 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') trip_tmp = np.zeros((nbpt,nbvmax), dtype=np.float32, order='F')
basins_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') topoind_tmp = np.zeros((nbpt,nbvmax), dtype=np.float32, order='F')
......
...@@ -30,6 +30,7 @@ if [ $? -gt 0 ] ; then ...@@ -30,6 +30,7 @@ if [ $? -gt 0 ] ; then
echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
echo "X Run on 1 Proc failed X" echo "X Run on 1 Proc failed X"
echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
exit
else else
echo "============================" echo "============================"
echo "= Run on 1 Proc successful =" echo "= Run on 1 Proc successful ="
......
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