Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
IPSL
LMD
InTro
RoutingPP
Commits
9cb5c400
Commit
9cb5c400
authored
Feb 06, 2020
by
Anthony Schrapffer
Browse files
Some clean up.
parent
9d36f12e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
Interface.py
Interface.py
+3
-1
tests/Mallorca/BuildHTUs_Mallorca.pbs
tests/Mallorca/BuildHTUs_Mallorca.pbs
+1
-0
No files found.
Interface.py
View file @
9cb5c400
...
...
@@ -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'
)
...
...
tests/Mallorca/BuildHTUs_Mallorca.pbs
View file @
9cb5c400
...
...
@@ -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 ="
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment