Changeset 473

Timestamp:

05/31/11 14:00:31 (13 years ago)

Author:

mmaipsl

Message:

Backward compatibility :

• Protect SubmitPath? write for compatibility with old run.card.
• Move ExecutionFail? initialization at end of IGCM_config_PeriodStart.

Location:

trunk/libIGCM

Files:

• AA_job (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)

trunk/libIGCM/AA_job

@@ -451 +451 @@
         echo                                                                                  >> ${Exe_Output}
         typeset RET
-        ExecutionFail=false
         RUN_DATE_BEGIN=$( date '+%Y-%m-%dT%H:%M:%S' )
         ${MPIRUN_COMMAND} ${MPIRUN_OPTIONS} ./${config_Executable_Name} >> ${Exe_Output} 2>&1
@@ -470 +469 @@
     else
         echo "EXECUTION of : ${MPIRUN_COMMAND} ${MPIRUN_OPTIONS} ./${config_Executable_Name} simulated for DRYRUN = " $DRYRUN
-        ExecutionFail=false
         if ( $DEBUG_debug ) ; then
             echo "FOR EXECUTION DRYRUN mode = " $DRYRUN >> stack

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -413 +413 @@
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd ${PeriodDateEnd}
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration CumulPeriod ${CumulPeriod}
-        IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration SubmitPath ${SUBMIT_DIR}
+        if [ X$( grep "SubmitPath" ${SUBMIT_DIR}/run.card ) != X ] ; then
+            IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration SubmitPath ${SUBMIT_DIR}
+        fi
 
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Running"
@@ -533 +535 @@
         fi
     fi
+
+    ExecutionFail=false
 
     IGCM_debug_PopStack "IGCM_config_PeriodStart"