Changeset 571 for branches/libIGCM_MPI_OpenMP/AA_atlas_ORCHIDEE

Timestamp:

03/07/12 10:39:55 (12 years ago)

Author:

mafoipsl

Message:

First try to merge libIGCM_MPI_OpenMP branch with libIGCM trunk revision 569. Tested on vargas with PackFrequency?=NONE included into config.card.

Location:

branches/libIGCM_MPI_OpenMP

Files:

• . (modified) (1 prop)
• AA_atlas_ORCHIDEE (modified) (2 diffs)

branches/libIGCM_MPI_OpenMP/AA_atlas_ORCHIDEE

@@ -99 +99 @@
 #-Q- titane ######################
 #-Q- titane #MSUB -r ATL_ORCH       # Nom du job                
-#-Q- titane #MSUB -N 1              # Reservation du noeud
+#-Q- titane #MSUB -eo
 #-Q- titane #MSUB -n 1              # Reservation du processus
 #-Q- titane #MSUB -T 86400          # Limite de temps elapsed du job
-#-Q- titane #MSUB -E "-j o"
-#-Q- titane #MSUB -E "-S /bin/ksh"
-#-Q- titane ##MSUB -e nco.out        # Sortie standard
-#-Q- titane ##MSUB -o nco.out        # Sortie standard
+#-Q- titane #MSUB -q mono
 #-Q- lxiv8 ######################
 #-Q- lxiv8 ## OBELIX      LSCE ##
@@ -193 +190 @@
 #==================================
 #R_SAVE : Job output directory
+#R_BUFR : Job output buffered directory
 if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
 else
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
 fi