Changeset 4298 for TOOLS/MOSAIX/RunoffWeights.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/RunoffWeights.py (modified) (6 diffs)

TOOLS/MOSAIX/RunoffWeights.py

@@ -55 +55 @@
 
 # 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', type=str, default='LMD9695'    )
 parser.add_argument ('--atmCoastWidth', help='width of the coastal band in atmosphere (in grid points)', type=int, default=1 )
@@ -65 +65 @@
 parser.add_argument ('--areas' , help='masks file name', default='areas.nc' )
 parser.add_argument ('--masks' , help='areas file name', default='masks.nc' )
-parser.add_argument ('--o2a'   , help='o2a file name'  , default='o2a.nc' )
+parser.add_argument ('--o2a'   , help='o2a file name'  , default='o2a.nc'   )
 parser.add_argument ('--output', help='output rmp file name', default='rmp_tlmd_to_torc_runoff.nc' )
 parser.add_argument ('--fmt'   , help='NetCDF file format, using nco syntax', default='netcdf4', choices=['classic', 'netcdf3', '64bit', '64bit_data', '64bit_data', 'netcdf4', 'netcdf4_classsic'] )
@@ -152 +152 @@
 oce_grid_imask = oce_grid_imask2D.ravel()
 ## 
-print ("Determination d'une bande cotiere ocean")
+print ("Computes an ocean coastal band")
 
 oceLand2D  = np.reshape ( np.where (oce_grid_pmask[:] < 0.5, True, False), (oce_jpj, oce_jpi) )
@@ -179 +179 @@
 oceCoast_address         = oce_address        [oceCoast]
 
-print ("Determination d'une bande cotiere atmosphere " )
+print ("Computes an atmosphere coastal band " )
 atmLand      = np.where (o2aFrac[:] < epsfrac       , True, False)
 atmLandFrac  = np.where (o2aFrac[:] < zone-epsfrac  , True, False)
@@ -186 +186 @@
 atmOceanFrac = np.where (o2aFrac[:] > epsfrac       , True, False)
 
-## La suite marche avec LMDZ seulement !!
+## For LMDZ only !!
 if atmDomainType == 'rectilinear' :
     NNatm = 1+2*atmCoastWidth
@@ -270 +270 @@
 f_runoff.o2aFile         = o2a
 f_runoff.timeStamp       = time.asctime()
-f_runoff.uuid            = areaFile.uuid
 f_runoff.HOSTNAME        = platform.node()
 #f_runoff.LOGNAME         = os.getlogin()