Changeset 853

Timestamp:

04/26/13 10:48:56 (11 years ago)

Author:

sdipsl

Message:

• Clean up job submission

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_ada.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_curie.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_obelix.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_titane.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -1214 +1214 @@
 
     IGCM_debug_Print 1 "Submit next job"
-    # SUBMIT NEXT JOB from SUBMIT_DIR and come back in RUN_DIR
-    IGCM_sys_Cd ${SUBMIT_DIR}
     # Keep only the 5 latest ${Script_Output_Prefix}_${config_UserChoices_JobName}
     ScriptTot=$( ls ${Script_Output_Prefix}_${config_UserChoices_JobName}.?????? 2>/dev/null | wc -l )
     [ ${ScriptTot} -gt 5 ] && rm -f $( ls ${Script_Output_Prefix}_${config_UserChoices_JobName}.?????? | head -$(( ${ScriptTot} - 5 )) )
-    # Submit next job and come back
     IGCM_sys_Qsub ${SUBMIT_DIR}/Job_${config_UserChoices_JobName}
-    IGCM_sys_Cd -
   fi
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -1933 +1933 @@
         if ( ${OK_PARA_OMP} ) ; then
           eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-          export KMP_STACKSIZE=3g
-          export KMP_LIBRARY=turnaround
+          export KMP_STACKSIZE=200m
+          #export KMP_LIBRARY=turnaround
           #echo "export KMP_STACKSIZE=3g"  >> script_${ExeNameOut}.ksh
           #echo "export KMP_LIBRARY=turnaround"  >> script_${ExeNameOut}.ksh

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -686 +686 @@
   typeset options status
   if [ ${config_UserChoices_JobName}.${CumulPeriod} = "." ] ; then
-    options=" -o ${Script_Output} -e ${Script_Output}"
+    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output}"
   else
-    options=" -o ${Script_Output} -e ${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod}"
+    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod}"
   fi
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -583 +583 @@
   fi
   typeset status
-  /usr/local/bin/qsub -q medium -o ${Script_Output} -N ${config_UserChoices_JobName}.${CumulPeriod} < $1
+  /usr/local/bin/qsub -q medium -o ${SUBMIT_DIR}/${Script_Output} -N ${config_UserChoices_JobName}.${CumulPeriod} < $1
   status=$?
   if [ ${status} -gt 0 ] ; then

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -678 +678 @@
   typeset options
   if [ ${config_UserChoices_JobName}.${CumulPeriod} = "." ] ; then
-    options=" -o ${Script_Output} -e ${Script_Output}"
+    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output}"
   else
-    options=" -o ${Script_Output} -e ${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod}"
+    options=" -o ${SUBMIT_DIR}/${Script_Output} -e ${SUBMIT_DIR}/${Script_Output} -r ${config_UserChoices_JobName}.${CumulPeriod}"
   fi