Changeset 1432 for trunk/libIGCM

Timestamp:

03/30/18 15:07:44 (6 years ago)

Author:

jgipsl

Message:

Added first version of sys_irene copied from sys_curie.
Tested as far without post-treatement only with SpaceName?=TEST. As far, only tested with LMDZOR and ORCHIDEE offline without post-processing, only at scratchdir.
c
ccc_mprun mode is default at irene.

Location:

trunk/libIGCM

Files:

• AA_job (modified) (1 diff)
• libIGCM_sys/libIGCM_sys.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_irene.ksh (copied) (copied from trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh) (8 diffs)

trunk/libIGCM/AA_job

@@ -23 +23 @@
 #-Q- curie BATCH_NUM_PROC_TOT=$BRIDGE_MSUB_NPROC
 #-Q- curie set +x
+#-Q- irene #!/bin/ksh
+#-Q- irene ######################
+#-Q- irene ## IRENE   TGCC/CEA ##
+#-Q- irene ######################
+#-Q- irene #MSUB -r ::Jobname::        # Job Name
+#-Q- irene #MSUB -o Script_Output_::Jobname::.000001    # standard output
+#-Q- irene #MSUB -e Script_Output_::Jobname::.000001    # error output
+#-Q- irene #MSUB -eo
+#-Q- irene #MSUB -n ::JobNumProcTot::  # Number of MPI tasks (SPMD case) or cores (MPMD case)
+#-Q- irene #MSUB -c ::openMPthreads::  # Number of openMP threads. To specify only for SMPD
+#-Q- irene #MSUB -x                    # exclusive node. To specify only for MPMD together with the one below
+#-Q- irene #MSUB -E '--cpu_bind=none'
+#-Q- irene ##MSUB -E '--distribution cyclic' 
+#-Q- irene #MSUB -T 86400              # Wall clock limit (seconds)
+#-Q- irene #MSUB -A gch0316
+#-Q- irene #MSUB -q skylake
+#-Q- irene #MSUB -m work,scratch
+#-Q- irene
+#-Q- irene BATCH_NUM_PROC_TOT=$BRIDGE_MSUB_NPROC
+#-Q- irene set +x
 #-Q- ada #!/bin/ksh
 #-Q- ada # ######################

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -61 +61 @@
         SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
+    irene*)
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for irene Intel X-64 at TGCC"
+        CENTER=TGCC
+        SYSTEM=irene
+        . ${libIGCM}/libIGCM_sys/libIGCM_sys_irene.ksh;;
     airain*)
         [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for airain Intel X-64."

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -168 +168 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}/RUN_DIR/${BRIDGE_MSUB_JOBID}_${$}}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CCCSCRATCHDIR}/RUN_DIR/${BRIDGE_MSUB_JOBID}_${$}}
 
 #====================================================
@@ -206 +206 @@
 #D-* Define R_OUT   : Output tree located on ARCHIVE
 #D-* Define R_FIG   : Output tree located on STORAGE hosting figures (monitoring and atlas, and/or small files)
-#D-* Define R_BUF   : Output tree located on SCRATCHDIR hosting files waiting for rebuild or pack processes
-#D-* if SpaceName=TEST everything is stored on SCRATCHDIR
+#D-* Define R_BUF   : Output tree located on CCCSCRATCHDIR hosting files waiting for rebuild or pack processes
+#D-* if SpaceName=TEST everything is stored on CCCSCRATCHDIR
 #D-* Examples:
 #D-
@@ -236 +236 @@
     #====================================================
     #- R_OUT
-    R_OUT=${SCRATCHDIR}/IGCM_OUT
+    R_OUT=${CCCSCRATCHDIR}/IGCM_OUT
 
     #====================================================
     #- R_FIG (hosting figures : monitoring and atlas, and/or small files)
-    R_FIG=${SCRATCHDIR}/IGCM_OUT
+    R_FIG=${CCCSCRATCHDIR}/IGCM_OUT
 
     IGCM_debug_Print 1 "SpaceName=TEST ==> OVERRULE destination path directories"
@@ -260 +260 @@
   #====================================================
   #- R_BUF (ONLY FOR double copy an scratch)
-  R_BUF=${SCRATCHDIR}/IGCM_OUT
+  R_BUF=${CCCSCRATCHDIR}/IGCM_OUT
 
   IGCM_debug_Print 1 "R_OUT has been defined = ${R_OUT}"
@@ -1141 +1141 @@
   elif [ ${executionType} -eq 2 ] ; then
     # MPMD + MPI + OMP : mpirun/ccc_mprun/error
-    if ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "X" ] || [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xmpirun" ] ) ; then
+    if ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xmpirun" ] ) ; then
       sed -e "/::openMPthreads::/d"                  \
           -e "s/::JobNumProcTot::/${coreNumber}/"    \
         ${file} > ${file}.tmp
-    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xccc_mprun" ] ) ; then
+    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "X" ] || [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xccc_mprun" ] ) ; then
       sed -e "/::openMPthreads::/d"                  \
           -e "s/::JobNumProcTot::/${coreNumber}/"    \
@@ -1278 +1278 @@
       fi
 
-    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "X" ] || [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xmpirun" ] ) ; then
+    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xmpirun" ] ) ; then
 
     # 2 MPI/OpenMP mpirun method
@@ -1400 +1400 @@
       done
 
-    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xccc_mprun" ] ) ; then
+    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "X" ] || [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xccc_mprun" ] ) ; then
 
     # 3 MPI/OpenMP ccc_mprun method
@@ -1557 +1557 @@
   fi
 
-  if ( [ X${RUN_DIR_PATH} = X${HOME} ] || [ X${RUN_DIR_PATH} = X${WORKDIR} ] || [ X${RUN_DIR_PATH} = X${SCRATCHDIR} ] || [ X${RUN_DIR_PATH} = X${CCCWORKDIR} ] || [ X${RUN_DIR_PATH} = X${CCCSTOREDIR} ] ) ; then
+  if ( [ X${RUN_DIR_PATH} = X${HOME} ] || [ X${RUN_DIR_PATH} = X${CCCWORKDIR} ] || [ X${RUN_DIR_PATH} = X${CCCSCRATCHDIR} ] || [ X${RUN_DIR_PATH} = X${CCCSTOREDIR} ] ) ; then
     IGCM_debug_Print 1 "Variable RUN_DIR_PATH is pointing to an important directory : ${RUN_DIR_PATH}"
     IGCM_debug_Print 1 "Please check the RUN_DIR_PATH definition in your Job : Job_${config_UserChoices_JobName}"