Skip to content
Snippets Groups Projects
Commit 98f59ec8 authored by POLCHER Jan's avatar POLCHER Jan :bicyclist_tone4:
Browse files

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
...@@ -43,7 +43,7 @@ gg = MG.GlobalGrid() ...@@ -43,7 +43,7 @@ gg = MG.GlobalGrid()
# #
comm = MPI.COMM_WORLD comm = MPI.COMM_WORLD
szhalo=1 szhalo=1
nbc=comm.Get_size() nbcore=comm.Get_size()
rank=comm.Get_rank() rank=comm.Get_rank()
# #
# Verify directories # Verify directories
...@@ -56,7 +56,7 @@ comm.Barrier() ...@@ -56,7 +56,7 @@ comm.Barrier()
# #
# Region of grid to be treated # 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 # Weight file to be created
# #
...@@ -146,20 +146,22 @@ del sub_lon ...@@ -146,20 +146,22 @@ del sub_lon
del sub_lat del sub_lat
gc.collect() gc.collect()
if lonint[0] != lonint[1] and latint[0] != latint[1] : if nbcore == 1 :
DP.MAPPLOT("MapHydroGrid", lonint, latint, hoverlap, hoverlap.hierarchy_bx, modelgrid.polyll, title="Distance to ocean") 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) hsuper = IF.HydroSuper(nbvmax, hydrodata, hoverlap)
# #
# Plot the hydrological supermesh # Plot the hydrological supermesh
# #
if lonint[0] != lonint[1] and latint[0] != latint[1] : if nbcore == 1 :
print("going into SUPERMESHPLOT", lonint, latint) if lonint[0] != lonint[1] and latint[0] != latint[1] :
DP.SUPERMESHPLOT("MapSuperGrid_Beforelinkup", lonint, latint, hoverlap, hsuper, modelgrid.polyll) DP.SUPERMESHPLOT("MapSuperGrid_Beforelinkup", lonint, latint, hoverlap, hsuper, modelgrid.polyll)
print("=================== LINKUP ====================") print("=================== LINKUP ====================")
hsuper.linkup(hydrodata) 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. # Do some memory management and synchronize procs.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment