Changeset 4172

Timestamp:

12/05/18 11:17:10 (5 years ago)

Author:

omamce

Message:

O.M. :

• More documentation
• Update run-off weights computation
• Update calving weights computation

Location:

TOOLS/MOSAIX

Files:

• CalvingWeights.py (modified) (8 diffs)
• CreateOasisGrids.bash (modified) (20 diffs)
• CreateWeightsMask.bash (modified) (28 diffs)
• cotes_etal.py (modified) (17 diffs)
• rangement.bash (modified) (1 diff)

TOOLS/MOSAIX/CalvingWeights.py

@@ -42 +42 @@
 parser.add_argument ('--repartition_file', help='Data files with iceberg melting' , type=str, default='./runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' )
 parser.add_argument ('--repartition_var' , help='Variable name for iceshelf'      , type=str, default=None)
+parser.add_argument ('--output'  , help='output rmp file name', default='rmp_tlmd_to_torc_calving_64bit.nc' )
+parser.add_argument ('--fmt'     , help='NetCDF file format, using nco syntax', default='64bits', choices=['classic', 'netcdf3', '64bit', '64bit_data', '64bit_data', 'netcdf4', 'netcdf4_classsic'] )
 
 # Parse command line
@@ -63 +65 @@
 
 nb_zone = len(limit_lat)
+
+if myargs.fmt == 'classic'         : FmtNetcdf = 'CLASSIC'
+if myargs.fmt == 'netcdf3'         : FmtNetcdf = 'CLASSIC'
+if myargs.fmt == '64bit'           : FmtNetcdf = 'NETCDF3_64BIT_OFFSET'
+if myargs.fmt == '64bit_data'      : FmtNetcdf = 'NETCDF3_64BIT_DATA'
+if myargs.fmt == '64bit_offset'    : FmtNetcdf = 'NETCDF3_64BIT_OFFSET'
+if myargs.fmt == 'netcdf4'         : FmtNetcdf = 'NETCDF4'
+if myargs.fmt == 'netcdf4_classic' : FmtNetcdf = 'NETCDF4_CLASSIC'
 ### ==========================================================================================
 
@@ -258 +268 @@
         print ('  ')
 
+
+
 ## End of loop
 print (' ')
@@ -265 +277 @@
 print ( 'Total num_links : {:10d}'.format(num_links) )
 
+# Diag : interpolate uniform field
+src_field = np.zeros(shape=(src_grid_size))
+for n_bas in np.arange ( nb_zone ) :
+    index_src = ((src_grid_size - 1)*n_bas) // (nb_zone-1) + 1
+    src_field[index_src-1] = n_bas
+
+dst_field = np.zeros(shape=(dst_grid_size,))
+for link in np.arange (num_links) :
+    dst_field [dst_address [link]-1] +=  remap_matrix[link] * src_field[src_address[link]-1]
+
 ### ===== Writing the weights file, for OASIS MCT ==========================================
 
 # Output file
-calving = 'rmp_t' + src_Name + '_to_' + 't' + dst_Name + '_calving_' + myargs.type + '.nc'
-f_calving = netCDF4.Dataset ( calving, 'w', format='NETCDF3_64BIT' )
-
+calving = myargs.output
+f_calving = netCDF4.Dataset ( calving, 'w', format=FmtNetcdf )
+    
 print ('Output file: ' + calving )
 
@@ -285 +307 @@
 f_calving.title           = calving
 f_calving.Program         = "Generated by " + sys.argv[0] + " with flags " + str(sys.argv[1:])
+f_calving.repartitionType = myargs.type
+if myargs.type in ['iceberg', 'iceshelf' ] :
+    f_calving.repartitionFile = myargs.repartition_file
+    f_calving.repartitionVar  = repartitionVar
+f_calving.gridsFile       = grids
+f_calving.areasFile       = areas
+f_calving.masksFile       = masks
 f_calving.timeStamp       = time.asctime()
 f_calving.uuid            = f_areas.uuid
@@ -293 +322 @@
 f_calving.release         = platform.release()
 f_calving.hardware        = platform.machine()
-f_calving.Comment         = "Preliminary attempt - Do not trust !"
 f_calving.conventions     = "SCRIP"
 if src_name == 'lmd' : f_calving.source_grid = "curvilinear"
@@ -381 +409 @@
 v_dst_repartition[:] = key_repartition.reshape( (nb_zone,dst_grid_size) )
 
-# Additoonnal fields for debugging
+# Additionnal fields for debugging
 # ================================
 v_dst_grid_imaskutil      = f_calving.createVariable ( 'dst_grid_imaskutil'     , 'f8', ('dst_grid_size',)  )
@@ -407 +435 @@
 v_dst_imaskutil_addressed[:] = dst_mskutil.ravel()[dst_address-1].ravel()
 
+v_src_field = f_calving.createVariable ( 'src_field', 'f8', ('src_grid_size',) )
+v_dst_field = f_calving.createVariable ( 'dst_field', 'f8', ('dst_grid_size',) )
+v_src_field[:] = src_field
+v_dst_field[:] = dst_field
+
 f_calving.close ()
 

TOOLS/MOSAIX/CreateOasisGrids.bash

@@ -25 +25 @@
 #  $HeadURL$
 
-##
-## Default configuration (may be overrided by command line parameters)
+set +vx
+
+echo ${Titre}"Starting CreateOasisGrids.bash"${Norm}
+
+##
+echo ${Titre}"Default configuration (may be overrided by command line parameters)"${Norm}
 ## ===========================================================================
 OCE=ORCA2.3
@@ -32 +36 @@
 ATM=ICO30
 #ATM=ICO40
-# ATM=ICO450
-# ATM=LMD144142
-# ATM=LMD9695
+#ATM=ICO450
+#ATM=LMD144142
+#ATM=LMD9695
 
 ## ===========================================================================
@@ -42 +46 @@
 ## ===========================================================================
 
-# Defines computer
+echo ${Titre}"Defines computer"${Norm}
 # ================
 if [[ $(hostname) = curie* ]]    ; then arch=curie ; center=tgcc ; fi
@@ -72 +76 @@
 
 ##
-## Command line parameters
+echo ${Titre}"Command line parameters"${Norm}
 ## ===========================================================================
 set -e
@@ -97 +101 @@
 
 ##
-## Short names (grid names in Oasis) 
+echo ${Titre}"Short names (grid names in Oasis)"${Norm}
 ## ===========================================================================
 case ${OCE} in
@@ -111 +115 @@
 
 ##
-## Get input files
+echo ${Titre}"Get input files"${Norm}
 ## ===========================================================================
 [[ -f ${OCE}_coordinates_mask.nc ]] || cp ${R_IN}/OCE/NEMO/${OCE}/${OCE}_coordinates_mask.nc  .
@@ -117 +121 @@
 
 #
-# Format for OASIS-MCT files : should be NetCDF3 classic or NetCDF3 64 bits
+echo ${Titre}"Format for OASIS-MCT files : should be NetCDF3 classic or NetCDF3 64 bits"${Norm}
 # ---------------------------------------------------------------------------
 FL_FMT3=64bit
 
 #
-# Cleaning
+echo ${Titre}"Cleaning"${Norm}
 # ----------------------------------------------------------------------------
 rm -f grids_${CplModel}.nc masks_${CplModel}.nc areas_${CplModel}.nc
@@ -128 +132 @@
 
 #
-# Creates NetCDF3 version of input files
+echo ${Titre}"Creates NetCDF3 version of input files"${Norm}
 # ----------------------------------------------------------------------------
 ncks --overwrite --fl_fmt=${FL_FMT} --history ${OCE}_coordinates_mask.nc      ${OCE}_coordinates_mask_${FL_FMT3}.nc
@@ -135 +139 @@
 
 #
-# Creates ocean fields
+echo ${Titre}"Creates ocean fields"${Norm}
 # ----------------------------------------------------------------------------
 for OCEGRID in T U V ; do
@@ -162 +166 @@
  
 #
-# We need to have different names for dimensions and variables
+echo ${Titre}"We need to have different names for dimensions and variables"${Norm}
 # ----------------------------------------------------------------------------
 ncrename --history --variable lon,alon   grids_${CplModel}.nc
@@ -212 +216 @@
 
 #
-# DYNAMICO grids :
-#  - Set correct order of dimensions
-#  - Add a dimension
+echo ${Titre}"DYNAMICO grids : 1) Set correct order of dimensions, 2) Add a dimension"${Norm}
 # ----------------------------------------------------------------------------
 if [[ ${atm} = dynamico* || ${atm} = ico* ]] ; then
@@ -243 +245 @@
 
 #
-# Some changes specific to LMDZ lon/lat grid
+echo ${Titre}"Some changes specific to LMDZ lon/lat grid"${Norm}
 # ----------------------------------------------------------------------------
 if [[ ${atm} = lmd* ]] ; then
-    # Spreads lon and lat to get 2D fields
+    echo ${Titre}"Spreads lon and lat to get 2D fields"${Norm}
     # -----------------------------------------------------------------------
     mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
@@ -261 +263 @@
             --attribute overlap,alat,o,i,0                grids_${CplModel}.nc
     
-    # Generates cell corners
+    echo ${Titre}"Generates cell corners"${Norm}
     # -----------------------------------------------------------------------
 cat <<EOF > add_bounds.nco
@@ -290 +292 @@
 
 #
-# Generates grid "o${atm}", "o" meaning "one": same as t${atm} grid, with surfaces set to 1
+echo ${Titre}"Generates grid o${atm}, 'o' meaning 'one'"${Norm}
+# same as t${atm} grid, with surfaces set to 1
 # and mask to 0 (ocean everywhere, to compute integral over the whole grid))
 # This grid is used when field are quantities instead of fluxes (i.e river flow)
@@ -306 +309 @@
 
 #
-# Final renaming
+echo ${Titre}"Final renaming"${Norm}
 # ----------------------------------------------------------------------------
 for OCEGRID in T U V
@@ -348 +351 @@
 
 ##
-## Change all NetCDF files to NetCDF 3 format
+echo ${Titre}"Change all NetCDF files to NetCDF 3 format"${Norm}
 ## ===========================================================================
 for InFile in areas_${CplModel}.nc grids_${CplModel}.nc masks_${CplModel}.nc ; do
@@ -359 +362 @@
 
 ##
-## Add some useful information in NetCDF headers
+echo ${Titre}"Add some useful information in NetCDF headers"${Norm}
 ## ===========================================================================
 UUID=$(uuid)
@@ -390 +393 @@
             --attribute release,global,o,c,"$(uname -r)"               \
             --attribute hardware,global,o,c,"$(uname -i)"              \
-            --attribute Comment,global,o,c,"Preliminary attempt - Do not trust !" \
             --attribute SVN_Author,global,o,c,"$Author$"      \
             --attribute SVN_Date,global,o,c,"$Date$" \
@@ -399 +401 @@
 done
 
-##
-## Cleaning
-## ===========================================================================
-#rm  *_tmp.nc ${OCE}_coordinates_mask_${FL_FMT3}.nc ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc *.nco
 
 exit
 #
-# Name of the dimensions ? 
+echo ${Titre}"Name of the dimensions ?"${Norm} 
 # ----------------------------------------------------------------------------
 for OCEGRID in T U V ; do
@@ -416 +414 @@
 
 ## ===========================================================================
-##
-##                               That's all folk's !!!
-##
-## ===========================================================================
+echo ${Titre}"exit from CreateOasisGrids "${Norm}
+
+## ===========================================================================
+##
+echo ${Titre}"                  That's all folk's !!!   "${Norm}
+##
+## ===========================================================================

TOOLS/MOSAIX/CreateWeightsMask.bash

@@ -38 +38 @@
 #  $HeadURL$
 #
+set +vx
 export Bold=$(tput bold)  
 export Unde=$(tput smul) ; export OffUnde=$(tput rmul)
@@ -45 +46 @@
 for i in $(seq 0 7 ) ; do eval "export ${couleurs[$i]}=$(tput setf $i)" ; done
 export Norm=$(tput sgr0 )
+export Titre=${Bold}${Blue}
 
 ##
@@ -52 +54 @@
 
 #
-# Defines models
+echo ${Titre}"Defines models"${Norm}
 # ==============
-#OCE=ORCA2.3
+OCE=ORCA2.3
 #OCE=eORCA1.2
-OCE=eORCA025
+#OCE=eORCA025
 
 #ATM=ICO30
@@ -63 +65 @@
 ATM=LMD9695
 #ATM=LMD144142
+#ATM=LMD256256
+
+# Runoff parameter (LMDZ grids only)
+atmCoastWidth=2 ; oceCoastWidth=2 ; searchRadius=1000.0
+
+if [[ ${OCE} = ORCA2.3  && ${ATM} = LMD9695   ]] ; then atmCoastWidth=2 ; oceCoastWidth=1 ; searchRadius=1000.0 ; fi
+if [[ ${OCE} = ORCA2.3  && ${ATM} = LMD144142 ]] ; then atmCoastWidth=2 ; oceCoastWidth=1 ; searchRadius=1000.0 ; fi
+if [[ ${OCE} = eORCA1.2 && ${ATM} = LMD9695   ]] ; then atmCoastWidth=2 ; oceCoastWidth=3 ; searchRadius=1000.0 ; fi
+if [[ ${OCE} = eORCA1.2 && ${ATM} = LMD144142 ]] ; then atmCoastWidth=2 ; oceCoastWidth=3 ; searchRadius=1000.0 ; fi
 
 # Default values, used to create ocean fraction on atmospheric grid 
 DefaultValues=( Direction=o2a,oceGrid=t,atmGrid=t,Order=1st,Quantity=false,Renormalize=false,useArea=false,maskSrc=true,maskDst=false )
 
-# List of weights to build
-CommandList=( \
-    Direction=o2a,Order=1st,Quantity=false,Renormalize=true,oceGrid=t,atmGrid=t,useArea=false,maskSrc=true,maskDst=true  \
-    Direction=a2o,Order=1st,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=t,useArea=true,maskSrc=true,maskDst=true  \
-    Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=u,useArea=true,maskSrc=true,maskDst=true  \
-    Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=v,useArea=true,maskSrc=true,maskDst=true  \
-    Direction=a2o,Order=1st,Quantity=true,Renormalize=false,atmGrid=c,oceGrid=t,useArea=true,maskSrc=true,maskDst=true   \
-    )
-
-# Each item in CommandList describes the property of interpolation weights to generate. 
+## List of weights to build
+## ====================================================================================================================================
+#
+# Each item in CommandList describes the properties of interpolation weights to generate. 
 # White spaces separate analysis. No spaces in any analysis.
+#
+# Specific commands : 'Runoff', 'Calving'
 #
 # Keywords : 
@@ -85 +92 @@
 #                 or intensive value (temperature, salinity, sea-ice fraction, ...)
 #   Renormalize : used when source grid is masked, to use values on non masked points only
-#   oceGrid     : t, u or v point for OPA grid
+#   oceGrid     : t, u or v point for NEMO C grid
 #   atmGrid     : up to know, only t grid used in the atmosphere
 #   useArea     : if true area from the model metrics is used. If false, areas are computed by XIOS from grid corners
@@ -91 +98 @@
 #   maskDst     : true to use the destination grid mask, false to use all grid points
 #
+# Classic cases 
+AtmOceFluxes=" Direction=a2o,Order=1st,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=t,useArea=true,maskSrc=true,maskDst=true" # Heat and water fluxes
+OceAtmTemp="   Direction=o2a,Order=1st,Quantity=false,Renormalize=true,oceGrid=t,atmGrid=t,useArea=false,maskSrc=true,maskDst=true" # Temperature, sea-ice fraction, albedo
+AtmOceStressU="Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=u,useArea=true,maskSrc=true,maskDst=true" # Wind stress to NEMO U point
+AtmOceStressV="Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=v,useArea=true,maskSrc=true,maskDst=true" # Wind stress to NEMO V point
+# Other cases
+OceAtmFluxes=" Direction=o2a,Order=1st,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=t,useArea=true,maskSrc=true,maskDst=true" # e.g. CO2 fluxes
+AtmOceTemp="   Direction=o2a,Order=1st,Quantity=false,Renormalize=true,oceGrid=t,atmGrid=t,useArea=false,maskSrc=true,maskDst=true" # e.g. T and S correction from DWL parametrization
+AtmOceCoastal="Direction=a2o,Order=1st,Quantity=true,Renormalize=false,atmGrid=c,oceGrid=t,useArea=true,maskSrc=true,maskDst=true"  # Runoff atm to oce, limited to oce coastal points
+
+CommandList=( ${AtmOceFluxes} Runoff Calving )
+
+#CommandList=( Runoff Calving ) #\
+#    Direction=o2a,Order=1st,Quantity=false,Renormalize=true,oceGrid=t,atmGrid=t,useArea=false,maskSrc=true,maskDst=true  \
+#    Direction=a2o,Order=1st,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=t,useArea=true,maskSrc=true,maskDst=true  \
+#    Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=u,useArea=true,maskSrc=true,maskDst=true  \
+#    Direction=a2o,Order=2nd,Quantity=false,Renormalize=false,atmGrid=t,oceGrid=v,useArea=true,maskSrc=true,maskDst=true  \
+#    Direction=a2o,Order=1st,Quantity=true,Renormalize=false,atmGrid=c,oceGrid=t,useArea=true,maskSrc=true,maskDst=true   \
+#    Calving \
+#    Runoff  \
+#    )
+
+
+
+Comment="Preliminary attempt - Do not trust !"
+#Version
 
 ## ===========================================================================
@@ -169 +202 @@
     SUBMIT_DIR=${BRIDGE_MSUB_PWD:-${SUBMIT_DIR}}
     PROGRAM=${BRIDGE_MSUB_REQNAME}
-    MPIRUN=ccc_mprun
+    MpiRun="time ccc_mprun"
+    PyRun="ccc_mprun -n 1"
     source ${SUBMIT_DIR}/arch.env
     module load nco
-    module load cdo
     #source $(ccc_home -u igcmg)/MachineEnvironment/irene/env_irene
-    module load python/2.7.8
+    module load python3 
     module load datadir/igcmg
     module list
@@ -182 +215 @@
     TMPDIR=${HOME}/Scratch/TMP
     SUBMIT_DIR=$(pwd)
-    MPIRUN=/opt/local/bin/mpirun -n 4
+    MpiRun="/opt/local/bin/mpirun -n 4"
+    PyRun="time"
     ;; 
     ( * ) exit -1 ;;
@@ -209 +243 @@
 case ${OCE} in # Periodicity type of ORCA grid
     ( ORCA2.3*             ) OcePerio=4 ;;
-    ( ORCA1* | eORCA1*     ) OcePerio=6 ;;
+    ( ORCA1*   | eORCA1*   ) OcePerio=6 ;;
     ( ORCA025* | eORCA025  ) OcePerio=6 ;;
 esac
 #
-# Format for OASIS files : should be NetCDF3 classic or NetCDF3 64 bits
+echo ${Titre}"Format for OASIS files : should be NetCDF3 classic or NetCDF3 64 bits"${Norm}
 # ---------------------------------------------------------------------------
 FMT_OASIS=64bit
@@ -229 +263 @@
 ncks --overwrite --fl_fmt=${FMT_OASIS} --history ${ATM}_grid.nc             ${ATM}_grid_${FMT_OASIS}.nc
 #
-# Creates OCEAN C grid : redundant points removed to compute proper integrals # A passer dans CreateWeights
+echo ${Titre}"Creates OCEAN C grid : redundant points removed to compute proper integrals # A passer dans CreateWeights"${Norm}
 # --------------------------------------------------------------------------------------------------------
 cat <<EOF >add_c_grid.nco
@@ -258 +292 @@
 
 ##
-## NEMO T point towards ATM - 1st order
+echo ${Titre}"NEMO T point towards ATM - 1st order"${Norm}
 ## ===========================================================================
 echo "Command parameters : ${Command}"
@@ -267 +301 @@
 cp iodef_oce_to_atm.xml   iodef.xml
 
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name  -v maskutil_T
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="area_src"]'   -k name  -v area_grid_T
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_src"]'                   -k type  -v ${srcDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_dst"]'                   -k type  -v ${dstDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k order -v 1
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k quantity    -v false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k renormalize -v false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k use_area -v false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name  -v maskutil_T
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name  -v area_grid_T
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]'                               -k name  -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="title"]'       -t "${SRC} mask interpolated to ${DST}"
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="source_grid"]' -t ${srcDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="dest_grid"]'   -t ${dstDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="order"]'       -t 1
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_src"]'                    -k type  -v ${srcDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]'                    -k type  -v ${dstDomainType}
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.nc
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k order -v 1
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="normalization"]' -t false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="quantity"]'      -t false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="use_area"]'      -t false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k renormalize -v false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k quantity    -v false
-python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k use_area    -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name  -v maskutil_T
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="area_src"]'   -k name  -v area_grid_T
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_src"]'                   -k type  -v ${srcDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_dst"]'                   -k type  -v ${dstDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k order -v 1
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k quantity    -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k renormalize -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k use_area -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name  -v maskutil_T
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name  -v area_grid_T
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]'                               -k name  -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="title"]'       -t "${SRC} mask interpolated to ${DST}"
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="source_grid"]' -t ${srcDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="dest_grid"]'   -t ${dstDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="order"]'       -t 1
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_src"]'                    -k type  -v ${srcDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]'                    -k type  -v ${dstDomainType}
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain' -k weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.nc
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k order -v 1
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="normalization"]' -t false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="quantity"]'      -t false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="use_area"]'      -t false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k renormalize -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k quantity    -v false
+python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k use_area    -v false
 
 cp iodef.xml iodef_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.xml
@@ -297 +331 @@
 ln -fs ${ATM}_grid.nc              atm_grid.nc
 
-time /usr/bin/time ${MPIRUN} ./interpol.exe --mask_src=${maskSrc} --mask_dst=${maskDst} --use_area=${useArea}
-##
-## Correct spurious values (extremes)
+${MpiRun} ./interpol.exe --mask_src=${maskSrc} --mask_dst=${maskDst} --use_area=${useArea}
+
+##
+echo ${Titre}"Correct spurious values (extremes)"${Norm}
 ## ===========================================================================
 cat <<EOF > correction_masque.nco
@@ -313 +348 @@
 
 ##
-##  Creates ocean fractions on ATM grid
+echo ${Titre}"Creates ocean fractions on ATM grid"${Norm}
 ## ===========================================================================
 cp dia_t${oce}_to_t${atm}_${Suffix}.nc  dia_t${oce}_to_t${atm}_${Suffix}_mask.nc
@@ -330 +365 @@
 rm dia_t${oce}_to_t${atm}_${Suffix}_mask.nc
 
-# Change dimension names, and some attributes accordingly
+echo "Change dimension names, and some attributes accordingly"
 if [[ $(ncdump -h ${ATM}_grid_maskFrom_${OCE}.nc | grep domain_dst | wc -l) -gt 0 ]] ; then
     case ${atm} in
@@ -357 +392 @@
 
 ##
-## Creates mask of coastal OCE points
-## ===========================================================================
-ccc_mprun -n 1 python -u ComputeNemoCoast.py -n ${OcePerio} -i ${OCE}_coordinates_mask.nc # Creates OceCoastal
-##
-## Creates mask of coastal ATM points
+echo ${Titre}"Creates mask of coastal OCE points"${Norm}
+## ===========================================================================
+${PyRun} python3 -u ComputeNemoCoast.py -n ${OcePerio} -i ${OCE}_coordinates_mask.nc # Creates OceCoastal
+
+##
+echo ${Titre}"Creates mask of coastal ATM points"${Norm}
 ## ===========================================================================
 cat <<EOF > coastal.nco
@@ -374 +410 @@
 
 ##
-## Other weights files
+echo ${Titre}"Other weights files"${Norm}
 ## ===========================================================================
 # Loop on commands
@@ -382 +418 @@
     read_Command ${DefaultValues}
     read_Command ${Command}
+
+    if [[ ${Command} = "Runoff"  ]] ; then okRunoff=yes  ; continue ; fi
+    if [[ ${Command} = "Calving" ]] ; then okCalving=yes ; continue ; fi
+    
     setValues
     
@@ -391 +431 @@
         cp iodef_oce_to_atm.xml iodef.xml
         
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name -v mask_${DSTGRID} 
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_dst"]/field[@id="mask_dst"]'   -k name -v OceMask
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name -v mask_${DSTGRID} 
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_dst"]/field[@id="mask_dst"]'   -k name -v OceMask
         
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name -v maskutil_${SRCGRID}
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name -v area_grid_${SRCGRID}
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="mask_dest"]'   -k name -v OceMask
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="area_dest"]'   -k name -v aire
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name -v maskutil_${SRCGRID}
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name -v area_grid_${SRCGRID}
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="mask_dest"]'   -k name -v OceMask
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="area_dest"]'   -k name -v aire
         ;;
         ( a2o )
         cp iodef_atm_to_oce.xml iodef.xml
         
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name -v OceMask
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_dst"]/field[@id="mask_dst"]'   -k name -v mask_${DSTGRID}
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_src"]/field[@id="mask_src"]'   -k name -v OceMask
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/file_definition/file[@id="file_dst"]/field[@id="mask_dst"]'   -k name -v mask_${DSTGRID}
         
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name  -v OceMask
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name  -v aire
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="mask_dest"]'   -k name  -v mask_${DSTGRID}
-        python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="area_dest"]'   -k name  -v area_grid_${DSTGRID}
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name  -v OceMask
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="area_source"]' -k name  -v aire
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="mask_dest"]'   -k name  -v mask_${DSTGRID}
+        python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_dst"]/field[@id="area_dest"]'   -k name  -v area_grid_${DSTGRID}
         ;;
     esac
     
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_dst"]'                     -k type  -v ${dstDomainType}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_src"]'                     -k type  -v ${srcDomainType}
-    
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_src"]'                      -k type  -v ${srcDomainType}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]'                      -k type  -v ${dstDomainType}
-    
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.nc
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k order       -v ${numOrder}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k quantity    -v ${Quantity}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k renormalize -v ${Renormalize}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k use_area    -v ${useArea}
-    
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]'                                 -k name -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="title"]'         -t "${SRC} mask interpolated to ${DST}"
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="dest_grid"]'     -t ${dstDomainType}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="source_grid"]'   -t ${srcDomainType}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="normalization"]' -t ${Renormalize}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="order"]'         -t ${numOrder}   
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="quantity"]'      -t ${Quantity}
-    python update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="use_area"]'      -t ${useArea}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_dst"]'                     -k type  -v ${dstDomainType}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_read"]/domain_definition/domain[@id="domain_src"]'                     -k type  -v ${srcDomainType}
+    
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_src"]'                      -k type  -v ${srcDomainType}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]'                      -k type  -v ${dstDomainType}
+    
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.nc
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k order       -v ${numOrder}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k quantity    -v ${Quantity}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k renormalize -v ${Renormalize}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/domain_definition/domain[@id="domain_dst"]/interpolate_domain'   -k use_area    -v ${useArea}
+    
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]'                                 -k name -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="title"]'         -t "${SRC} mask interpolated to ${DST}"
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="dest_grid"]'     -t ${dstDomainType}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="source_grid"]'   -t ${srcDomainType}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="normalization"]' -t ${Renormalize}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="order"]'         -t ${numOrder}   
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="quantity"]'      -t ${Quantity}
+    python3 update_xml.py -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="use_area"]'      -t ${useArea}
     
     cp iodef.xml iodef_${srcGrid}${src}_to_${dstGrid}${dst}_${Suffix}.xml
-    time /usr/bin/time ${MPIRUN} ./interpol.exe --mask_src=${maskSrc} --mask_dst=${maskDst} --use_area=${useArea}
+    ${MpiRun} ./interpol.exe --mask_src=${maskSrc} --mask_dst=${maskDst} --use_area=${useArea}
 done
 
 ##
-## Copy all NetCDF files to NetCDF 3 format (needed for OASIS)
+echo ${Titre}"Copy all NetCDF files to NetCDF 3 format (needed for OASIS)"${Norm}
 ## ===========================================================================
 for InFile in *.nc ; do
@@ -446 +486 @@
 
 ##
-## Add time axis and coordinates information
+echo ${Titre}"Add time axis and coordinates information"${Norm}
 ## (needed if files need to be read by XIOS)
 ## ===========================================================================
@@ -491 +531 @@
 
 ##
-## Add some metadata in file headers
+echo ${Titre}"Add some metadata in file headers"${Norm}
 ## ===========================================================================
 
 UUID=$(uuid)
 NCO="$(ncks --version |& tail -1|sed 's/ncks //')"
-PYTHON_VER=$( python -c "import sys ; print (sys.version.split(' ')[0])" )
+PYTHON_VER=$( python3 -c "import sys ; print (sys.version.split(' ')[0])" )
 for InFile in $(ls *${oce}_to_*${atm}_*.nc *${atm}_to_*${oce}_*.nc ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc 2>/dev/null) ; do
     ncatted --history \
@@ -520 +560 @@
             --attribute LOGNAME,global,o,c,"$(whoami)"                            \
             --attribute NCO,global,o,c,"NCO netCDF Operator ${NCO} http://nco.sourceforge.net" \
-            --attribute Python,global,o,c,"Python version ${PYTHON_VER}"          \
+            --attribute Python,global,o,c,"Python3 version ${PYTHON_VER}"          \
             --attribute OS,global,o,c,"$(uname -o)"                               \
             --attribute release,global,o,c,"$(uname -r)"                          \
             --attribute directory,global,o,c,"$(pwd)"                             \
             --attribute description,global,o,c,"Generated with XIOS http://forge.ipsl.jussieu.fr/ioserver and MOSAIX https://forge.ipsl.jussieu.fr/igcmg/browser/TOOLS/MOSAIX" \
-            --attribute Comment,global,o,c,"Preliminary attempt - Do not trust !" \
             --attribute SVN_Author,global,o,c,'$Author$'                 \
             --attribute SVN_Date,global,o,c,'$Date$'                            \
@@ -533 +572 @@
 done
 ##
-## Update and complete weight files to fit OASIS requested format
+echo ${Titre}"Update and complete weight files to fit OASIS requested format"${Norm}
 ## ===========================================================================
 cat <<EOF > add_dim.nco
@@ -582 +621 @@
 
 ##
-## Add missing variables in rmp files
+echo ${Titre}"Add missing variables in rmp files"${Norm}
 ## ===========================================================================
 for $(ls rmpFile in rmp_?${atm}_to_[tuv]${oce}_*.nc rmp_[tuv]${oce}_to_t${atm}_*.nc* 2>/dev/null) ; do
@@ -721 +760 @@
 
 ##
-## Creates and save auxiliary files for OASIS : grids.nc, areas.nc and masks.nc
+echo ${Titre}"Creates and save auxiliary files for OASIS : grids.nc, areas.nc and masks.nc"${Norm}
 ## ============================================================================
 bash ${SUBMIT_DIR}/CreateOasisGrids.bash --oce ${OCE} --atm ${ATM}
+
+
+
+##
+echo ${Titre}"Runoff weights"${Norm}
+## ===========================================================================
+if [[ "X${okRunoff}" = "Xyes" && "${atm}" = "lmd" ]] ; then
+    ${PyRun} python3 -u cotes_etal.py --oce=${OCE} --atm=${ATM} \
+              --atmCoastWidth=${atmCoastWidth} --oceCoastWidth=${oceCoastWidth} --searchRadius=${searchRadius} \
+              --grids=grids_${OCE}x${ATM}.nc --areas=areas_${OCE}x${ATM}.nc --masks=masks_${OCE}x${ATM}.nc \
+              --o2a=${ATM}_grid_maskFrom_${OCE}.nc --output=rmp_t${atm}_to_t${oce}_runoff_${FMT_OASIS}.nc \
+              --fmt=${FMT_OASIS}
+fi
+
+##
+echo ${Titre}"Calving weights"${Norm}
+## ===========================================================================
+if [[ "X${okCalving}" = "Xyes" ]] ; then
+    case ${OCE} in
+        ( eORCA025 )
+        cp ${R_IN}/OCE/NEMO/ORCA025_LIM3_PISCES/v3.6_stable/eORCA_R025_runoff_v1.1.nc .
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_full_${FMT_OASIS}.nc     --fmt=${FMT_OASIS} \
+                  --oce=${OCE} --atm=${ATM} --type=full     --dir=.
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_nosouth_${FMT_OASIS}.nc  --fmt=${FMT_OASIS} \
+                  --oce=${OCE} --atm=${ATM} --type=nosouth  --dir=.  --repartition_file=eORCA_R025_runoff_v1.1.nc
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceberg_${FMT_OASIS}.nc  --fmt=${FMT_OASIS} \
+                  --oce=${OCE} --atm=${ATM} --type=iceberg  --dir=.  --repartition_file=eORCA_R025_runoff_v1.1.nc --repartition_var=sornficbisf
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceshelf_${FMT_OASIS}.nc --fmt=${FMT_OASIS} \
+                  --oce=${OCE} --atm=${ATM} --type=iceshelf --dir=.  --repartition_file=eORCA_R025_runoff_v1.1.nc --repartition_var=sofwfisf
+        ;;
+        
+        ( eORCA1.2 )
+        cp ${R_IN}/OCE/NEMO/ORCA1_LIM3_PISCES/v3.6_stable/runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc .
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_nosouth_${FMT_OASIS}.nc  --fmt=${FMT_OASIS}\
+                  --oce=${OCE} --atm=${ATM} --type=nosouth  --dir=. 
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceberg_${FMT_OASIS}.nc  --fmt=${FMT_OASIS}\
+                  --oce=${OCE} --atm=${ATM} --type=iceberg  --dir=. --repartition_file=runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc --repartition_var=Icb_flux
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceshelf_${FMT_OASIS}.nc --fmt=${FMT_OASIS}\
+                  --oce=${OCE} --atm=${ATM} --type=iceshelf --dir=. --repartition_file=runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc --repartition_var=sornfisf
+        ;;
+        
+        ( * )
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_full_${FMT_OASIS}.nc --fmt=${FMT_OASIS} \
+                  --oce=${OCE} --atm=${ATM} --type=full     --dir=.
+        ;;
+
+    esac
+fi
+
+##
+echo ${Titre}"Save results"${Norm}
+## ===========================================================================
+
+cp ${ATM}_grid_maskFrom_${OCE}.nc ${SUBMIT_DIR}
+for File in dia_*.nc rmp_*.nc 
+do
+    ncatted --history --attribute history_of_appended_files,global,d,c,"" ${File}
+    [[ "X${Comment}" != "X" ]] && ncatted --history --attribute Comment,global,o,c,"${Comment}"  ${File}
+    [[ "X${Version}" != "X" ]] && ncatted --history --attribute Version,global,o,c,"${Version}"  ${File}
+    
+    NewFile=$(echo ${File} | sed -e "s/${atm}/${ATM}/" -e "s/${oce}/${OCE}/" )
+    cp ${File} ${SUBMIT_DIR}/${NewFile}
+done
 
 cp areas_${OCE}x${ATM}.nc ${SUBMIT_DIR}
@@ -729 +831 @@
 cp masks_${OCE}x${ATM}.nc ${SUBMIT_DIR}
 
-##
-## Calving weights
-## ===========================================================================
-case ${OCE} in
-    ( eORCA025 )
-    ccc_mprun -n 1 python -u CalvingWeights.py --oce=${OCE} --atm=${ATM} --type=full     --dir=.
-    ;;
-    
-    ( eORCA1.2 )
-    cp ${R_IN}/OCE/NEMO/ORCA1_LIM3_PISCES/v3.6_stable/runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc .
-    ccc_mprun -n 1 python CalvingWeights.py --oce=${OCE} --atm=${ATM} --type=nosouth  --dir=. 
-    ccc_mprun -n 1 python CalvingWeights.py --oce=${OCE} --atm=${ATM} --type=iceberg  --dir=. --repartition_file=runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc --repartition_var=Icb_flux
-    ccc_mprun -n 1 python CalvingWeights.py --oce=${OCE} --atm=${ATM} --type=iceshelf --dir=. --repartition_file=runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc --repartition_var=sornfisf
-    ;;
-    
-    ( * )
-    ccc_mprun -n 1 python CalvingWeights.py --oce=${OCE} --atm=${ATM} --type=full     --dir=.
-    ;;
-esac
-
-##
-## Save results
-## ===========================================================================
-cp ${ATM}_grid_maskFrom_${OCE}.nc ${SUBMIT_DIR}
-for File in dia_*.nc rmp_*.nc
-do
-    ncatted --history --attribute history_of_appended_files,global,d,c,"" ${File}
-    NewFile=$(echo ${File} | sed -e "s/${atm}/${ATM}/" -e "s/${oce}/${OCE}/" )
-    cp ${File} ${SUBMIT_DIR}/${NewFile}
-done
-
-##
-## Creates a README.txt file
+
+##
+echo ${Titre}"Creates a README.txt file"${Norm}
 ## ===========================================================================
 [[ -f README.txt ]] && rm README.txt
@@ -802 +874 @@
 echo '$HeadURL$ ' >> README.txt
 
-# Compute checksums and add thmer to README
+echo ${Titre}"Compute checksums and add them to README"${Norm}
 # -----------------------------------------
 cat << EOF >> README.txt
@@ -824 +896 @@
 ## ===========================================================================
 ##
-##                               That's all folk's !!!
-##
-## ===========================================================================
-
+echo ${Titre}"     That's all folk's !!!    "${Norm}
+##
+## ===========================================================================
+

TOOLS/MOSAIX/cotes_etal.py

@@ -25 +25 @@
 ##
 
+## Modules
 import netCDF4
 import numpy as np
@@ -32 +33 @@
 
 ## Userful constants
-zero = np.dtype('float64').type(0.0)
-zone = np.dtype('float64').type(1.0)
+zero    = np.dtype('float64').type(0.0)
+zone    = np.dtype('float64').type(1.0)
 epsfrac = np.dtype('float64').type(1.0E-10)
-pi  = np.pi
-rad = pi/np.dtype('float64').type(180.0)
-ra = np.dtype('float64').type(6400000.0) # Earth radius
+pi      = np.pi
+rad     = pi/np.dtype('float64').type(180.0)
+ra      = np.dtype('float64').type(6371229.0) # Earth radius
 
 ## Functions
@@ -47 +48 @@
       return geodist
 
-
-   
-
 ### ===== Reading command line parameters ==================================================
 # Creating a parser
@@ -57 +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 ('--atm'   , help='atm model name (LMD*)', type=str, default='LMD9695'    )
-parser.add_argument ('--atmCoastWidth', help='width of the coastal band in atmosphere (in grid points)', default=1 )
-parser.add_argument ('--oceCoastWidth', help='width of the coastal band in ocean (in grid points)'     , default=2 )
-parser.add_argument ('--grids', help='grids file name', default='grids.nc' )
-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 ('--output', help='output rmp file name', default='rmp_tlmd_to_torc_runoff.nc' )
+parser.add_argument ('--oce'          , help='oce model name', type=str, default='eORCA1.2', choices=['ORCA2.3', 'eORCA1.2', 'eORCA025'] )
+parser.add_argument ('--atm'          , help='atm model name (LMD*)', type=str, default='LMD9695'    )
+parser.add_argument ('--atmCoastWidth', help='width of the coastal band in atmosphere (in grid points)', type=int, default=1 )
+parser.add_argument ('--oceCoastWidth', help='width of the coastal band in ocean (in grid points)'     , type=int, default=2 )
+parser.add_argument ('--searchRadius' , help='max distance to connect a land point to an ocean point (in km)', type=float, default=600000.0)
+parser.add_argument ('--grids' , help='grids file name', default='grids.nc' )
+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 ('--output', help='output rmp file name', default='rmp_tlmd_to_torc_runoff_64bit.nc' )
+parser.add_argument ('--fmt'   , help='NetCDF file format, using nco syntax', default='64bit', choices=['classic', 'netcdf3', '64bit', '64bit_data', '64bit_data', 'netcdf4', 'netcdf4_classsic'] )
 
 # Parse command line
@@ -83 +83 @@
 # Width of the coastal band (ocean points) in the ocean 
 oceCoastWidth = myargs.oceCoastWidth
-
+searchRadius  = myargs.searchRadius * 1000.0 # From km to meters
+# Netcdf format
+if myargs.fmt == 'classic'         : FmtNetcdf = 'CLASSIC'
+if myargs.fmt == 'netcdf3'         : FmtNetcdf = 'CLASSIC'
+if myargs.fmt == '64bit'           : FmtNetcdf = 'NETCDF3_64BIT_OFFSET'
+if myargs.fmt == '64bit_data'      : FmtNetcdf = 'NETCDF3_64BIT_DATA'
+if myargs.fmt == '64bit_offset'    : FmtNetcdf = 'NETCDF3_64BIT_OFFSET'
+if myargs.fmt == 'netcdf4'         : FmtNetcdf = 'NETCDF4'
+if myargs.fmt == 'netcdf4_classic' : FmtNetcdf = 'NETCDF4_CLASSIC'
 
 ### Read coordinates of all models
@@ -93 +101 @@
 maskFile   = netCDF4.Dataset ( masks )
 
-o2aFrac             = diaFile ['field01_dst'][:].filled()
+o2aFrac             = diaFile ['OceFrac'][:].squeeze()
 o2aFrac = np.where ( np.abs(o2aFrac) < 1E10, o2aFrac, 0.0)
 
-atm_grid_center_lat = gridFile['tlmd.lat'][:].filled()
-atm_grid_center_lon = gridFile['tlmd.lon'][:].filled()
-atm_grid_corner_lat = gridFile['tlmd.cla'][:].filled()
-atm_grid_corner_lon = gridFile['tlmd.clo'][:].filled()
-
-atm_grid_area       = areaFile['tlmd.srf'][:].filled()
-atm_grid_imask      = 1-maskFile['tlmd.msk'][:].squeeze().filled()
+atm_grid_center_lat = gridFile['tlmd.lat'][:]
+atm_grid_center_lon = gridFile['tlmd.lon'][:]
+atm_grid_corner_lat = gridFile['tlmd.cla'][:]
+atm_grid_corner_lon = gridFile['tlmd.clo'][:]
+
+atm_grid_area       = areaFile['tlmd.srf'][:]
+atm_grid_imask      = 1-maskFile['tlmd.msk'][:].squeeze()
 atm_grid_dims       = atm_grid_area.shape
 (atm_nvertex, atm_jpj, atm_jpi) = atm_grid_corner_lat.shape
@@ -110 +118 @@
 atm_grid_size = atm_jpj*atm_jpi
 
-oce_grid_center_lat = gridFile['torc.lat'][:].filled()
-oce_grid_center_lon = gridFile['torc.lon'][:].filled()
-oce_grid_corner_lat = gridFile['torc.cla'][:].filled()
-oce_grid_corner_lon = gridFile['torc.clo'][:].filled()
-oce_grid_area       = areaFile['torc.srf'][:].filled()
-oce_grid_imask      = 1-maskFile['torc.msk'][:].filled()
+oce_grid_center_lat = gridFile['torc.lat'][:]
+oce_grid_center_lon = gridFile['torc.lon'][:]
+oce_grid_corner_lat = gridFile['torc.cla'][:]
+oce_grid_corner_lon = gridFile['torc.clo'][:]
+oce_grid_area       = areaFile['torc.srf'][:]
+oce_grid_imask      = 1-maskFile['torc.msk'][:]
 oce_grid_dims       = oce_grid_area.shape
 (oce_nvertex, oce_jpj, oce_jpi) = oce_grid_corner_lat.shape ; jpon=oce_jpj*oce_jpj
@@ -151 +159 @@
 oceCoast_address         = oce_address        [oceCoast]
 
-
 print ("Determination d'une bande cotiere atmosphere " )
 atmLand      = np.where (o2aFrac[:] < epsfrac       , True, False)
@@ -183 +190 @@
 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 < 600000.0, True, False)
+    z_mask = np.where ( z_dist*ra < searchRadius, True, False)
     num_links = z_mask.sum()
     if num_links == 0 : continue
     z_area = oceCoast_grid_area[z_mask].sum()
     poids = 1.0 / z_area
-    print ( num_links, z_mask.sum(), z_area )
+    #print ( num_links, z_mask.sum(), z_area )
     #
     matrix_local     = np.ones ((num_links),dtype=np.float64) * poids
@@ -199 +206 @@
     atm_address  = np.append ( atm_address , atm_address_local )
     oce_address  = np.append ( oce_address , oce_address_local )
-        
 
 print ('End of loop')
@@ -207 +213 @@
 ### Output file
 runoff = myargs.output
-f_runoff = netCDF4.Dataset ( runoff, 'w', format='NETCDF3_64BIT' )
-
+f_runoff = netCDF4.Dataset ( runoff, 'w', format=FmtNetcdf )
 print ('Output file: ' + runoff )
 
@@ -222 +227 @@
 f_runoff.title           = runoff
 f_runoff.Program         = "Generated by " + sys.argv[0] + " with flags " + str(sys.argv[1:])
+f_runoff.atmCoastWidth   = str(atmCoastWidth) + " grid points"
+f_runoff.oceCoastWidth   = str(oceCoastWidth) + " grid points"
+f_runoff.searchRadius    = str(searchRadius/1000.) + " km"
+f_runoff.gridsFile       = grids
+f_runoff.areasFile       = areas
+f_runoff.masksFile       = masks
+f_runoff.o2aFile         = o2a
 f_runoff.timeStamp       = time.asctime()
 f_runoff.uuid            = areaFile.uuid
@@ -230 +242 @@
 f_runoff.release         = platform.release()
 f_runoff.hardware        = platform.machine()
-f_runoff.Comment         = "Preliminary attempt - Do not trust !"
 f_runoff.conventions     = "SCRIP"
 f_runoff.source_grid     = "curvilinear"
@@ -241 +252 @@
 f_runoff.SVN_HeadURL     = "$HeadURL$"
 
-num_links        = f_runoff.createDimension ('num_links'       , num_links )
-num_wgts         = f_runoff.createDimension ('num_wgts'        ,         1 )
-
-atm_grid_size    = f_runoff.createDimension ('src_grid_size'   , atm_grid_size )
-atm_grid_corners = f_runoff.createDimension ('src_grid_corners', atm_grid_corner_lon.shape[0]  )
-atm_grid_rank    = f_runoff.createDimension ('src_grid_rank'   ,        2  )
-
-oce_grid_size    = f_runoff.createDimension ('dst_grid_size'   , oce_grid_size )
-oce_grid_corners = f_runoff.createDimension ('dst_grid_corners', oce_grid_corner_lon.shape[0] )
-oce_grid_rank    = f_runoff.createDimension ('dst_grid_rank'   ,        2  )
+d_num_links        = f_runoff.createDimension ('num_links'       , num_links )
+d_num_wgts         = f_runoff.createDimension ('num_wgts'        ,         1 )
+
+d_atm_grid_size    = f_runoff.createDimension ('src_grid_size'   , atm_grid_size )
+d_atm_grid_corners = f_runoff.createDimension ('src_grid_corners', atm_grid_corner_lon.shape[0]  )
+d_atm_grid_rank    = f_runoff.createDimension ('src_grid_rank'   ,        2  )
+
+d_oce_grid_size    = f_runoff.createDimension ('dst_grid_size'   , oce_grid_size )
+d_oce_grid_corners = f_runoff.createDimension ('dst_grid_corners', oce_grid_corner_lon.shape[0] )
+d_oce_grid_rank    = f_runoff.createDimension ('dst_grid_rank'   ,        2  )
 
 v_remap_matrix = f_runoff.createVariable ( 'remap_matrix', 'f8', ('num_links', 'num_wgts') )
@@ -280 +291 @@
 v_atm_grid_center_lon[:] = atm_grid_center_lon[:].ravel()
 v_atm_grid_center_lat[:] = atm_grid_center_lat[:].ravel()
-v_atm_grid_corner_lon[:] = atm_grid_corner_lon.reshape( (atm_jpi*atm_jpj, atm_grid_corners.__len__()) )
-v_atm_grid_corner_lat[:] = atm_grid_corner_lat.reshape( (atm_jpi*atm_jpj, atm_grid_corners.__len__()) )
+v_atm_grid_corner_lon[:] = atm_grid_corner_lon.reshape( (atm_jpi*atm_jpj, d_atm_grid_corners.__len__()) )
+v_atm_grid_corner_lat[:] = atm_grid_corner_lat.reshape( (atm_jpi*atm_jpj, d_atm_grid_corners.__len__()) )
 v_atm_grid_area      [:] = atm_grid_area[:].ravel()
 v_atm_grid_imask     [:] = atm_grid_imask[:].ravel()
@@ -307 +318 @@
 v_oce_grid_center_lon[:] = oce_grid_center_lon[:].ravel()
 v_oce_grid_center_lat[:] = oce_grid_center_lat[:].ravel()
-v_oce_grid_corner_lon[:] = oce_grid_corner_lon.reshape( (oce_jpi*oce_jpj, oce_grid_corners.__len__()) )
-v_oce_grid_corner_lat[:] = oce_grid_corner_lon.reshape( (oce_jpi*oce_jpj, oce_grid_corners.__len__()) )
+v_oce_grid_corner_lon[:] = oce_grid_corner_lon.reshape( (oce_jpi*oce_jpj, d_oce_grid_corners.__len__()) )
+v_oce_grid_corner_lat[:] = oce_grid_corner_lon.reshape( (oce_jpi*oce_jpj, d_oce_grid_corners.__len__()) )
 v_oce_grid_area      [:] = oce_grid_area[:].ravel()
 v_oce_grid_imask     [:] = oce_grid_imask[:].ravel()
 v_oce_grid_pmask     [:] = oce_grid_pmask[:].ravel()
 
-## For diag, not used by OASIS
 v_atm_lon_addressed   = f_runoff.createVariable ( 'src_lon_addressed'  , 'f8', ('num_links',) )
 v_atm_lat_addressed   = f_runoff.createVariable ( 'src_lat_addressed'  , 'f8', ('num_links',) )
@@ -368 +378 @@
 v_oceCoast[:]     = oceCoast.ravel()
 
-f_runoff.close ()
+f_runoff.sync ()
+
+## 
+f_runoff.close()
+
+print ('The end')
+
+## ======================================================================================

TOOLS/MOSAIX/rangement.bash

@@ -17 +17 @@
 # ============================================================
 
-for ATM in LMD144142 LMD9695 ICO30 ICO40 ICO450 dynamico30 dynamico40 dynamico450
+for ATM in LMD144142 LMD9695 LMD256256 ICO30 ICO40 ICO450 dynamico30 dynamico40 dynamico450
 do
-    for OCE in ORCA2.3 eORCA1.2 ORCA025
+    for OCE in ORCA2.3 eORCA1.2 eORCA025 ORCA025 
     do
         Liste=$(ls README_${OCE}x${ATM}.txt *${ATM}*_*${OCE}*.nc *${OCE}*_*${ATM}*.nc  *${ATM}x${OCE}*.nc *${OCE}x${ATM}*.nc 2> /dev/null  )