Changeset 1559 for branches/libIGCM_CESMEP/ins_job

Timestamp:

09/17/22 15:29:59 (22 months ago)

Author:

ssenesi

Message:

Improve handling Cesmep

File:

• branches/libIGCM_CESMEP/ins_job (modified) (1 diff)

branches/libIGCM_CESMEP/ins_job

@@ -660 +660 @@
 IGCM_card_DefineVariableFromOption ${prefix}config.card Post Cesmep
 
-# Compute mail adress - inspired by libIGCM_post.ksh - should be turned in a function 
-if [ ! -z ${config_UserChoices_MailName} ] ; then
-    MailAdress=${config_UserChoices_MailName}
-elif [ -f ~/.forward ] ; then
-    MailAdress=$( cat ~/.forward )
-else
-    MailAdress=${USER}
-fi
-
-#
 if [ ${config_Post_Cesmep} != FALSE ]; then
-    if [ X"${SYSTEM}" == "Xirene" ] ; then
-       IGCM_card_DefineVariableFromOption ${prefix}config.card Post CesmepCode
-       IGCM_card_DefineVariableFromOption ${prefix}config.card Post CesmepComparison
-       IGCM_card_DefineVariableFromOption ${prefix}config.card UserChoices DateBegin
-       # Need R_SAVE 
-       IGCM_config_CommonConfiguration ${prefix}config.card
-       ${config_Post_CesmepCode}/libIGCM_install.sh $(pwd)/${prefix} \
+    IGCM_config_CommonConfiguration ${prefix}config.card
+    # Compute mail adress - inspired by libIGCM_post.ksh - should be turned in a function 
+    if [ ! -z ${config_UserChoices_MailName} ] ; then
+        MailAdress=${config_UserChoices_MailName}
+    elif [ -f ~/.forward ] ; then
+        MailAdress=$( cat ~/.forward )
+    else
+        MailAdress=${USER}
+    fi
+    #
+    components=","
+    for comp in ${config_ListOfComponents[*]} ; do
+        components=${components}${comp}, ;
+    done
+    if [ X"${SYSTEM}" == "Xirene" ] || [ X"${SYSTEM}" == "Xirene-amd" ] ; then
+        IGCM_card_DefineVariableFromOption ${prefix}config.card UserChoices DateBegin
+        ${config_Post_CesmepCode}/libIGCM_install.sh $(pwd)/${prefix} \
                    ${config_Post_CesmepComparison} $JobName ${R_SAVE} ${ProjectID} \
-                   ${MailAdress} ${config_UserChoices_DateBegin} ${config_Post_Cesmep} 
+                   ${MailAdress} ${config_UserChoices_DateBegin//-/} \
+                   ${config_Post_Cesmep} ${CesmepPeriod} ${config_Post_CesmepSlices} $components
    else
-       echo "\nERROR Cannot yet handle CESMEP on this computer system"
+       echo -e "\nERROR Cannot (yet) handle CESMEP atlas on this computer system"
        echo "=> Variable Cesmep in config.card's section Post must be set to FALSE"
        exit 5