Changeset 1235

Timestamp:

09/03/15 17:56:57 (9 years ago)

Author:

sdipsl

Message:

• homogenize variable names
• compute total number of MPI tasks (needed by ins_job)

File:

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

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -581 +581 @@
   typeset ExeNameIn ExeNameFirst CompNameFirst comp i
   typeset tempvar tempvarMPI tempvarNOD NbElts NbExec
-  typeset executionType
-
-  PROCESSUS_NUMBER=0
+
+  coreNumber=0
+  mpiTasks=0
   NbExec=0
 
@@ -679 +679 @@
       [ ${tempvarOMP} -ge 2 ] && OK_PARA_OMP=true
 
-      # SUM UP TOTAL NUMBER OF CORES
-      (( PROCESSUS_NUMBER = PROCESSUS_NUMBER + tempvarMPI * tempvarNOD * tempvarOMP ))
+      # SUM UP NUMBER OF CORES
+      (( coreNumber = coreNumber + tempvarMPI * tempvarNOD * tempvarOMP ))
+
+      # SUM UP NUMBER OF MPI TASKS
+      (( mpiTasks = mpiTasks + tempvarMPI * tempvarNOD ))
     fi
   done
@@ -710 +713 @@
     elif ( [ ! ${OK_PARA_MPI} ] && [ ! ${OK_PARA_OMP} ] ) ; then
       executionType=6
-      PROCESSUS_NUMBER=1
-    fi
-  fi
-
-  IGCM_debug_Print 1 "MPI/OMP treatment PROCESSUS_NUMBER = ${PROCESSUS_NUMBER}"
+      coreNumber=1
+    fi
+  fi
+
+  IGCM_debug_Print 1 "MPI/OMP treatment coreNumber = ${coreNumber}"
 
   IGCM_debug_PopStack "IGCM_config_ConfigureExexution"
@@ -1132 +1135 @@
     RealCpuTime=$( echo ${ExeCpuLog} | gawk '{print $3}' )
 
-    consumeHoursPerPeriod=$( echo "scale=6;${RealCpuTime}*${PROCESSUS_NUMBER}/3600" | bc )
+    consumeHoursPerPeriod=$( echo "scale=6;${RealCpuTime}*${coreNumber}/3600" | bc )
 
     consumeHoursPerWholeSimulation=$( echo "scale=6;${consumeHoursPerPeriod}/${PeriodLengthInDays}*${ExperienceLengthInDays}" | bc )
 
-    recommendedPeriodNb=$( echo "scale=6;${jobWarningDelay}/3600/${consumeHoursPerPeriod}*${PROCESSUS_NUMBER}" | bc )
+    recommendedPeriodNb=$( echo "scale=6;${jobWarningDelay}/3600/${consumeHoursPerPeriod}*${coreNumber}" | bc )
 
     IGCM_sys_SendMail Accounting