Changeset 4298 for TOOLS/MOSAIX/CalvingWeights.py

Timestamp:

02/28/19 14:10:31 (5 years ago)

Author:

omamce

Message:

O.M. : corection on MOSAIX

• add ORCA025.1 to known resolutions
• Correct mask used to generate weigths
• Suppress the second computation of uuid
• OceMask? is now ocean fraction like it was in MOZAIC. OceFrac? still exists (and equals OceFrac?)
• Add Oce2AtmMask as a 1/0 mask

File:

• TOOLS/MOSAIX/CalvingWeights.py (modified) (4 diffs)

TOOLS/MOSAIX/CalvingWeights.py

@@ -36 +36 @@
 
 # Adding arguments
-parser.add_argument ('--oce'     , help='oce model name', type=str, default='eORCA1.2', choices=['ORCA2.3', 'eORCA1.2', 'eORCA025'] )
+parser.add_argument ('--oce'     , help='oce model name', type=str, default='eORCA1.2', choices=['ORCA2.3', 'eORCA1.2', 'eORCA025', 'eORCA025.1'] )
 parser.add_argument ('--atm'     , help='atm model name (ICO* or LMD*)', type=str, default='ICO40'    )
 parser.add_argument ('--type'    , help='Type of distribution', type=str, choices=['iceshelf', 'iceberg', 'nosouth', 'full'], default='full'  )
@@ -111 +111 @@
 
 # Periodicity masking for NEMO
-if dst_Name == 'ORCA2.3'  : nperio_dst = 4
-if dst_Name == 'eORCA1.2' : nperio_dst = 6
-if dst_Name == 'ORCA025'  : nperio_dst = 6
-if dst_Name == 'eORCA025' : nperio_dst = 6
+if dst_Name == 'ORCA2.3'    : nperio_dst = 4
+if dst_Name == 'eORCA1.2'   : nperio_dst = 6
+if dst_Name == 'ORCA025'    : nperio_dst = 6
+if dst_Name == 'eORCA025'   : nperio_dst = 6
+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' )
@@ -125 +126 @@
 # Preparation by closing some straits
 # -----------------------------------
-if dst_Name == 'eORCA025' :
-    print ('Filling some seas for eORCA025')
+if dst_Name in [ 'eORCA025', 'eORCA025.1' ] :
+    print ('Filling some seas for ' + dst_Name )
     # Set Gibraltar strait to 0 to fill Mediterranean sea
     dst_mskutil[838:841,1125] = 0
@@ -315 +316 @@
 f_calving.masksFile       = masks
 f_calving.timeStamp       = time.asctime()
-f_calving.uuid            = f_areas.uuid
 f_calving.HOSTNAME        = platform.node()
 #f_calving.LOGNAME         = os.getlogin()