Changeset 6064 for TOOLS/MOSAIX/RunoffWeights.py

Timestamp:

02/24/22 09:58:49 (2 years ago)

Author:

omamce

Message:

O.M. : changes in MOSAIX

• Correct ocean mask to remove periodic duplicated points, to have full conservation of run-off
• Suppress creation of corc mask, which is not used
• Put SVN keywords in make_mosaic
• Update nemo.py with somùe additionnal utilities
• Adapt RunOffWeights?.py to new nemo module
• Adapt CalvingWeights?.py to new ORCA configurations

File:

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

TOOLS/MOSAIX/RunoffWeights.py

@@ -149 +149 @@
     if oce_jpi == 1442 : oce_perio = 6 # ORCA 025
 print ("Oce NPERIO parameter : {:d}".format(oce_perio))
-oce_grid_pmask = nemo.lbc_mask (np.reshape(oce_grid_imask, (oce_jpj,oce_jpi)), 'T', oce_perio).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' )
+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()
 ## 
@@ -165 +165 @@
 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)), oce_perio, 'T').ravel()
+oceCoast2D = nemo.lbc_mask (np.reshape(oceCoast2D,(oce_jpj,oce_jpi)), nperio=oce_perio, cd_type='T').ravel()
 
 oceOceanFiltered = oceOceanFiltered2D.ravel()