Changeset 1238 for trunk/libIGCM/libIGCM_config

Timestamp:

10/05/15 15:19:53 (9 years ago)

Author:

sdipsl

Message:

• ins_job (the one from libIGCM) will edit Job headers according to config.card specs. see #96
• need more testing

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -584 +584 @@
   coreNumber=0
   mpiTasks=0
+  openMPthreads=0
   NbExec=0
 
@@ -679 +680 @@
       [ ${tempvarOMP} -ge 2 ] && OK_PARA_OMP=true
 
+      # Number of OMP threads
+      [ ${openMPthreads} -lt ${tempvarOMP} ] && openMPthreads=${tempvarOMP}
+
       # SUM UP NUMBER OF CORES
       (( coreNumber = coreNumber + tempvarMPI * tempvarNOD * tempvarOMP ))
@@ -692 +696 @@
   # Define the execution type we are running in
   if [ ${OK_PARA_MPMD} ] ; then
-    # MPMD always implies MPI
     if [ ${OK_PARA_MPI} ] ; then
+      # MPMD always implies MPI
       executionType=1
     fi
-    # MPMD + MPI/OMP
     if [ ${OK_PARA_OMP} ] ; then
+      # MPMD + MPI/OMP
       executionType=2
     fi
   else
-    # SPMD + MPI/OMP
     if ( [ ${OK_PARA_MPI} ] && [ ${OK_PARA_OMP} ] ) ; then
+      # SPMD + MPI/OMP
       executionType=3
+    elif ( [ ${OK_PARA_MPI} ] && [ ! ${OK_PARA_OMP} ] ) ; then
       # SPMD + MPI only
-    elif ( [ ${OK_PARA_MPI} ] && [ ! ${OK_PARA_OMP} ] ) ; then
       executionType=4
+    elif ( [ ! ${OK_PARA_MPI} ] && [ ${OK_PARA_OMP} ] ) ; then
       # SPMD + OMP only
-    elif ( [ ! ${OK_PARA_MPI} ] && [ ${OK_PARA_OMP} ] ) ; then
       executionType=5
+    elif ( [ ! ${OK_PARA_MPI} ] && [ ! ${OK_PARA_OMP} ] ) ; then
       # SEQUENTIAL THEN
-    elif ( [ ! ${OK_PARA_MPI} ] && [ ! ${OK_PARA_OMP} ] ) ; then
       executionType=6
       coreNumber=1