From 3eaecfa0e719a26f6164e62b7b2049ed6da70720 Mon Sep 17 00:00:00 2001
From: Jan Polcher <jan.polcher@lmd.jussieu.fr>
Date: Fri, 5 Jul 2019 14:16:05 +0200
Subject: [PATCH] Some clean-up of the code
---
F90subroutines/routing_reg.f90 | 4 +---
Interface.py | 8 ++------
RoutingPreProc.py | 4 ++--
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/F90subroutines/routing_reg.f90 b/F90subroutines/routing_reg.f90
index 494c6c9..6540154 100644
--- a/F90subroutines/routing_reg.f90
+++ b/F90subroutines/routing_reg.f90
@@ -1987,7 +1987,7 @@ SUBROUTINE routing_reg_linkup(nbpt, neighbours, nwbas, basin_count, basin_area,
!
!
!! PARAMETERS
- LOGICAL, PARAMETER :: debug = .TRUE. !! (true/false)
+ LOGICAL, PARAMETER :: debug = .FALSE. !! (true/false)
!
!_ ================================================================================================================================
!
@@ -3258,8 +3258,6 @@ SUBROUTINE routing_reg_truncate(nbpt, nbasmax, gridarea, contfrac, nwbas, num_la
!
DO ib = 1,nbpt
DO WHILE ( basin_count(ib) .GT. nbasmax )
- !
- WRITE(numout,*) 'HAMMER, ib, basin_count :', ib, basin_count(ib)
!
! Here we simply put the smallest basins into the largest ones. It is really a brute force
! method but it will only be applied if everything has failed.
diff --git a/Interface.py b/Interface.py
index 74c7c64..2e86391 100644
--- a/Interface.py
+++ b/Interface.py
@@ -204,7 +204,7 @@ class HydroSuper :
self.nbcoastal, self.coastal_basin, float(hydrodata.basinsmax))
return
#
- def fetch(self, part, modelgrid) :
+ def fetch(self, part) :
#
fetch_basin = np.zeros(self.basin_area.shape, dtype=np.float32, order='F')
#
@@ -245,8 +245,6 @@ class HydroSuper :
#
#
#
- yy=modelgrid.landscatter(np.sum(self.fetch_basin, axis=1)/np.sum(self.basin_area, axis=1))
- print("Rank :"+str(part.rank)+" OUT of fetch =+=+=+=+=+=+=+=+=+= \n"+str(yy)+"\n =+=+=+=+=+=+=+=+=+=")
self.num_largest = routing_interface.rivclassification(part.landcorelist, self.basin_count, self.outflow_grid, self.outflow_basin, \
self.fetch_basin, self.largest_rivarea)
print("Rank :"+str(part.rank)+" Area of smallest large rivers : ", self.largest_rivarea, " Nb of Large rivers on proc : ",self.num_largest)
@@ -255,7 +253,7 @@ class HydroSuper :
#
#
class HydroGraph :
- def __init__(self, nbasmax, hydrosuper, part, modelgrid) :
+ def __init__(self, nbasmax, hydrosuper, part) :
self.nbasmax = nbasmax
self.routing_area, self.routing_cg, self.topo_resid, self.route_nbbasin, self.route_togrid, self.route_tobasin, self.route_nbintobas, \
self.global_basinid, self.route_outlet, self.route_type, self.origin_nbintobas, self.routing_fetch = \
@@ -271,8 +269,6 @@ class HydroGraph :
self.num_largest = routing_interface.finalrivclass(part.landcorelist, self.route_togrid, self.route_tobasin, self.routing_fetch, \
hydrosuper.largest_rivarea)
#
- yy=modelgrid.landscatter(np.sum(self.routing_fetch, axis=1)/np.sum(self.routing_area, axis=1))
- print ("Rank :"+str(part.rank)+" OUT of truncate =+=+=+=+=+=+=+=+=+= \n"+str(yy)+"\n =+=+=+=+=+=+=+=+=+=")
return
#
def dumpnetcdf(self, filename, globalgrid, procgrid, part) :
diff --git a/RoutingPreProc.py b/RoutingPreProc.py
index 0bc49e6..bdf36b5 100644
--- a/RoutingPreProc.py
+++ b/RoutingPreProc.py
@@ -172,9 +172,9 @@ del hoverlap
gc.collect()
print("=================== Compute fetch ====================")
-hsuper.fetch(part, modelgrid)
+hsuper.fetch(part)
-hgraph = IF.HydroGraph(nbasmax, hsuper, part, modelgrid)
+hgraph = IF.HydroGraph(nbasmax, hsuper, part)
hgraph.dumpnetcdf(OutGraphFile, gg, modelgrid, part)
--
GitLab