Changeset 476

Timestamp:

06/01/11 09:12:40 (13 years ago)

Author:

mafoipsl

Message:

On vargas, use standard Script_Output file name to follow libIGCM rules for Script_Output (saving, cleaning).

Location:

trunk/libIGCM

Files:

• AA_job (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_vargas.ksh (modified) (1 diff)

trunk/libIGCM/AA_job

@@ -55 +55 @@
 #-Q- aix6 # @ job_type = parallel
 #-Q- aix6 # Fichier de sortie standard
-#-Q- aix6 # @ output = $(job_name).$(jobid)
+#-Q- aix6 # @ output = Script_Output_::Jobname::.000001
 #-Q- aix6 # Fichier de sortie erreur (le meme)
-#-Q- aix6 # @ error =  $(job_name).$(jobid)
+#-Q- aix6 # @ error = Script_Output_::Jobname::.000001
 #-Q- aix6 # Nombre de processus demandes
 #-Q- aix6 # @ total_tasks = ::JobNumProcTot::

trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

@@ -464 +464 @@
         echo "IGCM_sys_Qsub :" $@
     fi
+    # We have to change output/error file
+    [ ${#@} = 1 ] &&  REP_FOR_JOB=$LOADL_STEP_INITDIR
+    [ ${#@} = 2 ] &&  REP_FOR_JOB=$2
+    sed -e "s/\# \@ output *= .*/\# \@ output = ${Script_Output}/" -e "s/\# \@ error *= .*/\# \@ error = ${Script_Output}/" <$1 >${REP_FOR_JOB}/JOB_FOR_IGCM
     {
-      [ ${#@} = 1 ] &&  { cd $LOADL_STEP_INITDIR ; /usr/local/bin/llsubmit $1 ; ERROR=$? ; cd - ; }
-      [ ${#@} = 2 ] &&  { cd $2 ; /usr/local/bin/llsubmit $1 ; ERROR=$? ; cd - ; }
+      [ ${#@} = 1 ] &&  { cd $LOADL_STEP_INITDIR ; /usr/local/bin/llsubmit ${REP_FOR_JOB}/JOB_FOR_IGCM ; ERROR=$? ; cd - ; }
+      [ ${#@} = 2 ] &&  { cd $2 ; /usr/local/bin/llsubmit ${REP_FOR_JOB}/JOB_FOR_IGCM ; ERROR=$? ; cd - ; }
     }
     if [ ${ERROR} -gt 0 ] ; then
-        echo "IGCM_sys_Qsub : erreur $@."
-        IGCM_debug_Exit "IGCM_sys_Qsub"
-    fi
+       echo "IGCM_sys_Qsub : erreur $@."
+       IGCM_debug_Exit "IGCM_sys_Qsub"
+    fi
+    IGCM_sys_Rm ${REP_FOR_JOB}/JOB_FOR_IGCM
     IGCM_debug_PopStack "IGCM_sys_Qsub"
+
 }