Changeset 1978

Timestamp:

12/17/12 19:51:34 (12 years ago)

Author:

aclsce

Message:

Fixed bbugs

Location:

TOOLS/PACK_IPSL

Files:

• monitoring.sh (modified) (3 diffs)
• showPackProgress.sh (modified) (2 diffs)

TOOLS/PACK_IPSL/monitoring.sh

@@ -3 +3 @@
 # Variables a renseigner
 # Stockage des fichiers pour monitoring de tous les users (pour l instant sur p86caub)
-export MONIT_DIR=$CCCWORKDIR/MONIT_MIGRATION
-export DODS_MONIT=$CCCWORKDIR/../../dods/public/p86caub/MONIT_MIGRATION
+export MONIT_DIR=/ccc/work/cont003/dods/public/MONIT_DIR
+export DODS_MONIT=/ccc/work/cont003/dods/public/DODS_MONIT
 
 testr=`LC_ALL=C date +"%Y%m%dT%H%M"`
@@ -18 +18 @@
 if [ -e ${MONIT_DIR}/monit_all_new.txt ]
 then
-    tail -1 monit_${USER}.txt >> ${MONIT_DIR}/monit_all_new.txt
+    tail -1 ${MONIT_DIR}/monit_${USER}.txt >> ${MONIT_DIR}/monit_all_new.txt
 else
     cp monit_header.txt ${MONIT_DIR}/monit_all_new.txt
-    tail -1 monit_${USER}.txt >> ${MONIT_DIR}/monit_all_new.txt
+    tail -1 ${MONIT_DIR}/monit_${USER}.txt >> ${MONIT_DIR}/monit_all_new.txt
 fi
 
@@ -30 +30 @@
 mv ${MONIT_DIR}/monit_all_new.txt ${MONIT_DIR}/monit_all.txt 
 
-if [ -d ${MONIT_DIR}/${USER}_SIMUS ]
-then
-    rm -rf ${MONIT_DIR}/${USER}_SIMUS
-fi
-cp -rf ${USER}_SIMUS ${MONIT_DIR}/.
+#if [ -d ${MONIT_DIR}/${USER}_SIMUS ]
+#then
+#    rm -rf ${MONIT_DIR}/${USER}_SIMUS
+#fi
+#cp -rf ${USER}_SIMUS ${MONIT_DIR}/.
 
-if [ "x$DODS_MONIT" != "x" ]
-then
-    rm -rf $DODS_MONIT
-fi
-cp -alf $MONIT_DIR ${DODS_MONIT}
+#if [ "x$DODS_MONIT" != "x" ]
+#then
+#    rm -rf $DODS_MONIT
+#fi
+cp -prf $MONIT_DIR/* ${DODS_MONIT}/.
 chmod -R o+rX ${DODS_MONIT}

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -318 +318 @@
    -p) echo "option -p selectionnee : publication"
        publish_mode=0
-       outputFile="monit_${USER}.txt"
-       outputFile_simus="${USER}_SIMUS/monit_${USER}_simus.txt"
-       if [ -d ${USER}_SIMUS ]
+       outputFile="${MONIT_DIR}/monit_${USER}.txt"
+       outputFile_simus="${MONIT_DIR}/${USER}_SIMUS/monit_${USER}_simus.txt"
+       if [ -d ${MONIT_DIR}/${USER}_SIMUS ]
        then
-           rm -f ${USER}_SIMUS/*
+           rm -f ${MONIT_DIR}/${USER}_SIMUS/*
        else
-           mkdir -p ${USER}_SIMUS
+           mkdir -p ${MONIT_DIR}/${USER}_SIMUS
        fi
        echo "Simulation;Status" > ${outputFile_simus}
@@ -486 +486 @@
             then
                 simuName_modif=$( echo $simuName | sed s%"/"%"_"%g )
-                cat ${JOB_DIR}/simuPrint.txt $outRedirectStatemen > ${USER}_SIMUS/${simuName_modif}".log"
+                cat ${JOB_DIR}/simuPrint.txt $outRedirectStatemen > ${MONIT_DIR}/${USER}_SIMUS/${simuName_modif}".log"
             fi
         fi