Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
RoutingPP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IPSL
LMD
InTro
RoutingPP
Commits
98f59ec8
Commit
98f59ec8
authored
5 years ago
by
POLCHER Jan
Browse files
Options
Downloads
Patches
Plain Diff
Make sure that the diagnostic plots are only activated in mono-proc mode.
They are not yet adapted to the parallel processing.
parent
1908158c
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
RoutingPreProc.py
+10
-8
10 additions, 8 deletions
RoutingPreProc.py
with
10 additions
and
8 deletions
RoutingPreProc.py
+
10
−
8
View file @
98f59ec8
...
...
@@ -43,7 +43,7 @@ gg = MG.GlobalGrid()
#
comm
=
MPI
.
COMM_WORLD
szhalo
=
1
nbc
=
comm
.
Get_size
()
nbc
ore
=
comm
.
Get_size
()
rank
=
comm
.
Get_rank
()
#
# Verify directories
...
...
@@ -56,7 +56,7 @@ comm.Barrier()
#
# Region of grid to be treated
#
part
=
PA
.
partition
(
gg
.
ni
,
gg
.
nj
,
gg
.
land
,
comm
,
nbc
,
szhalo
,
rank
)
part
=
PA
.
partition
(
gg
.
ni
,
gg
.
nj
,
gg
.
land
,
comm
,
nbc
ore
,
szhalo
,
rank
)
#
# Weight file to be created
#
...
...
@@ -146,20 +146,22 @@ del sub_lon
del
sub_lat
gc
.
collect
()
if
lonint
[
0
]
!=
lonint
[
1
]
and
latint
[
0
]
!=
latint
[
1
]
:
DP
.
MAPPLOT
(
"
MapHydroGrid
"
,
lonint
,
latint
,
hoverlap
,
hoverlap
.
hierarchy_bx
,
modelgrid
.
polyll
,
title
=
"
Distance to ocean
"
)
if
nbcore
==
1
:
if
lonint
[
0
]
!=
lonint
[
1
]
and
latint
[
0
]
!=
latint
[
1
]
:
DP
.
MAPPLOT
(
"
MapHydroGrid
"
,
lonint
,
latint
,
hoverlap
,
hoverlap
.
hierarchy_bx
,
modelgrid
.
polyll
,
title
=
"
Distance to ocean
"
)
hsuper
=
IF
.
HydroSuper
(
nbvmax
,
hydrodata
,
hoverlap
)
#
# Plot the hydrological supermesh
#
if
lonint
[
0
]
!=
lonint
[
1
]
and
latint
[
0
]
!=
latint
[
1
]
:
print
(
"
going into SUPERMESHPLOT
"
,
lonint
,
latint
)
DP
.
SUPERMESHPLOT
(
"
MapSuperGrid_Beforelinkup
"
,
lonint
,
latint
,
hoverlap
,
hsuper
,
modelgrid
.
polyll
)
if
nbcore
==
1
:
if
lonint
[
0
]
!=
lonint
[
1
]
and
latint
[
0
]
!=
latint
[
1
]
:
DP
.
SUPERMESHPLOT
(
"
MapSuperGrid_Beforelinkup
"
,
lonint
,
latint
,
hoverlap
,
hsuper
,
modelgrid
.
polyll
)
print
(
"
=================== LINKUP ====================
"
)
hsuper
.
linkup
(
hydrodata
)
DP
.
SUPERMESHPLOT
(
"
MapSuperGrid_Afterlinkup
"
,
lonint
,
latint
,
hoverlap
,
hsuper
,
modelgrid
.
polyll
)
if
nbcore
==
1
:
DP
.
SUPERMESHPLOT
(
"
MapSuperGrid_Afterlinkup
"
,
lonint
,
latint
,
hoverlap
,
hsuper
,
modelgrid
.
polyll
)
#
# Do some memory management and synchronize procs.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment