Changeset 4195

Timestamp:

12/14/18 10:55:21 (5 years ago)

Author:

omamce

Message:

O.M. : mostly improvment of documentation

Location:

TOOLS/MOSAIX

Files:

• CreateWeightsMask.bash (modified) (12 diffs)
• RunoffWeights.py (modified) (4 diffs)
• update_xml.py (modified) (1 diff)

TOOLS/MOSAIX/CreateWeightsMask.bash

@@ -37 +37 @@
 #  $HeadURL$
 #
+# CplModel=eORCA1.2xLMD144142 ; qsub -r ${CplModel} -o Out_${CplModel} -e Out_${CplModel} CreateWeightsMask.bash
+#
+
 set +vx
 export Bold=$(tput bold)  
@@ -55 +58 @@
 echo ${Titre}"Defines models"${Norm}
 # ==============
-#OCE=ORCA2.3
-OCE=eORCA1.2
+OCE=ORCA2.3
+#OCE=eORCA1.2
 #OCE=eORCA025
 
-#ATM=ICO30
-ATM=ICO40
+ATM=ICO30
+#ATM=ICO40
 #ATM=ICO450
 #ATM=LMD9695
@@ -66 +69 @@
 #ATM=LMD256256
 
+CplModel=${OCE}x${ATM}
+if [[ X${SLURM_JOB_NAME} = X*ORC* ||  X${SLURM_JOB_NAME} = X*LMD*  ||  X${SLURM_JOB_NAME} = X*ICO* ]] ; then
+    CplModel=${SLURM_JOB_NAME} ; OCE=${CplModel//x*} ; ATM=${CplModel##*x}
+fi
+
 echo ${Titre}"ATM model : ${ATM}"${Norm}
 echo ${Titre}"OCE model : ${OCE}"${Norm}
+echo ${Titre}"Cpl model : ${CplModel}"${Norm}
 
 # Runoff parameter. atmCoastWidth and oceCoastWidth in grid points, searchRadius in km
@@ -216 +225 @@
     PROGRAM=${BRIDGE_MSUB_REQNAME}
     MpiRun="time ccc_mprun"
-    PyRun="time ccc_mprun -n 1"
+    PyRun="time ccc_mprun -n 1" # Needed to force python to run on one process only
     source ${SUBMIT_DIR}/arch.env
     module load nco
@@ -236 +245 @@
 set -x ; set -e
 
-mkdir -p ${TMPDIR}/${OCE}x${ATM} || exit 1
-cd       ${TMPDIR}/${OCE}x${ATM} || exit 1
+mkdir -p ${TMPDIR}/${CplModel} || exit 1
+cd       ${TMPDIR}/${CplModel} || exit 1
 rm -fr *
 
@@ -265 +274 @@
 FMT_XIOS=netcdf4
 
-cp ${SUBMIT_DIR}/bin/interpol.exe    .
-cp ${SUBMIT_DIR}/*.py                .
+cp ${SUBMIT_DIR}/bin/interpol.exe       .
+cp ${SUBMIT_DIR}/*.py                   .
 cp ${SUBMIT_DIR}/iodef_atm_to_oce.xml   .
 cp ${SUBMIT_DIR}/iodef_oce_to_atm.xml   .
@@ -558 +567 @@
             --attribute production,global,o,c,"$(finger ${LOGNAME} | head -1 | awk '{print $4, $5}') " \
             --attribute originalFiles,global,o,c,"${OCE}_coordinates_mask.nc ${ATM}_grid_mask.nc"      \
-            --attribute associatedFiles,global,o,c,"grids_${OCE}x${ATM}.nc areas_${OCE}x${ATM}.nc masks_${OCE}x${ATM}.nc" \
+            --attribute associatedFiles,global,o,c,"grids_${CplModel}.nc areas_${CplModel}.nc masks_${CplModel}.nc" \
             --attribute directory,global,o,c,"$(pwd)"                             \
             --attribute description,global,o,c,"Fields needed by OASIS-MCT"       \
@@ -780 +789 @@
 #if [[ "X${okRunoff}" = "Xyes" && "${atm}" = "lmd" ]] ; then
 if [[ "X${okRunoff}" = "Xyes" ]] ; then
-    ${PyRun} python3 -u cotes_etal.py --oce=${OCE} --atm=${ATM} \
+    ${PyRun} python3 -u RunoffWeights.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 \
+              --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} \
@@ -838 +847 @@
 
 if [[ "X${okGrids}" = "Xyes" ]] ; then
-    cp areas_${OCE}x${ATM}.nc ${SUBMIT_DIR}
-    cp grids_${OCE}x${ATM}.nc ${SUBMIT_DIR}
-    cp masks_${OCE}x${ATM}.nc ${SUBMIT_DIR}
+    cp areas_${CplModel}.nc ${SUBMIT_DIR}
+    cp grids_${CplModel}.nc ${SUBMIT_DIR}
+    cp masks_${CplModel}.nc ${SUBMIT_DIR}
 fi
 
@@ -853 +862 @@
 rmp_* are weights files
 dia_* are diagnostic files not needed for the coupler
-grids_${OCE}x${ATM}.nc areas_${OCE}x${ATM}.nc masks_${OCE}x${ATM}.nc are auxiliary file needed by OASIS-MCT
+grids_${CplModel}.nc areas_${CplModel}.nc masks_${CplModel}.nc are auxiliary file needed by OASIS-MCT
 All files have the same uuid in the global attributes
 
@@ -865 +874 @@
 production      : $(finger ${LOGNAME} | head -1 | awk '{print $4, $5}') 
 originalFiles   : ${OCE}_coordinates_mask.nc ${ATM}_grid_mask.nc
-associatedFiles : grids_${OCE}x${ATM}.nc areas_${OCE}x${ATM}.nc masks_${OCE}x${ATM}.nc
+associatedFiles : grids_${CplModel}.nc areas_${CplModel}.nc masks_${CplModel}.nc
 directory       : $(pwd)
 timeStamp       : $(date)
@@ -903 +912 @@
 EOF
 
-cp README.txt ${SUBMIT_DIR}/README_${OCE}x${ATM}_MOSAIX.txt
+cp README.txt ${SUBMIT_DIR}/README_${CplModel}_MOSAIX.txt
 
 ## ===========================================================================

TOOLS/MOSAIX/RunoffWeights.py

@@ -3 +3 @@
 ###
 ### Compute runoff weights.
-### For LMDZ only. Not suitable for DYNAMICO
 ###
 ### ===========================================================================
@@ -98 +97 @@
 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 ("Determination d'une bande cotiere ocean")
+print ("Defines a coastal bands (on ocean) in the 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 ("Determination d'une bande cotiere atmosphere " )
+print ("Defines a coastal bands (on land) in the atmosphere" )
 atmLand      = np.where (o2aFrac[:] < epsfrac       , True, False)
 atmLandFrac  = np.where (o2aFrac[:] < zone-epsfrac  , True, False)

TOOLS/MOSAIX/update_xml.py

@@ -39 +39 @@
  -v <value> | --value=<value> : new value for xml field
  -t <text>  | --text=<text>   : will replace the 'text' part of the Xpath by <text>
-example :  
+examples :  
     python %(prog)s -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="file_src"]/field[@id="mask_source"]' -k name -v maskutil_T
+    python %(prog)s -i iodef.xml -n 'context[@id="interpol_run"]/file_definition/file[@id="dia"]/variable[@name="dest_grid"]'   -t ${dstDomainType}
     """
     #print ( texte % ( sys.argv[0], sys.argv[0], sys.argv[0], sys.argv[0] ) )