Changeset 1519 for trunk/libIGCM

Timestamp:

02/25/20 13:31:41 (4 years ago)

Author:

aclsce

Message:

Modified to run libIGCM on irene-amd

Location:

trunk/libIGCM

Files:

• AA_job (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_irene-amd.ksh (modified) (5 diffs)

trunk/libIGCM/AA_job

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

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene-amd.ksh

@@ -1154 +1154 @@
         -e "s/::JobNumProcTot::/${coreNumber}/"    \
         -e "/#MSUB -x/d"                           \
-        -e "/--cpu_bind=none/d"                    \
       ${file} > ${file}.tmp
 
   elif [ ${executionType} -eq 2 ] ; then
-    # MPMD + MPI + OMP : mpirun/ccc_mprun/error
-    if ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xmpirun" ] ) ; then
-      sed -e "/::openMPthreads::/d"                  \
-          -e "s/::JobNumProcTot::/${coreNumber}/"    \
-        ${file} > ${file}.tmp
-    elif ( [ "X${config_UserChoices_ExecutionModeOnCurie}" = "X" ] || [ "X${config_UserChoices_ExecutionModeOnCurie}" = "Xccc_mprun" ] ) ; then
-      sed -e "/::openMPthreads::/d"                  \
-          -e "s/::JobNumProcTot::/${coreNumber}/"    \
-          -e "/--cpu_bind=none/d"                    \
-        ${file} > ${file}.tmp
-    else
-     IGCM_debug_Print 1 "You have to set ExecutionModeOnCurie=ccc_mprun or mpirun in config.card"
-     IGCM_debug_Exit "IGCM_sys_updateHeaders"
-    fi
+    # MPMD + MPI + OMP :ccc_mprun
+    sed -e "/::openMPthreads::/d"                  \
+        -e "s/::JobNumProcTot::/${coreNumber}/"    \
+      ${file} > ${file}.tmp
+
   elif [ ${executionType} -eq 3 ] ; then
     # SPMD + MPI/OMP
@@ -1177 +1167 @@
         -e "s/::JobNumProcTot::/${mpiTasks}/"      \
         -e "/#MSUB -x/d"                           \
-        -e "/--cpu_bind=none/d"                    \
       ${file} > ${file}.tmp
 
@@ -1185 +1174 @@
         -e "/::openMPthreads::/d"                  \
         -e "/#MSUB -x/d"                           \
-        -e "/--cpu_bind=none/d"                    \
       ${file} > ${file}.tmp
 
@@ -1193 +1181 @@
         -e "/::JobNumProcTot::/d"                  \
         -e "/#MSUB -x/d"                           \
-        -e "/--cpu_bind=none/d"                    \
       ${file} > ${file}.tmp
 
@@ -1201 +1188 @@
         -e "/::openMPthreads::/d"                  \
         -e "/#MSUB -x/d"                           \
-        -e "/--cpu_bind=none/d"                    \
       ${file} > ${file}.tmp