Changeset 1410 for trunk

Timestamp:

08/25/17 14:11:01 (7 years ago)

Author:

sdipsl

Message:

• #326 fix the issue when SPACENAME = TEST
• use a safer ksh syntax for testing equality

Location:

trunk/libIGCM

Files:

• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_curie.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -836 +836 @@
           ( IGCM_sys_TestFileBuffer  ${R_BUF_KSH}/${Potential} ) || IGCM_sys_Cp ${Potential} ${R_BUF_KSH}/${Potential}.$$
         else
-#          ( IGCM_sys_TestFileArchive ${R_OUT_KSH}/${Potential} ) || IGCM_sys_Put_Out ${Potential} ${R_OUT_KSH}/${Potential}.$$ NOCHMOD
-           IGCM_debug_Print 1 "Save of previous ksh job output is not done for Pack=false"
+          ( IGCM_sys_TestFileArchive ${R_OUT_KSH}/${Potential} ) || IGCM_sys_Put_Out ${Potential} ${R_OUT_KSH}/${Potential}.$$ NOMOVE
+          IGCM_debug_Print 1 "Save of previous ksh job output is not done for Pack=false"
         fi
       done
@@ -848 +848 @@
         IGCM_sys_Cp ${SUBMIT_DIR}/run.card ${R_BUF_KSH}/run.card
       else
-#        IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card NOCHMOD
-         IGCM_debug_Print 1 "Save of run.card is not done for Pack=false"
+        IGCM_sys_Put_Out ${SUBMIT_DIR}/run.card ${R_OUT_KSH}/run.card NOMOVE
+        IGCM_debug_Print 1 "Save of run.card is not done for Pack=false"
       fi
       #

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -687 +687 @@
         fi
 
-        if [ ${fileDeviceNumberInHex} -ne ${directoryDeviceNumberInHex} ] ; then
+        if ( [ ${fileDeviceNumberInHex} -ne ${directoryDeviceNumberInHex} ] || [ X$3 = XNOMOVE] ) ; then
           # They are not on the same device. USUAL WAY
           \cp $1 $2 > ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$ 2>&1
@@ -1055 +1055 @@
 # --------------------------------------------------------------------
 
-  if [ X${compilerVersion} == XV17 ] ; then
+  if [ X${compilerVersion} = XV17 ] ; then
       . /ccc/cont003/home/dsm/p86ipsl/.env_intel17.0.2_curie   > /dev/null 2>&1
-  elif [ X${compilerVersion} == XV14 ] ; then
+  elif [ X${compilerVersion} = XV14 ] ; then
       . /ccc/cont003/home/dsm/p86ipsl/.env_intel14.0.3_curie   > /dev/null 2>&1
   else