From 98f59ec831737596f3020588c68740435411756b Mon Sep 17 00:00:00 2001
From: Jan Polcher <jan.polcher@lmd.jussieu.fr>
Date: Thu, 13 Jun 2019 08:23:21 +0200
Subject: [PATCH] Make sure that the diagnostic plots are only activated in
mono-proc mode. They are not yet adapted to the parallel processing.
---
RoutingPreProc.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/RoutingPreProc.py b/RoutingPreProc.py
index 7128b04..dafcbe0 100644
--- a/RoutingPreProc.py
+++ b/RoutingPreProc.py
@@ -43,7 +43,7 @@ gg = MG.GlobalGrid()
#
comm = MPI.COMM_WORLD
szhalo=1
-nbc=comm.Get_size()
+nbcore=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, nbcore, 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.
--
GitLab