Some cleanÃ-up in Interface.py

Interface.py

@@ -669,7 +669,7 @@ class HydroGraph :
     #
     #
     #
-    def add_variable(self,outnf, procgrid, NCFillValue, part, coord, name, title, units, data, vtyp, orig_type = "float"):
+    def add_variable(self, outnf, procgrid, NCFillValue, part, coord, name, title, units, data, vtyp, orig_type = "float"):
         var = procgrid.landscatter(data.astype(vtyp), order='F')
 
         if orig_type == "float":
@@ -715,26 +715,13 @@ class HydroGraph :
         nbpt_loc = np.zeros((self.nbpt,1)).astype(np.int32)
         nbpt_loc[:,0] = np.arange(1, self.nbpt+1)
         nbpt_glo = part.l2glandindex(nbpt_loc)
-        self.add_variable(outnf, procgrid, NCFillValue, part, ('y','x'), "nbpt_glo", "Grid point Global", "-", nbpt_glo[:,0], vtyp)
+        self.add_variable(outnf, procgrid, NCFillValue, part, ('y','x'), "nbpt_glo", "Land point indices on global grid", "-", nbpt_glo[:,0], vtyp)
         #
         ################
         #
-        # TEST: l2glandindex
-        itarget=-1
-        for il in range(procgrid.nbland) :
-            lo = procgrid.lon_full[procgrid.indP[il][0],procgrid.indP[il][1]]
-            la = procgrid.lat_full[procgrid.indP[il][0],procgrid.indP[il][1]]
-            d=np.sqrt((lo-3.13)**2+(la-39.70)**2)
-            if d < 0.05 :
-                itarget = il
-
-        if itarget >+ 0 :
-            print(part.rank, itarget, " Before route_togrid = ", self.route_togrid[itarget,:])
-        # Conversion
+        # Conversion of grid indices for route_togrid
         grgrid = part.l2glandindex(self.route_togrid[:,:])
-        if itarget >+ 0 :
-            print(part.rank, itarget, " After route_togrid = ", self.route_togrid[itarget,:])
-        ################
+        #
         #
         # The field route_togrid is with indices on the local grid. That needs to be converted to the global grid.
         self.add_variable(outnf, procgrid, NCFillValue, part, ('z', 'y','x'), "routetogrid", "Grid into which the basin flows", "-", grgrid, vtyp, "int")