Changeset 6244

Timestamp:

09/20/22 11:40:22 (20 months ago)

Author:

omamce

Message:

O.M. : MOSAIX, new corrections on runoff computations (ORCA coast line)

File:

• TOOLS/MOSAIX/RunoffWeights.py (modified) (5 diffs)

TOOLS/MOSAIX/RunoffWeights.py

@@ -163 +163 @@
 atm_perio = 0
 atm_grid_pmask = atm_grid_imask
+
+
 atm_address = np.arange(atm_jpj*atm_jpi)
 
@@ -177 +179 @@
 oce_grid_dims       = gridFile['torc.lat'][:].shape
 
-if oce_perio == 0 :
-    if oce_jpi ==  182 : oce_perio = 4 # ORCA 2
-    if oce_jpi ==  362 : oce_perio = 6 # ORCA 1
-    if oce_jpi == 1442 : oce_perio = 6 # ORCA 025
-        
+# imask : includes periodicity point
+# pmask : exclude periodicity points
+
+#if oce_perio == 0 :
+#    if oce_jpi ==  182 : oce_perio = 4 # ORCA 2
+#    if oce_jpi ==  362 : oce_perio = 6 # ORCA 1
+#    if oce_jpi == 1442 : oce_perio = 6 # ORCA 025
+oce_preio = nemo.__guessNperio__ (oce_jpj, oce_jpi, nperio=oce_perio)
+
 print ("Oce NPERIO parameter : {:}".format(oce_perio))
-oce_grid_pmask = nemo.lbc_mask (np.reshape(oce_grid_imask.values, (oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T', sval=0).ravel()
+oce_grid_imask = nemo.lbc      (np.reshape(oce_grid_imask.values, (oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T'        ).ravel()
+oce_grid_pmask = nemo.lbc_mask (np.reshape(oce_grid_imask       , (oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T', sval=0).ravel()
 oce_address = np.arange(oce_jpj*oce_jpi)
 
-print ("Fill closed sea with image processing library")
-oce_grid_imask2D = np.reshape(oce_grid_pmask,(oce_jpj,oce_jpi))
-oce_grid_imask2D = nemo.lbc_mask ( 1-ndimage.binary_fill_holes (1-nemo.lbc(oce_grid_imask2D, nperio=oce_perio, cd_type='T')),
-                                       nperio=oce_perio, cd_type='T', sval=0 )
-oce_grid_imask = oce_grid_imask2D.ravel()
+print ("Fill closed seas with image processing library")
+oce_grid_imask2D = np.reshape (oce_grid_imask, (oce_jpj,oce_jpi))
+oce_grid_imask2D = 1-nemo.fill_closed_seas (1-oce_grid_imask2D, nperio=oce_perio, cd_type='T')
+#oce_grid_imask2D = nemo.lbc ( 1-ndimage.binary_fill_holes (1-nemo.lbc(oce_grid_imask2D, nperio=oce_perio, cd_type='T')),
+#                                       nperio=oce_perio, cd_type='T' )
+oce_grid_imask = oce_grid_imask2D.ravel ()
+
 ## 
-print ("Computes an ocean coastal band")
-
-oceLand2D  = np.reshape ( np.where (oce_grid_pmask < 0.5, True, False), (oce_jpj, oce_jpi) )
-oceOcean2D = np.reshape ( np.where (oce_grid_pmask > 0.5, True, False), (oce_jpj, oce_jpi) )
+print ("Computes an ocean coastal band with image processing library")
+oceLand2D  = np.reshape ( np.where (oce_grid_imask < 0.5, True, False), (oce_jpj, oce_jpi) )
+oceOcean2D = np.reshape ( np.where (oce_grid_imask > 0.5, True, False), (oce_jpj, oce_jpi) )
 
 NNocean = 1+2*oceCoastWidth
-oceOceanFiltered2D = ndimage.uniform_filter(oceOcean2D.astype(float), size=NNocean)
+oceOceanFiltered2D = ndimage.uniform_filter (oceOcean2D.astype(float), size=NNocean)
 oceCoast2D = np.where (oceOceanFiltered2D<(1.0-0.5/(NNocean**2)),True,False) & oceOcean2D
-oceCoast2D = nemo.lbc_mask (np.reshape(oceCoast2D,(oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T').ravel()
+oceCoast2D = nemo.lbc_mask (np.reshape(oceCoast2D, (oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T', sval=0.).ravel()
 
 oceOceanFiltered = oceOceanFiltered2D.ravel()
@@ -219 +227 @@
 oceCoast_address         = oce_address        [oceCoast]
 
-print ("Computes an atmosphere coastal band " )
+print ("Computes an atmosphere coastal band" )
 atmLand      = np.where (o2aFrac[:] < epsfrac       , True, False)
 atmLandFrac  = np.where (o2aFrac[:] < zone-epsfrac  , True, False)
@@ -262 +270 @@
 if searchRadius > 0. :
     print ("Loop on atmosphere coastal points")
-    for ja in np.arange(len(atmCoast_grid_pmask)) :
+    for ja in np.arange (len(atmCoast_grid_pmask)) :
         z_dist = geodist ( atmCoast_grid_center_lon[ja], atmCoast_grid_center_lat[ja], oceCoast_grid_center_lon, oceCoast_grid_center_lat)
         z_mask = np.where (z_dist*ra < searchRadius, True, False)
-        num_links = int(z_mask.sum())
+        num_links = int (z_mask.sum())
         if num_links == 0 : continue
         z_area = oceCoast_grid_area[z_mask].sum().values
@@ -276 +284 @@
         #
         matrix_local = poids
-        atm_address_local = np.ones(num_links, dtype=np.int32 ) * atmCoast_address[ja]
+        atm_address_local = np.ones (num_links, dtype=np.int32 ) * atmCoast_address[ja]
         # Address on destination grid
-        oce_address_local = oceCoast_address[z_mask]
+        oce_address_local = oceCoast_address [z_mask]
         # Append to global arrays
         remap_matrix = np.append ( remap_matrix, matrix_local      )