Changeset 4199 for TOOLS

Timestamp:

12/18/18 16:06:39 (5 years ago)

Author:

omamce

Message:

O.M. : MOASAIX, suppress generation of NetCDF3 files

Location:

TOOLS/MOSAIX

Files:

• CalvingWeights.py (modified) (1 diff)
• CreateOasisGrids.bash (modified) (15 diffs)
• CreateWeightsMask.bash (modified) (35 diffs)
• RunoffWeights.py (modified) (5 diffs)

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='64bit', choices=['classic', 'netcdf3', '64bit', '64bit_data', '64bit_data', 'netcdf4', 'netcdf4_classsic'] )
+parser.add_argument ('--output'  , help='output rmp file name', default='rmp_tlmd_to_torc_calving.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'] )
 
 # Parse command line

TOOLS/MOSAIX/CreateOasisGrids.bash

@@ -123 +123 @@
 echo ${Titre}"Format for OASIS-MCT files : should be NetCDF3 classic or NetCDF3 64 bits"${Norm}
 # ---------------------------------------------------------------------------
-FL_FMT3=64bit
-
+FL_FMT=netcdf4
 #
 echo ${Titre}"Cleaning"${Norm}
@@ -132 +131 @@
 
 #
-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
-ncks --overwrite --fl_fmt=${FL_FMT} --history ${ATM}_grid_maskFrom_${OCE}.nc  ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc
-
-
 #
 echo ${Titre}"Creates ocean fields"${Norm}
 # ----------------------------------------------------------------------------
 for OCEGRID in T U V ; do
-    ncks --fl_fmt=${FL_FMT3} -C --history --append --variable nav_lon_grid_${OCEGRID},nav_lat_grid_${OCEGRID},bounds_lon_grid_${OCEGRID},bounds_lat_grid_${OCEGRID} ${OCE}_coordinates_mask_${FL_FMT3}.nc grids_${CplModel}.nc
-    ncks --fl_fmt=${FL_FMT3} -C --history --append --variable area_grid_${OCEGRID} ${OCE}_coordinates_mask_${FL_FMT3}.nc areas_${CplModel}.nc
+    ncks -C --history --append --variable nav_lon_grid_${OCEGRID},nav_lat_grid_${OCEGRID},bounds_lon_grid_${OCEGRID},bounds_lat_grid_${OCEGRID} ${OCE}_coordinates_mask.nc grids_${CplModel}.nc
+    ncks -C --history --append --variable area_grid_${OCEGRID} ${OCE}_coordinates_mask.nc areas_${CplModel}.nc
     # Inverts mask values and switch to integer
-    ncks --fl_fmt=${FL_FMT33} --history -C --variable mask_${OCEGRID} ${OCE}_coordinates_mask_${FL_FMT3}.nc mask_${OCEGRID}_tmp.nc
+    ncks --history -C --variable mask_${OCEGRID} ${OCE}_coordinates_mask.nc mask_${OCEGRID}_tmp.nc
     ncatted --history \
             --attribute coordinates,mask_${OCEGRID},d,,         \
@@ -152 +145 @@
     mask_${OCEGRID}_tmp.nc
     
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script "mask_${OCEGRID}=int(1-mask_${OCEGRID});"    mask_${OCEGRID}_tmp.nc masks_${CplModel}.nc
+    ncap2 --history --append --script "mask_${OCEGRID}=int(1-mask_${OCEGRID});"    mask_${OCEGRID}_tmp.nc masks_${CplModel}.nc
     rm mask_${OCEGRID}_tmp.nc
     ncatted --history \
@@ -163 +156 @@
 done
 
-ncks --history --append --variable lon,lat ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc grids_${CplModel}.nc
+ncks --history --append --variable lon,lat ${ATM}_grid_maskFrom_${OCE}.nc grids_${CplModel}.nc
  
 #
@@ -172 +165 @@
 
 if [[ ${ATM} = dynamico* || ${ATM} = ICO* ]] ; then 
-    ncks --fl_fmt=${FL_FMT3} --history --append --variable bounds_lon,bounds_lat ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc grids_${CplModel}.nc
+    ncks --history --append --variable bounds_lon,bounds_lat ${ATM}_grid_maskFrom_${OCE}.nc grids_${CplModel}.nc
 fi
 
-ncks --fl_fmt=${FL_FMT3} --history -C --append --variable aire   ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc areas_${CplModel}.nc
+ncks --history -C --append --variable aire   ${ATM}_grid_maskFrom_${OCE}.nc areas_${CplModel}.nc
 ncatted --history --attribute coordinates,aire,d,,     \
         --attribute _FillValue,aire,d,,                \
@@ -184 +177 @@
         areas_${CplModel}.nc
 
-ncks --fl_fmt=${FL_FMT3} --history -C --variable OceMask         ${ATM}_grid_maskFrom_${OCE}_${FL_FMT3}.nc OceMask_tmp.nc
+ncks --history -C --variable OceMask         ${ATM}_grid_maskFrom_${OCE}.nc OceMask_tmp.nc
 ncwa --history --overwrite --average time_counter OceMask_tmp.nc OceMask_tmp2.nc # Suppress time dimension
 ncatted --history \
@@ -193 +186 @@
         --attribute missing_value,OceMask,d,,       \
         OceMask_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --append --script "OceMask=int(1-OceMask)" OceMask_tmp2.nc masks_${CplModel}.nc # For OASIS, ocean=0, land=1
+ncap2 --history --append --script "OceMask=int(1-OceMask)" OceMask_tmp2.nc masks_${CplModel}.nc # For OASIS, ocean=0, land=1
 rm OceMask_tmp.nc
 ncatted --history \
@@ -235 +228 @@
 EOF
    
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script-file add_dim.nco  grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+    ncap2 --history --append --script-file add_dim.nco  grids_${CplModel}_tmp.nc grids_${CplModel}.nc
     
     mv masks_${CplModel}.nc masks_${CplModel}_tmp.nc
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script 'defdim("xcell",1) '   masks_${CplModel}_tmp.nc masks_${CplModel}.nc
+    ncap2 --history --append --script 'defdim("xcell",1) '   masks_${CplModel}_tmp.nc masks_${CplModel}.nc
     mv masks_${CplModel}.nc masks_${CplModel}_tmp.nc
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script 'OceMask[ycell,xcell]=OceMask'  masks_${CplModel}_tmp.nc masks_${CplModel}.nc
+    ncap2 --history --append --script 'OceMask[ycell,xcell]=OceMask'  masks_${CplModel}_tmp.nc masks_${CplModel}.nc
 
     mv areas_${CplModel}.nc areas_${CplModel}_tmp.nc
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script 'defdim("xcell",1) ; aire[ycell,xcell]=aire ; ' areas_${CplModel}_tmp.nc areas_${CplModel}.nc
+    ncap2 --history --append --script 'defdim("xcell",1) ; aire[ycell,xcell]=aire ; ' areas_${CplModel}_tmp.nc areas_${CplModel}.nc
 
     rm -f grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc masks_${CplModel}_tmp.nc
@@ -255 +248 @@
     # -----------------------------------------------------------------------
     mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
-    ncap2 --fl_fmt=${FL_FMT3} --history --append --script "alon[lat,lon]=alon; alat[lat,lon]=alat"  grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+    ncap2 --history --append --script "alon[lat,lon]=alon; alat[lat,lon]=alat"  grids_${CplModel}_tmp.nc grids_${CplModel}.nc
     rm -f grids_${CplModel}_tmp.nc
     ncatted --history \
@@ -291 +284 @@
 EOF
     mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
-    ncap2 --fl_fmt=${FL_FMT3} --history --script-file add_bounds.nco -O grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+    ncap2 --history --script-file add_bounds.nco -O grids_${CplModel}_tmp.nc grids_${CplModel}.nc
     rm grids_${CplModel}_tmp.nc
 fi
@@ -303 +296 @@
 # ----------------------------------------------------------------------------
 mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "o${atm}_lon=alon; o${atm}_lat=alat; bounds_o${atm}_lon=bounds_lon; bounds_o${atm}_lat=bounds_lat; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+ncap2 --history --script "o${atm}_lon=alon ; o${atm}_lat=alat ; bounds_o${atm}_lon=bounds_lon; bounds_o${atm}_lat=bounds_lat ; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
 
 mv areas_${CplModel}.nc areas_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "o${atm}_aire=aire*0.0d+1.0d; "   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
+ncap2 --history --script "o${atm}_aire=aire*0.0d+1.0d ; "   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
 
 mv masks_${CplModel}.nc masks_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "o${atm}_mask=int(OceMask)*0+0; " masks_${CplModel}_tmp.nc masks_${CplModel}.nc
+ncap2 --history --script "o${atm}_mask=int(OceMask)*0+0 ; " masks_${CplModel}_tmp.nc masks_${CplModel}.nc
 
 rm grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc masks_${CplModel}_tmp.nc
 
+
+echo ${Titre}"Generates grid c${atm}, 'o' meaning 'one'"${Norm}
+# same as t${atm} grid, with surfaces set to grid area
+# and mask to 0 (ocean everywhere, to compute integral over the whole grid))
+# ----------------------------------------------------------------------------
+mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
+ncap2 --history --script "c${atm}_lon=alon ; c${atm}_lat=alat ; bounds_c${atm}_lon=bounds_lon ; bounds_c${atm}_lat=bounds_lat ; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+
+mv areas_${CplModel}.nc areas_${CplModel}_tmp.nc
+ncap2 --history --script "c${atm}_aire=aire"   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
+
+mv masks_${CplModel}.nc masks_${CplModel}_tmp.nc
+ncap2 --history --script "c${atm}_mask=int(OceMask)*0+0 ; " masks_${CplModel}_tmp.nc masks_${CplModel}.nc
+
+rm grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc masks_${CplModel}_tmp.nc
 
 echo ${Titre}"Generates grid o${oce}, 'o' meaning 'one'"${Norm}
@@ -320 +328 @@
 # --------------------------------------------------------------------------------------------------------
 mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "nav_lon_grid_O=nav_lon_grid_T; nav_lat_grid_O=nav_lat_grid_T; bounds_lon_grid_O=bounds_lon_grid_T; bounds_lat_grid_O=bounds_o${oce}_lat=bounds_lat_grid_T; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+ncap2 --history --script "nav_lon_grid_O=nav_lon_grid_T; nav_lat_grid_O=nav_lat_grid_T; bounds_lon_grid_O=bounds_lon_grid_T; bounds_lat_grid_O=bounds_o${oce}_lat=bounds_lat_grid_T; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
 
 mv areas_${CplModel}.nc areas_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "area_grid_O=area_grid_T*0.0d+1.0d;"   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
-
-ncks -C --history --overwrite -v maskutil_T ${OCE}_coordinates_mask_${FL_FMT3}.nc maskutil_T_${FL_FMT3}.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --append --script "mask_O=maskutil_T; " maskutil_T_${FL_FMT3}.nc masks_${CplModel}.nc
+ncap2 --history --script "area_grid_O=area_grid_T*0.0d+1.0d;"   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
+
+ncks -C --history --overwrite -v maskutil_T ${OCE}_coordinates_mask.nc maskutil_T.nc
+ncap2 --history --append --script "mask_O=maskutil_T; " maskutil_T.nc masks_${CplModel}.nc
 
 rm grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc 
@@ -335 +343 @@
 
 mv grids_${CplModel}.nc grids_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "nav_lon_grid_C=nav_lon_grid_T; nav_lat_grid_C=nav_lat_grid_T; bounds_lon_grid_C=bounds_lon_grid_T; bounds_lat_grid_C=bounds_o${oce}_lat=bounds_lat_grid_T; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
+ncap2 --history --script "nav_lon_grid_C=nav_lon_grid_T; nav_lat_grid_C=nav_lat_grid_T; bounds_lon_grid_C=bounds_lon_grid_T; bounds_lat_grid_C=bounds_o${oce}_lat=bounds_lat_grid_T; " grids_${CplModel}_tmp.nc grids_${CplModel}.nc
 
 mv areas_${CplModel}.nc areas_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --script "area_grid_C=area_grid_T ; "   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
-
-#mv masks_${CplModel}.nc masks_${CplModel}_tmp.nc
-ncap2 --fl_fmt=${FL_FMT3} --history --append --script "mask_C=maskutil_T; " maskutil_T_${FL_FMT3}.nc masks_${CplModel}.nc
-
-rm grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc maskutil_T_${FL_FMT3}.nc
+ncap2 --history --script "area_grid_C=area_grid_T ; "   areas_${CplModel}_tmp.nc areas_${CplModel}.nc
+
+ncap2 --history --append --script "mask_C=maskutil_T; " maskutil_T.nc masks_${CplModel}.nc
+
+rm grids_${CplModel}_tmp.nc areas_${CplModel}_tmp.nc maskutil_T.nc
 
 #
@@ -367 +374 @@
 ncrename --history --variable alon,t${atm}.lon                grids_${CplModel}.nc
 ncrename --history --variable alat,t${atm}.lat                grids_${CplModel}.nc
-ncrename --history --variable o${atm}_lon,o${atm}.lon         grids_${CplModel}.nc
-ncrename --history --variable o${atm}_lat,o${atm}.lat         grids_${CplModel}.nc
 ncrename --history --variable OceMask,t${atm}.msk             masks_${CplModel}.nc
-ncrename --history --variable o${atm}_mask,o${atm}.msk        masks_${CplModel}.nc
 ncrename --history --variable aire,t${atm}.srf                areas_${CplModel}.nc
-ncrename --history --variable o${atm}_aire,o${atm}.srf        areas_${CplModel}.nc
-
 ncrename --history --variable bounds_lon,t${atm}.clo          grids_${CplModel}.nc
 ncrename --history --variable bounds_lat,t${atm}.cla          grids_${CplModel}.nc
-ncrename --history --variable bounds_o${atm}_lon,o${atm}.clo  grids_${CplModel}.nc
-ncrename --history --variable bounds_o${atm}_lat,o${atm}.cla  grids_${CplModel}.nc
-
-for ATMGRID in T O ; do
+
+for ATMGRID in O C ; do
+    atmgrid=${ATMGRID~} # To lowercase
+    ncrename --history --variable ${atmgrid}${atm}_lon,${atmgrid}${atm}.lon         grids_${CplModel}.nc
+    ncrename --history --variable ${atmgrid}${atm}_lat,${atmgrid}${atm}.lat         grids_${CplModel}.nc
+    ncrename --history --variable ${atmgrid}${atm}_mask,${atmgrid}${atm}.msk        masks_${CplModel}.nc
+    ncrename --history --variable ${atmgrid}${atm}_aire,${atmgrid}${atm}.srf        areas_${CplModel}.nc
+    ncrename --history --variable bounds_${atmgrid}${atm}_lon,${atmgrid}${atm}.clo  grids_${CplModel}.nc
+    ncrename --history --variable bounds_${atmgrid}${atm}_lat,${atmgrid}${atm}.cla  grids_${CplModel}.nc
+done
+    
+for ATMGRID in T O C ; do
     atmgrid=${ATMGRID~} # To lowercase
     ncatted --history \
@@ -386 +396 @@
             --attribute units,${atmgrid}${atm}.clo,o,c,"degrees_east"            \
             --attribute units,${atmgrid}${atm}.cla,o,c,"degrees_north"        grids_${CplModel}.nc
-done
-
-##
-echo ${Titre}"Change all NetCDF files to NetCDF 3 format"${Norm}
-## ===========================================================================
-for InFile in areas_${CplModel}.nc grids_${CplModel}.nc masks_${CplModel}.nc ; do
-    if [[ $(ncdump -k ${InFile}) = *netCDF-4* ]] ; then
-        mv ${InFile} tmp_${InFile}
-        ncks --fl_fmt=${FL_FMT3} --history  tmp_${InFile} ${InFile}
-        rm tmp_${InFile}
-    fi
 done
 

TOOLS/MOSAIX/CreateWeightsMask.bash

@@ -57 +57 @@
 #
 echo ${Titre}"Defines models"${Norm}
-# ==============
+# ==================================
 OCE=ORCA2.3
 #OCE=eORCA1.2
@@ -68 +68 @@
 #ATM=LMD144142
 #ATM=LMD256256
+
+
+Comment="Preliminary attempt - Do not trust !"
+Version="v0"
 
 CplModel=${OCE}x${ATM}
@@ -131 +135 @@
 #CommandList=( Runoff )
 #CommandList=( ${AtmOceFluxes} ${OceAtmTemp} Runoff Calving Grids )
+#CommandList=( ${AtmOceFluxes} Runoff Calving Grids )
+CommandList=( ${AtmOceFluxes}  )
 #CommandList=( Calving )
 #CommandList=( Grids )
 
 
-Comment="Preliminary attempt - Do not trust !"
-Version="_v0"
 
 ## ===========================================================================
@@ -143 +147 @@
 ##
 ## ===========================================================================
-Tag="_MOSAIX"
+Tag="MOSAIX"
 SUBMIT_DIR=$(pwd)
 
@@ -190 +194 @@
 
     if [[ "${Name}" != "None" ]] ; then
-        Suffix=${Name}
+        FullName=${Name}
     else
-        Suffix=${Order}Order_${NormName}_${QuantName}_${AreaName}
+        FullName=${Order}Order_${NormName}_${QuantName}_${AreaName}
     fi
 
@@ -206 +210 @@
     esac
     echo ${Green}"${SRC} ${SRCGRID} toward ${DST} ${DSTGRID} - ${Order} Order - Normalize: ${Renormalize} - Quantity: ${QuantName} - Area: ${AreaName}  "${Norm}
-    echo ${Green}"Suffix : ${Suffix}"${Norm}
+    echo ${Green}"FullName : ${FullName}"${Norm}
 }
 
@@ -282 +286 @@
 cp ${R_IN}/ATM/GRID/${ATM}_grid.nc .
 
-ncks --overwrite --fl_fmt=${FMT_OASIS} --history ${OCE}_coordinates_mask.nc ${OCE}_coordinates_mask_${FMT_OASIS}.nc
-ncks --overwrite --fl_fmt=${FMT_OASIS} --history ${ATM}_grid.nc             ${ATM}_grid_${FMT_OASIS}.nc
 #
 # echo ${Titre}"Creates OCEAN C grid : redundant points removed to compute proper integrals # A passer dans CreateWeights"${Norm}
@@ -309 +311 @@
 # rm C_${OCE}_coordinates_mask.nc
 
-# ncks --history --overwrite --fl_fmt=${FMT_OASIS} ${OCE}_coordinates_mask.nc ${OCE}_coordinates_mask_${FMT_OASIS}.nc
-
 # ls -al
 
@@ -331 +331 @@
 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"]'                               -k name  -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}
 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}
@@ -338 +338 @@
 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 weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}.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
@@ -347 +347 @@
 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
+cp iodef.xml iodef_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}.xml
 ln -fs ${OCE}_coordinates_mask.nc  oce_grid.nc
 ln -fs ${ATM}_grid.nc              atm_grid.nc
@@ -364 +364 @@
 where (OceFrac <  0.0 )  OceFrac=0.0 ; 
 EOF
-ncap2 --history --overwrite --script-file correction_masque.nco dia_t${oce}_to_t${atm}_${Suffix}.nc tmp_dia_t${oce}_to_t${atm}_${Suffix}.nc ; mv tmp_dia_t${oce}_to_t${atm}_${Suffix}.nc dia_t${oce}_to_t${atm}_${Suffix}.nc
-ncatted --history -a missing_value,OceFrac,d,,"" -a _FillValue,OceFrac,d,,"" dia_t${oce}_to_t${atm}_${Suffix}.nc
+ncap2 --history --overwrite --script-file correction_masque.nco dia_t${oce}_to_t${atm}_${FullName}.nc tmp_dia_t${oce}_to_t${atm}_${FullName}.nc ; mv tmp_dia_t${oce}_to_t${atm}_${FullName}.nc dia_t${oce}_to_t${atm}_${FullName}.nc
+ncatted --history -a missing_value,OceFrac,d,,"" -a _FillValue,OceFrac,d,,"" dia_t${oce}_to_t${atm}_${FullName}.nc
 
 ##
 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
-ncks --alphabetize --history --overwrite --variable OceFrac dia_t${oce}_to_t${atm}_${Suffix}_mask.nc  ${ATM}_grid_maskFrom_${OCE}.nc
+cp dia_t${oce}_to_t${atm}_${FullName}.nc  dia_t${oce}_to_t${atm}_${FullName}_mask.nc
+ncks --alphabetize --history --overwrite --variable OceFrac dia_t${oce}_to_t${atm}_${FullName}_mask.nc  ${ATM}_grid_maskFrom_${OCE}.nc
 
 cat <<EOF > creation_masque.nco
@@ -378 +378 @@
 EOF
 
-ncap2 --history --overwrite --script-file creation_masque.nco dia_t${oce}_to_t${atm}_${Suffix}_mask.nc tmp_dia_t${oce}_to_t${atm}_${Suffix}_mask.nc ; mv tmp_dia_t${oce}_to_t${atm}_${Suffix}_mask.nc dia_t${oce}_to_t${atm}_${Suffix}_mask.nc
-ncrename --history --variable OceFrac,OceMask dia_t${oce}_to_t${atm}_${Suffix}_mask.nc
-
-ncks --overwrite --history --variable OceMask dia_t${oce}_to_t${atm}_${Suffix}_mask.nc tmp_OceMask.nc
+ncap2 --history --overwrite --script-file creation_masque.nco dia_t${oce}_to_t${atm}_${FullName}_mask.nc tmp_dia_t${oce}_to_t${atm}_${FullName}_mask.nc ; mv tmp_dia_t${oce}_to_t${atm}_${FullName}_mask.nc dia_t${oce}_to_t${atm}_${FullName}_mask.nc
+ncrename --history --variable OceFrac,OceMask dia_t${oce}_to_t${atm}_${FullName}_mask.nc
+
+ncks --overwrite --history --variable OceMask dia_t${oce}_to_t${atm}_${FullName}_mask.nc tmp_OceMask.nc
 ncks --history --append tmp_OceMask.nc ${ATM}_grid_maskFrom_${OCE}.nc
-rm dia_t${oce}_to_t${atm}_${Suffix}_mask.nc
+rm dia_t${oce}_to_t${atm}_${FullName}_mask.nc
 
 echo "Change dimension names, and some attributes accordingly"
@@ -412 +412 @@
 
 ##
-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
-AtmCoastal = OceFrac * 0.0 ;
-where (OceFrac > 0.0 && OceFrac < 1.0 )  AtmCoastal = 1.0 ;
-EOF
-ncap2 --history --overwrite --script-file coastal.nco ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_coastal_maskFrom_${OCE}.nc
-ncks --history --append --variable AtmCoastal ${ATM}_coastal_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
-rm ${ATM}_coastal_maskFrom_${OCE}.nc
-ncks --alphabetize --history --overwrite --fl_fmt=${FMT_OASIS} ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc
-
+#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
+#AtmCoastal = OceFrac * 0.0 ;
+#where (OceFrac > 0.0 && OceFrac < 1.0 )  AtmCoastal = 1.0 ;
+#EOF
+#ncap2 --history --overwrite --script-file coastal.nco ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_coastal_maskFrom_${OCE}.nc
+#ncks --history --append --variable AtmCoastal ${ATM}_coastal_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
+#rm ${ATM}_coastal_maskFrom_${OCE}.nc
 
 ##
@@ -475 +473 @@
     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 weight_filename -v rmp_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}.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}
@@ -481 +479 @@
     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"]'                                 -k name -v dia_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}
     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}
@@ -490 +488 @@
     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
+    cp iodef.xml iodef_${srcGrid}${src}_to_${dstGrid}${dst}_${FullName}.xml
     ${MpiRun} ./interpol.exe --mask_src=${maskSrc} --mask_dst=${maskDst} --use_area=${useArea}
 done
 
-##
-echo ${Titre}"Copy all NetCDF files to NetCDF 3 format (needed for OASIS)"${Norm}
-## ===========================================================================
-for InFile in *.nc ; do
-    OuFile=$(basename ${InFile} .nc)_${FMT_OASIS}.nc
-    [[ ! -f ${OuFile} ]] && ncks --alphabetize --history --fl_fmt=${FMT_OASIS} ${InFile} ${OuFile}
-done
-
-##
 echo ${Titre}"Add time axis and coordinates information"${Norm}
 ## (needed if files need to be read by XIOS)
 ## ===========================================================================
-#ncatted --history -a coordinates,aire,m,c,"lat lon" ${ATM}_grid_maskFrom_${OCE}.nc
 ncap2 --overwrite --history --script 'defdim("time_counter",1) ;' ${ATM}_grid_maskFrom_${OCE}.nc tmp_${ATM}_grid_maskFrom_${OCE}.nc ; mv tmp_${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
-
-ncks --alphabetize --history --overwrite --fl_fmt=${FMT_OASIS} ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc
 
 if [[ ${atm} = ico ]] ; then
@@ -515 +501 @@
 OceFrac    [time_counter,cell] = OceFrac    [cell] ;
 OceMask    [time_counter,cell] = OceMask    [cell] ;
-AtmCoastal [time_counter,cell] = AtmCoastal [cell] ;
 EOF
     ncap2 --overwrite --history --script-file add_time.nco ${ATM}_grid_maskFrom_${OCE}.nc tmp_${ATM}_grid_maskFrom_${OCE}.nc ; mv tmp_${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
@@ -521 +506 @@
             -a coordinates,OceFrac,m,c,"time_counter lat lon"    \
             -a coordinates,OceMask,m,c,"time_counter lat lon"    \
-            -a coordinates,AtmCoastal,m,c,"time_counter lat lon" \
             -a coordinates,aire,c,c,"lat lon" \
             ${ATM}_grid_maskFrom_${OCE}.nc
 fi
-ncks --alphabetize --history --overwrite --fl_fmt=${FMT_OASIS} ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc
 
 if [[ ${atm} = lmd ]] ; then
@@ -531 +514 @@
 OceFrac    [time_counter,lat,lon] = OceFrac    [lat,lon] ;
 OceMask    [time_counter,lat,lon] = OceMask    [lat,lon]  ;
-AtmCoastal [time_counter,lat,lon] = AtmCoastal [lat,lon]  ;
 EOF
     ncap2 --overwrite --history --script-file add_time.nco ${ATM}_grid_maskFrom_${OCE}.nc tmp_${ATM}_grid_maskFrom_${OCE}.nc
@@ -540 +522 @@
             -a coordinates,OceFrac,m,c,"time_counter lat lon"    \
             -a coordinates,OceMask,m,c,"time_counter lat lon"    \
-            -a coordinates,AtmCoastal,m,c,"time_counter lat lon" \
             -a coordinates,aire,m,c,"lat lon" \
             ${ATM}_grid_maskFrom_${OCE}.nc
 fi
-ncks --alphabetize --history --overwrite --mk_rec time_counter   ${ATM}_grid_maskFrom_${OCE}.nc tmp_${ATM}_grid_maskFrom_${OCE}.nc ; mv tmp_${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
-ncks --alphabetize --history --overwrite --fl_fmt=${FMT_OASIS} ${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc
+ncks --alphabetize --history --overwrite --mk_rec time_counter ${ATM}_grid_maskFrom_${OCE}.nc tmp_${ATM}_grid_maskFrom_${OCE}.nc ; mv tmp_${ATM}_grid_maskFrom_${OCE}.nc ${ATM}_grid_maskFrom_${OCE}.nc
 
 ##
@@ -554 +534 @@
 NCO="$(ncks --version |& tail -1|sed 's/ncks //')"
 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
+for InFile in $(ls *${oce}_to_*${atm}_*.nc *${atm}_to_*${oce}_*.nc ${ATM}_grid_maskFrom_${OCE}.nc 2> /dev/null) ; do
     ncatted --history \
             --attribute uuid,global,d,,                                           \
@@ -597 +577 @@
 
 for rmpFile in rmp_*.nc ; do
-    mv ${rmpFile} xios_${rmpFile}
-    ncap2 --fl_fmt=${FMT_OASIS} --history --script-file add_dim.nco xios_${rmpFile} ${rmpFile}
+    mv ${rmpFile} tmp_${rmpFile}
+    ncap2 --history --script-file add_dim.nco tmp_${rmpFile} ${rmpFile} ; rm tmp_${rmpFile}
     
     ncrename --history --dimension n_weight,num_links   ${rmpFile}
@@ -641 +621 @@
 echo ${Titre}"Add missing variables in rmp files"${Norm}
 ## ===========================================================================
-for rmpFile in $(ls rmp_?${atm}_to_[tuv]${oce}_*.nc rmp_[tuv]${oce}_to_t${atm}_*.nc 2>/dev/null) ; do
+for rmpFile in $(ls rmp_?${atm}_to_[tuv]${oce}_*.nc rmp_[tuv]${oce}_to_t${atm}_*.nc 2>& /dev/null ) ; do
     echo ${rmpFile}
     a_to_o=false ; o_to_a=false
@@ -684 +664 @@
 
     cp add_varoce.nco add_varoce_$(basename ${rmpFile} .nc)_o_to_a.nco
-    [[ ${o_to_a} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_o_to_a.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
+    [[ ${o_to_a} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_o_to_a.nco ${OCE}_coordinates_mask.nc ${rmpFile}
     sed --in-place "s/src_/dst_/g" add_varoce.nco
     cp add_varoce.nco add_varoce_$(basename ${rmpFile} .nc)_a_to_o.nco
-    [[ ${a_to_o} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_a_to_o.nco ${OCE}_coordinates_mask_${FMT_OASIS}.nc ${rmpFile}
+    [[ ${a_to_o} = true ]] && ncap2 --history --append --script-file add_varoce_$(basename ${rmpFile} .nc)_a_to_o.nco ${OCE}_coordinates_mask.nc ${rmpFile}
                 
     if [[ ${atm} = ico ]] ; then
@@ -717 +697 @@
         cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco
         if [[ ${o_to_a} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -725 +705 @@
         cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco
         if [[ ${a_to_o} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -761 +741 @@
         cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco
         if [[ ${o_to_a} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_o_to_a.nco ${ATM}_grid_maskFrom_${OCE}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_corner_lon,src_grid_corner_lat,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -769 +749 @@
         cp add_varatm.nco add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco
         if [[ ${a_to_o} = true ]] ; then
-            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}_${FMT_OASIS}.nc ${rmpFile}
+            ncap2 --history --append --script-file add_varatm_$(basename ${rmpFile} .nc)_a_to_o.nco ${ATM}_grid_maskFrom_${OCE}.nc ${rmpFile}
             ncks --alphabetize --history --overwrite --variable src_address,dst_address,remap_matrix,src_grid_dims,src_grid_center_lat,src_grid_center_lon,src_grid_area,src_grid_imask,dst_grid_dims,dst_grid_center_lat,dst_grid_center_lon,dst_grid_corner_lon,dst_grid_corner_lat,dst_grid_area,dst_grid_imask ${rmpFile} rmp_tmp.nc
             mv rmp_tmp.nc ${rmpFile}
@@ -792 +772 @@
               --atmCoastWidth=${atmCoastWidth} --oceCoastWidth=${oceCoastWidth} --searchRadius=${searchRadius} \
               --grids=grids_${CplModel}.nc --areas=areas_${CplModel}.nc --masks=masks_${CplModel}.nc \
-              --o2a=${ATM}_grid_maskFrom_${OCE}.nc --output=rmp_t${atm}_to_t${oce}_runoff_${runOff_atmQuantity}_to_${runOff_oceQuantity}_${FMT_OASIS}.nc \
-              --fmt=${FMT_OASIS} \
+              --o2a=${ATM}_grid_maskFrom_${OCE}.nc --output=rmp_t${atm}_to_t${oce}_runoff_${runOff_atmQuantity}_to_${runOff_oceQuantity}.nc \
+              --fmt=${FMT_XIOS} \
               --atmQuantity=${runOff_atmQuantity} --oceQuantity=${runOff_oceQuantity}
 fi
@@ -803 +783 @@
     case ${OCE} in
         ( eORCA025 )
-        # cp ${R_IN}/OCE/NEMO/ORCA025_LIM3_PISCES/v3.6_stable/eORCA_R025_runoff_v1.1.nc .
         cp /ccc/work/cont003/gencmip6/deshayej/eORCA_R025_runoff_v1.2.nc .
-        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_nosouth_${FMT_OASIS}.nc  --fmt=${FMT_OASIS} \
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_nosouth.nc  --fmt=${FMT_XIOS} \
                   --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} \
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceberg.nc  --fmt=${FMT_XIOS} \
                   --oce=${OCE} --atm=${ATM} --type=iceberg  --dir=.  --repartition_file=eORCA_R025_runoff_v1.2.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} \
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceshelf.nc --fmt=${FMT_XIOS} \
                   --oce=${OCE} --atm=${ATM} --type=iceshelf --dir=.  --repartition_file=eORCA_R025_runoff_v1.2.nc --repartition_var=sornfisf
         ;;
@@ -815 +794 @@
         ( 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}\
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_nosouth.nc  --fmt=${FMT_XIOS}\
                   --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}\
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceberg.nc  --fmt=${FMT_XIOS}\
                   --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}\
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_iceshelf.nc --fmt=${FMT_XIOS}\
                   --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} \
+        ${PyRun} python3 -u CalvingWeights.py --output=rmp_t${atm}_to_t${oce}_calving_full.nc --fmt=${FMT_XIOS} \
                   --oce=${OCE} --atm=${ATM} --type=full     --dir=.
         ;;
@@ -832 +811 @@
 
 ##
-echo ${Titre}"Save results"${Norm}
-## ===========================================================================
-
-cp ${ATM}_grid_maskFrom_${OCE}.nc ${SUBMIT_DIR}
-for File in dia_*.nc rmp_*.nc 
-do
+echo ${Titre}"Simplifies headers, add version and comment"${Norm}
+## ===========================================================================
+for File in $(ls dia_*.nc rmp_*.nc ${ATM}_grid_maskFrom_${OCE}*.nc areas_${OCE}x${ATM}*.nc grids_${OCE}x${ATM}*.nc masks_${OCE}x${ATM}*.nc 2> /dev/null ) ; do
     ncatted --history --attribute history_of_appended_files,global,d,c,"" ${File}
+    ncatted --history --attribute history,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}
-    
+    [[ "X${Tag}" != "X"     ]] && ncatted --history --attribute Version,global,o,c,"${Tag}"      ${File}
+done
+
+##
+echo ${Titre}"Rename rmp and dia files"${Norm}
+## ===========================================================================
+for File in $(ls dia_*.nc rmp_*.nc  2>& /dev/null ); do
     NewFile=$(echo ${File} | sed -e "s/${atm}/${ATM}/" -e "s/${oce}/${OCE}/" )
-    cp ${File} ${SUBMIT_DIR}/${NewFile}
+    mv ${File} ${SUBMIT_DIR}/${NewFile}
 done
 
-if [[ "X${okGrids}" = "Xyes" ]] ; then
-    cp areas_${CplModel}.nc ${SUBMIT_DIR}
-    cp grids_${CplModel}.nc ${SUBMIT_DIR}
-    cp masks_${CplModel}.nc ${SUBMIT_DIR}
+##
+echo ${Titre}"Add Tag"${Norm}
+## ===========================================================================
+if [[ "X${Tag}" != "X" ]] ; then
+    for File in $(ls dia_*.nc rmp_*.nc ${ATM}_grid_maskFrom_${OCE}*.nc areas_${OCE}x${ATM}*.nc grids_${OCE}x${ATM}*.nc masks_${OCE}x${ATM}*.nc 2> /dev/null ) ; do
+        mv ${File} $(basename ${File} .nc)_${Tag}.nc
+    done
 fi
+##
+echo ${Titre}"Add Version"${Norm}
+## ===========================================================================
+if [[ "X${Version}" != "X" ]] ; then
+    for File in $(ls dia_*.nc rmp_*.nc ${ATM}_grid_maskFrom_${OCE}*.nc areas_${OCE}x${ATM}*.nc grids_${OCE}x${ATM}*.nc masks_${OCE}x${ATM}*.nc 2> /dev/null ) ; do
+        mv ${File} $(basename ${File} .nc)_${Version}.nc
+    done
+fi
+    
+## ===========================================================================
+echo ${Titre}"Save results"${Norm}
+## ===========================================================================
+for File in $(ls dia_*.nc rmp_*.nc ${ATM}_grid_maskFrom_${OCE}*.nc areas_${OCE}x${ATM}*.nc grids_${OCE}x${ATM}*.nc masks_${OCE}x${ATM}*.nc 2> /dev/null ) ; do
+    cp ${File} ${SUBMIT_DIR}
+done
+
 
 ##
@@ -895 +897 @@
 
 echo ${Titre}"Compute checksums and add them to README"${Norm}
-# -----------------------------------------
+# ------------------------------------------------------------
 cat << EOF >> README.txt
 UUID common to all files : ${UUID}
@@ -903 +905 @@
 EOF
 
-for file in *.nc ; do
+for file in $(ls dia_*.nc rmp_*.nc ${ATM}_grid_maskFrom_${OCE}*.nc areas_${OCE}x${ATM}*.nc grids_${OCE}x${ATM}*.nc masks_${OCE}x${ATM}*.nc 2> /dev/null ) ; do
     echo "$(shasum ${file})" >> README.txt
 done

TOOLS/MOSAIX/RunoffWeights.py

@@ -3 +3 @@
 ###
 ### Compute runoff weights.
+### For LMDZ only. Not suitable for DYNAMICO
 ###
 ### ===========================================================================
@@ -65 +66 @@
 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'] )
+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'] )
 
 # Parse command line
@@ -97 +98 @@
 if atm_Name.find('LMD') >= 0 : atm_n = 'lmd' ; atmDomainType = 'rectilinear'
 if atm_Name.find('ICO') >= 0 : atm_n = 'ico' ; atmDomainType = 'unstructured'
-if oce_Name.find('ORC') >= 0 : oce_n = 'orc' ; oceDomainType = 'curvilinear'
 
 print ('atmQuantity : ' + str (myargs.atmQuantity) )
@@ -152 +152 @@
 oce_grid_imask = oce_grid_imask2D.ravel()
 ## 
-print ("Defines a coastal bands (on ocean) in the ocean")
+print ("Determination d'une bande cotiere ocean")
 
 oceLand2D  = np.reshape ( np.where (oce_grid_pmask[:] < 0.5, True, False), (oce_jpj, oce_jpi) )
@@ -179 +179 @@
 oceCoast_address         = oce_address        [oceCoast]
 
-print ("Defines a coastal bands (on land) in the atmosphere" )
+print ("Determination d'une bande cotiere atmosphere " )
 atmLand      = np.where (o2aFrac[:] < epsfrac       , True, False)
 atmLandFrac  = np.where (o2aFrac[:] < zone-epsfrac  , True, False)