Changeset 816 in lmdz_wrf for trunk

Timestamp:

Jun 12, 2016, 2:22:14 PM (8 years ago)

Author:

lfita

Message:

Removing spurious commentaries

File:

• trunk/tools/generic_tools.py (modified) (8 diffs)

trunk/tools/generic_tools.py

@@ -6638 +6638 @@
         Njipt = dictionary_key(subfinished, False)
         if Njipt is not None:
-            print Njipt, 'points subflow:', ijsubflow[Njipt]
+#            print Njipt, 'points subflow:', ijsubflow[Njipt]
             for ipt in ijsubflow[Njipt]:
                 if ijfound[ipt] == False:
                     jipt = ijsubbasin[ipt]
                     break
-            print '  working from point:', ipt, 'ji pair:', jipt
+#            print '  working from point:', ipt, 'ji pair:', jipt
             ijfound[ipt] = True
             Nij = ipt
@@ -6649 +6649 @@
 # Keep searching since there are grid-points not found!
             print '  ' + fname + ': Keep searching since there are grid-points not found!!'
-            print ijfound
+#            print ijfound
             Nij = dictionary_key(ijfound, False)
             if Nij is None:
@@ -6667 +6667 @@
             else:
                 Njipt = Njipt + '1'
-            print '  ' + fname + "new sub-flow '" + Njipt + "' !!"
+#            print '  ' + fname + "new sub-flow '" + Njipt + "' !!"
             subfinished[Njipt] = False
             Nij = np.max(ijfound.keys())
 
-        print 'Lluis Nij:', Nij
+#        print 'Lluis Nij:', Nij
 # Looking for which point of the sub-flow retake the search
         if Nij == 1:
@@ -6678 +6678 @@
 
         ardtrips = vals_around(trips,jipt)
-        print '  ' + fname + 'ardtrips _______'
-        print ardtrips
+#        print '  ' + fname + 'ardtrips _______'
+#        print ardtrips
 
         arrive = incomming_flow(ardtrips)
         Narrive = np.sum(arrive)
-        print Nij, '  ' + fname + ' Narrive:', Narrive
+#        print Nij, '  ' + fname + ' Narrive:', Narrive
         if Narrive == 0:
             ijfound[Nij] = True
             subfinished[Njipt] = True
         else:
-            print '  ' + fname + 'arrive _______'
-            print arrive
+#            print '  ' + fname + 'arrive _______'
+#            print arrive
             followvals = np.zeros((3,3), dtype=bool)
             followvals = arrive
 
             for ifollow in range(Narrive):
-                print 'ifollow:',ifollow,'/',Narrive
+#                print 'ifollow:',ifollow,'/',Narrive
 
 # We only want to work with that ij, which have not yet been found
                 while np.sum(followvals) != 0:
-                    print Nij,'  Looking for a non-located point in subbasin ________'
-                    print subbasin[jipt[0]-1:jipt[0]+2,jipt[1]-1:jipt[1]+2]
+#                    print Nij,'  Looking for a non-located point in subbasin ________'
+#                    print subbasin[jipt[0]-1:jipt[0]+2,jipt[1]-1:jipt[1]+2]
                     jifollow = index_mat(followvals, True)
                     jiequiv = jifollow - [1,1]
@@ -6711 +6711 @@
                             else:
                                 Njipt = Njipt + str(ifollow)
-                            print '  ' + fname + "new sub-flow '" + Njipt + "' !!"
+#                            print '  ' + fname + "new sub-flow '" + Njipt + "' !!"
                         subfinished[Njipt] = False
                         subbasin[jipt[0]+jiequiv[0], jipt[1]+jiequiv[1]] = True
@@ -6728 +6728 @@
                             ijfound[Nij] = True
                             subfinished[Njipt] = True
-                            print Nij,"  subflow '" + Njipt + "' finished!!"
+#                            print Nij,"  subflow '" + Njipt + "' finished!!"
                             break
 
@@ -6737 +6737 @@
                     quit()
 
-            if ijsubflow.has_key(Njipt): 
-                print "Lluis points of subflow: '" + Njipt + "' _______=", ijsubflow[Njipt]
-                for isub in ijsubflow[Njipt]:
-                    print '  ' , isub , ':', ijsubbasin[isub], ijfound[isub]
-            if Nij == 10: print 'Nij = 9:', ijfound[9]
-
-        print subbasin
+#            if ijsubflow.has_key(Njipt): 
+#                print "Lluis points of subflow: '" + Njipt + "' _______=", ijsubflow[Njipt]
+#                for isub in ijsubflow[Njipt]:
+#                    print '  ' , isub , ':', ijsubbasin[isub], ijfound[isub]
+#            if Nij == 10: print 'Nij = 9:', ijfound[9]
+
+#        print subbasin
 #        if Nij > 4: quit()
 
     return subbasin
 
-# Caceres
-rivers = np.array([7, 1, 1, 1, 1, 5, 5, 1, \
-  7, 1, 6, 3, 5, 5, 6, 5, \
-  8, 7, 5, 3, 5, 6, 3, 5, \
-  1, 1, 3, 5, 5, 7, 5, 5, \
-  3, 3, 5, 6, 5, 5, 5, 7 ], dtype=int).reshape(5,8)
-
-point = [4,4]
+## Caceres
+#rivers = np.array([7, 1, 1, 1, 1, 5, 5, 1, \
+#  7, 1, 6, 3, 5, 5, 6, 5, \
+#  8, 7, 5, 3, 5, 6, 3, 5, \
+#  1, 1, 3, 5, 5, 7, 5, 5, \
+#  3, 3, 5, 6, 5, 5, 5, 7 ], dtype=int).reshape(5,8)
+
+#point = [4,4]
 
 # Porto Do Alegre
@@ -6770 +6770 @@
 #point = [7,0]
 
-print rivers
-print rivers[point[0], point[1]]
-
-masksubbasin, subflows, subflowspt = subbasin_point(rivers, point)
-print rivers
-print masksubbasin
-for subflow in subflows:
-  print subflow, ':', subflows[subflow]
-  for isub in subflows[subflow]:
-      print '  ' , isub , ':', subflowspt[isub]
-
-print 'Total sub-basin:', np.sum(masksubbasin)
-
-quit()
+#print rivers
+#print rivers[point[0], point[1]]
+
+#masksubbasin, subflows, subflowspt = subbasin_point(rivers, point)
+#print rivers
+#print masksubbasin
+#for subflow in subflows:
+#  print subflow, ':', subflows[subflow]
+#  for isub in subflows[subflow]:
+#      print '  ' , isub , ':', subflowspt[isub]
+
+#print 'Total sub-basin:', np.sum(masksubbasin)
+
+#quit()