From 35dcbb9cc9b25e50cc43c4415ec96c8265ed2e7a Mon Sep 17 00:00:00 2001
From: Anthony <anthony.schrapffer@polytechnique.fr>
Date: Mon, 18 May 2020 23:11:59 +0200
Subject: [PATCH] Actualization of the main files : RoutingPreProc and
WeightsOnly
---
RoutingPreProc.py | 18 +++++++++---------
WeightsOnly.py | 14 +++++++++++---
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/RoutingPreProc.py b/RoutingPreProc.py
index 81054a0..3ebfcc8 100644
--- a/RoutingPreProc.py
+++ b/RoutingPreProc.py
@@ -51,37 +51,37 @@ rank=comm.Get_rank()
part = PA.partition(gg.ni, gg.nj, gg.land, comm, nbcore, szhalo, rank)
#
modelgrid=MG.ModelGrid(part.ihstart+gg.igstart,part.nih,part.jhstart+gg.jgstart,part.njh)
+#
INFO("Longitude interval on proc "+str(rank)+" = "+str(modelgrid.box_land[0][0])+" : "+str(modelgrid.box_land[0][1]))
INFO("Latitude interval on proc "+str(rank)+" = "+str(modelgrid.box_land[1][0])+" : "+str(modelgrid.box_land[1][1]))
#
-hydrogrid=HG.HydroGrid(modelgrid.box_land)
+hydrogrid=HG.HydroGrid(modelgrid.box_land, wfile)
#
# Computes weights of overlap of modelgrid and hydrogrid
-#
w = RPP.compweights(wfile, part, modelgrid, hydrogrid)
#
#
#
nbpt = len(w.index)
nbvmax = part.domainmax(max(w.hpts))
-print("nbpt : ", nbpt)
-print("nbvmax : ", nbvmax)
-print("nbasmax : ", nbasmax)
+INFO("nbpt : {0}".format(nbpt))
+INFO("nbvmax : {0}".format(nbvmax))
+INFO("nbasmax : {0}".format(nbasmax))
#
# Extract hydo data from file
#
-INFO("hydrodata")
+INFO("=================== HYDRODATA ====================")
hydrodata = HG.HydroData(hydrogrid.ncfile, hydrogrid.box, w.index)
-INFO("initiatmgrid")
+INFO("=================== INITATMGRID ====================")
IF.initatmgrid(rank, nbcore, nbpt, modelgrid)
-INFO("hoverlap")
+INFO("=================== HOVERLAP ====================")
hoverlap = IF.HydroOverlap(nbpt, nbvmax, w.hpts, w.index, w.area, w.lon, w.lat, part, modelgrid, hydrodata)
-
#
# Do some memory management and synchronize procs.
#
+
del w
gc.collect()
comm.Barrier()
diff --git a/WeightsOnly.py b/WeightsOnly.py
index a3c8049..b3ac75a 100644
--- a/WeightsOnly.py
+++ b/WeightsOnly.py
@@ -47,15 +47,23 @@ rank=comm.Get_rank()
# Region of grid to be treated
#
part = PA.partition(gg.ni, gg.nj, gg.land, comm, nbcore, szhalo, rank)
+
+INFO("rank:{0}-nbland:{1}".format(part.rank, part.nbland))
+#
+
+with open("./Weight_proc_{0}.txt".format(part.rank), "a") as foo:
+ foo.write("Start Weights on rank: {0}\n".format(part.rank))
#
modelgrid=MG.ModelGrid(part.ihstart+gg.igstart,part.nih,part.jhstart+gg.jgstart,part.njh)
-INFO("Longitude interval on proc "+str(rank)+" = "+str(modelgrid.box_land[0][0])+" : "+str(modelgrid.box_land[0][1]))
-INFO("Latitude interval on proc "+str(rank)+" = "+str(modelgrid.box_land[1][0])+" : "+str(modelgrid.box_land[1][1]))
#
-hydrogrid=HG.HydroGrid(modelgrid.box_land)
+hydrogrid=HG.HydroGrid(modelgrid.box_land, wfile)
#
# Computes weights of overlap of modelgrid and hydrogrid
#
+
+with open("./Weight_proc_{0}.txt".format(part.rank), "a") as foo:
+ foo.write("Proc {0}: size core : {1}\n".format(part.rank, len(part.landcorelist)))
+
w = RPP.compweights(wfile, part, modelgrid, hydrogrid)
#
#
--
GitLab