Changeset 1607

Timestamp:

12/08/23 11:00:25 (5 months ago)

Author:

nillod

Message:

Replace job 'PeriodNb?' with 'NbPeriodsPerJob?' to be more explicit for users.

Location:

trunk/libIGCM

Files:

• AA_job (modified) (5 diffs)
• libIGCM.card (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)
• libIGCM_documentation/AA_job.doc (modified) (previous)
• libIGCM_ensemble/ENSEMBLE_DOC.txt (modified) (1 diff)
• libIGCM_ensemble/libIGCM_ensemble.ksh (modified) (2 diffs)
• libIGCM_sys/jobAccounting.mail (modified) (1 diff)

trunk/libIGCM/AA_job

@@ -176 +176 @@
 #D- -1. PLACE FOR USER MODIFICATION
 #D-     - Job Verbosity
-#D-     - PeriodNb
+#D-     - NbPeriodsPerJob
 #D-     - Experience type : DEB(ug), DEV(elopment), RUN
 #D--------------------------------------------------------------------==
@@ -200 +200 @@
 
 #D- Number of execution in one job
-PeriodNb=1
+NbPeriodsPerJob=1
 
 #D-
@@ -395 +395 @@
 
 PeriodContinue=false
-if [ ${Period} -le ${PeriodNb} ]; then
+if [ ${Period} -le ${NbPeriodsPerJob} ]; then
   PeriodContinue=true
 fi
@@ -401 +401 @@
 
   echo
-  echo "Starting iteration ${Period} / ${PeriodNb}"
+  echo "Starting iteration ${Period} / ${NbPeriodsPerJob}"
 
   #D-
@@ -637 +637 @@
 
   PeriodContinue=false
-  if [ ${Period} -le ${PeriodNb} ]; then
+  if [ ${Period} -le ${NbPeriodsPerJob} ]; then
     PeriodContinue=true
   fi

trunk/libIGCM/libIGCM.card

@@ -10 +10 @@
 #**************************************************************
 
-#D- You MUST change cards (and first config.card) parameters too be compatible
+#D- You MUST change cards (and first config.card) parameters to be compatible
 #D- with your modifications here.
 [UserChanges]
-PeriodNb=2
+NbPeriodsPerJob=2
 #config_UserChoices_DateEnd=1900-02-03
 #config_UserChoices_PeriodLength= 1D

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -450 +450 @@
 
   # Here we offer the possibility to redefine R_INIT, R_BC
-  # and PeriodNb through config.card
+  # and NbPeriodsPerJob through config.card
   R_INIT=${config_UserChoices_R_INIT:=${R_IN}/INIT}
   echo
-  IGCM_debug_Print 2 "(Re)Define R_INIT, R_BC and PeriodNb"
+  IGCM_debug_Print 2 "(Re)Define R_INIT, R_BC and NbPeriodsPerJob"
   IGCM_debug_Print 3 "R_IN=${R_IN}"
   IGCM_debug_Print 3 "R_INIT=${R_INIT}"
   R_BC=${config_UserChoices_R_BC:=${R_IN}/BC}
   IGCM_debug_Print 3  "R_BC=${R_BC}"
-  PeriodNb=${config_UserChoices_PeriodNb:=${PeriodNb}}
-  IGCM_debug_Print 3  "Loop in main Job with ${PeriodNb} period(s)"
-
+  NbPeriodsPerJob=${config_UserChoices_NbPeriodsPerJob:=${NbPeriodsPerJob}}
+  IGCM_debug_Print 3  "Loop in main Job with ${NbPeriodsPerJob} period(s)"
+  
   # SD ADA SPECIFIC #
   #      TO FIX     #
   #IGCM_sys_TestDirArchive ${R_IN}
   #[ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive"
-
+  
   if ( ${FirstInitialize} ) ; then
     IGCM_sys_MkdirArchive   ${R_SAVE}
@@ -1411 +1411 @@
     consumeHoursPerWholeSimulation=$( echo "scale=6;${consumeHoursPerPeriod}/${PeriodLengthInDays}*${ExperienceLengthInDays}" | bc )
 
-    recommendedPeriodNb=$( echo "scale=6;${jobWarningDelay}/3600/${consumeHoursPerPeriod}*${coreNumber}" | bc )
-
+    recommendedNbPeriodsPerJob=$( echo "scale=6;${jobWarningDelay}/3600/${consumeHoursPerPeriod}*${coreNumber}" | bc )
+    
     IGCM_sys_SendMail Accounting
   fi
@@ -1459 +1459 @@
         IGCM_debug_Print 1  "Change config_UserChoices_PeriodLength=${config_UserChoices_PeriodLength}"
         ;;
-      PeriodNb)
-        IGCM_debug_Print 1  "Loop in main Job with ${PeriodNb} period(s)"
+      NbPeriodsPerJob)
+        IGCM_debug_Print 1  "Loop in main Job with ${NbPeriodsPerJob} period(s)"
         ;;
       config_Post_RebuildFrequency)

trunk/libIGCM/libIGCM_ensemble/ENSEMBLE_DOC.txt

@@ -89 +89 @@
 
 This will create all the directories of the ensemble and Qsub.xxx.sh, a shell file 
-containing all command to submit all jobs (PeriodNb=60 for all simulations).
+containing all command to submit all jobs (NbPeriodsPerJob=10 for all simulations).
 
 The Qclean.PeriodLength.xxx.sh is bash file to use clean_PeriodLength script for

trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

@@ -50 +50 @@
       Job_Period=${answer}
   fi
-  print "\nPeriodNb in ensemble Jobs is ${Job_Period}"
+  print "\nNbPeriodsPerJob in ensemble Jobs is ${Job_Period}"
   
   IGCM_debug_Print 1 "Ens_PERTURB ACTIVE     = ${ensemble_Ens_PERTURB_active}"
@@ -181 +181 @@
   sed -e "s/\(#.*Script_Output_\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir}\2/" \
       -e "s/\(#.*\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir} \2/"              \
-      -e "s/^PeriodNb=.*/PeriodNb=${Job_Period}/"                                        \
+      -e "s/^NbPeriodsPerJob=.*/NbPeriodsPerJob=${Job_Period}/"                                        \
       ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} > Job_${MemberDir}.tmp
   IGCM_sys_Mv Job_${MemberDir}.tmp ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir}

trunk/libIGCM/libIGCM_sys/jobAccounting.mail

@@ -5 +5 @@
 The whole simulation will consume around ${consumeHoursPerWholeSimulation} hours. To be compared with your project allocation.
 
-For your case \(a job duration of ${jobWarningDelay} seconds\) the recommended PeriodNb is around ${recommendedPeriodNb}. To be compare with the current setting \(Job_${config_UserChoices_JobName} parameter\) : PeriodNb=${PeriodNb}
+For your case \(a job duration of ${jobWarningDelay} seconds\) the recommended NbPeriodsPerJob is around ${recommendedNbPeriodsPerJob}. To be compare with the current setting \(Job_${config_UserChoices_JobName} parameter\) : NbPeriodsPerJob=${NbPeriodsPerJob}
 
 Greetings!