Changeset 263 for trunk/libIGCM/AA_create_se

Timestamp:

04/19/10 14:27:48 (14 years ago)

Author:

mafoipsl

Message:

Adapt libIGCM and jobs to new output Names : ${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName?} if SpaceName? and ExperimentName? are set into config.card. Still working with old types : ${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}.
More information here : IPSLCM5A?
Add IPSLCM5A into atlas.

File:

• trunk/libIGCM/AA_create_se (modified) (3 diffs)

trunk/libIGCM/AA_create_se

@@ -186 +186 @@
 IGCM_debug_PrintVariables 3 config_UserChoices_LongName
 IGCM_debug_PrintVariables 3 config_UserChoices_TagName
+IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName
+IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName
 IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType
 IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin
@@ -193 +195 @@
 
 #==================================
-
-R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+#R_SAVE : Job output 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_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+else
+    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
+fi
 #
 IGCM_card_DefineArrayFromSection   ${CARD_DIR}/config.card ListOfComponents
@@ -559 +568 @@
     IGCM_sys_QsubPost additionnal        ;
     #
-elif [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then
+elif [ ${config_UserChoices_TagName} = "IPSLCM5" ]  || \
+     [ ${config_UserChoices_TagName} = "IPSLCM5A" ] ; then
     IGCM_sys_QsubPost atlas_ORCHIDEE     ;
     IGCM_sys_QsubPost atlas_LMDZ         ;