Changeset 310

Timestamp:

06/28/10 11:27:24 (14 years ago)

Author:

mafoipsl

Message:

Put changeset [309] into libIGCM_v1_7. Use TMPDIR for mercure again. Correct CompletedFlag? initialisation. Delete useless echo. Correct 1st line or rebuild.ksh.

Location:

tags/libIGCM_v1_7

Files:

• AA_create_ts (modified) (1 diff)
• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_mercure.ksh (modified) (2 diffs)

tags/libIGCM_v1_7/AA_create_ts

@@ -241 +241 @@
 # Determine period for time series. Default : value from AA_job or from launch_TS if any
 #
-CompletedFlag=$( IGCM_date_ConvertFormatToGregorian ${CompletedFlag} )
+[ X${CompletedFlag} = X ] || CompletedFlag=$( IGCM_date_ConvertFormatToGregorian ${CompletedFlag} )
 
 DateBegin=${DateBegin:=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateBegin} )}

tags/libIGCM_v1_7/libIGCM_comp/libIGCM_comp.ksh

@@ -916 +916 @@
                         if [ ! -f ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh ] ; then
                             if [ $DRYRUN -le 1 ]; then
-                            echo "\#!/bin/ksh                                          " > ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                            echo "#!/bin/ksh                                          " > ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "function IGCM_FlushRebuild                          " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                             echo "{                                                   " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh

tags/libIGCM_v1_7/libIGCM_config/libIGCM_config.ksh

@@ -167 +167 @@
         R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
     fi
-    echo MAF $R_SAVE $R_DODS
 
     if [ ! -f ${SUBMIT_DIR}/run.card ]; then 

tags/libIGCM_v1_7/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -125 +125 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CSCRATCHDIR}/tmp$$}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${TMPDIR}}
 
 #====================================================
@@ -628 +628 @@
     IGCM_debug_PushStack "IGCM_sys_RmRunDir" -- $@
     if ( $DEBUG_sys ) ; then
-        echo "IGCM_sys_RmRunDir :" $@
-    fi
-
-    typeset RET
-
-    IGCM_sys_Cd ..
-
-    echo rm $@ > out_rsync 2>&1
-    \rm $@ >> out_rsync 2>&1
-    RET=$?
-
-    if [ ${RET} -gt 0 ] ; then
-        echo "IGCM_sys_RmRunDir : error."
-        cat out_rsync
-        IGCM_debug_Exit "IGCM_sys_RmRunDir"
-    fi
-
+        echo "IGCM_sys_RmRunDir :" $@ 
+        echo "Dummy call, let the scheduler do that." 
+    fi 
     IGCM_debug_PopStack "IGCM_sys_RmRunDir"
 }