Changeset 6064 for TOOLS/MOSAIX/CalvingWeights.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/CalvingWeights.py (modified) (5 diffs)

TOOLS/MOSAIX/CalvingWeights.py

@@ -122 +122 @@
     if dst_Name == 'eORCA025.1' : nperio_dst = 6
 print ('nperio_dst: ' + str(nperio_dst) )
-dst_mskutil = nemo.lbc_mask (dst_mskutil, nperio=nperio_dst, cd_type='T' )
+dst_mskutil = nemo.lbc_mask (dst_mskutil, nperio=nperio_dst, cd_type='T', sval=0 )
 print ('dst_mskutil : ' + str(np.sum(dst_mskutil)))
 
@@ -131 +131 @@
 # Preparation by closing some straits
 # -----------------------------------
-if dst_Name in [ 'eORCA025', 'eORCA025.1' ] :
+if dst_Name in [ 'eORCA025', 'eORCA025.1', 'eORCA025.4' ] :
     print ('Filling some seas for ' + dst_Name )
     # Set Gibraltar strait to 0 to fill Mediterranean sea
@@ -144 +144 @@
     dst_mskutil[997:1012,907] = 0
     
-if dst_Name == 'eORCA1.2' :
-    print ('Filling some seas for eORCA1.2')
+if dst_Name in [ 'eORCA1.2', 'eORCA1.3', 'eORCA1.4' ] :
+    print ('Filling some seas for ' + dst_Name)
     # Set Gibraltar strait to 0 to fill Mediterrean sea
     dst_mskutil[240, 283] = 0
@@ -157 +157 @@
     dst_mskutil[284,222:225] = 0
     
-if dst_Name == 'ORCA2.3' :
-    print ('Filling some seas for ORCA2.3')
+if dst_Name in [ 'ORCA2.3', 'ORCA2.4' ] :
+    print ('Filling some seas for ' + dst_Name)
     # Set Gibraltar strait to 0 to fill Mediterrean sea
     dst_mskutil[101,139] = 0
@@ -175 +175 @@
 # Fill closed seas with image processing library
 # ----------------------------------------------
-dst_mskutil = nemo.lbc_mask ( 1-ndimage.binary_fill_holes (1-nemo.lbc(dst_mskutil, nperio=nperio_dst, cd_type='T')), nperio=nperio_dst, cd_type='T' )
+dst_mskutil = nemo.lbc_mask ( 1-ndimage.binary_fill_holes (1-nemo.lbc(dst_mskutil, nperio=nperio_dst, cd_type='T')), nperio=nperio_dst, cd_type='T', sval=0)
 
 # Surfaces