Changeset 571 for branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_obelix.ksh

Timestamp:

03/07/12 10:39:55 (12 years ago)

Author:

mafoipsl

Message:

First try to merge libIGCM_MPI_OpenMP branch with libIGCM trunk revision 569. Tested on vargas with PackFrequency?=NONE included into config.card.

Location:

branches/libIGCM_MPI_OpenMP

Files:

• . (modified) (1 prop)
• libIGCM_sys/libIGCM_sys_obelix.ksh (modified) (9 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -64 +64 @@
 # Host and user names 
 # $hostname ou hostname
-typeset  HOST=${HOST:=$( hostname )}
+typeset  MASTER=${MASTER:=$( hostname )}
 # $username ou whoami
 typeset  LOGIN=${LOGIN:=$( whoami )}
@@ -168 +168 @@
     IGCM_debug_PushStack "IGCM_sys_RshMaster" $@
 
-    ssh ${HOST} exec /bin/ksh  <<-EOF
+    ssh obelix3 exec /bin/ksh  <<-EOF
     export libIGCM=${libIGCM}
     export DEBUG_debug=${DEBUG_debug}
@@ -474 +474 @@
         echo "IGCM_sys_Tar :" $@
     fi
-    \tar cvf $@
+    \tar cf $@
     if [ $? -gt 0 ] ; then
         echo "IGCM_sys_Tar : erreur."
         IGCM_debug_Exit "IGCM_sys_Tar"
     fi
-    \tar tvf $1
 
     IGCM_debug_PopStack "IGCM_sys_Tar"
@@ -1044 +1043 @@
         echo "IGCM_sys_Dods_Rm :" $@
     fi
-    typeset RET
-    RET=0
-    if [ $DRYRUN = 0 ]; then
-        if [ ! -d /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} ] ; then
-            echo "WARNING : IGCM_sys_Dods_Rm /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} DOES NOT EXIST ."
-            echo "Nothing has been done."
-            return
-        fi
-        IGCM_sys_Rm -Rf /tmp/DODS/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1}
-        RET=$?
-        
-        if [ ${RET} -gt 0 ] ; then
-            echo "IGCM_sys_Put_Dods : error."
-            cat out_dods_rm
-            IGCM_debug_Exit "IGCM_sys_Dods_Rm"
-        else
-            rm out_dods_rm
-        fi
-    else
-        ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack
-    fi
-    return $RET
+    return 0
 }
 
@@ -1078 +1056 @@
         echo "IGCM_sys_Dods_Cp :" $@
     fi
-    typeset RET
-    RET=0
-    if [ $DRYRUN = 0 ]; then
-        if [ ! -d ${R_SAVE}/${1} ] ; then
-            echo "WARNING : IGCM_sys_Dods_Cp ${R_SAVE}/${1} DOES NOT EXIST ."
-            echo "Nothing has been done."
-            return
-        fi
-        #
-        IGCM_sys_Mkdir /tmp/DODS/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-        IGCM_sys_Cp -Rp --parents ${1} /tmp/DODS/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-        RET=$?
-        
-        if [ ${RET} -gt 0 ] ; then
-            echo "IGCM_sys_Dods_Cp : error."
-            cat out_dods_cp
-            IGCM_debug_Exit "IGCM_sys_Dods_Cp"
-        else
-            rm out_dods_cp
-        fi
-    else
-        ( ${DEBUG_debug} ) && echo "DRYRUN mode = " $DRYRUN >> stack
-    fi
-    return $RET
+    return 0
 }
 
@@ -1115 +1070 @@
     fi
     if [ $DRYRUN = 0 ]; then
-        if [ ! -d ${R_SAVE}/${1} ] ; then
-            echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ."
-            IGCM_debug_PopStack "IGCM_sys_Put_Dods"
-            return
-        fi
-
-        typeset RET
-        #
-        cd ${R_SAVE}
-        IGCM_sys_Dods_Rm ${1}
-        IGCM_sys_Dods_Cp ${1}
         RET=0
         
@@ -1138 +1082 @@
 }
 
-############################################################## A FINIR !!
-
 #D-#==================================================
 #D-function IGCM_sys_GetDate_FichWork
@@ -1150 +1092 @@
         echo "IGCM_sys_GetDate_FichWork :" $@
     fi
+    typeset dateF
+    set +A dateF -- $( ls -l --full-time --time-style='+%Y%m%d%H%M%S' ${1} )
+    eval ${2}=${dateF[5]}
+
     # donne la date filesys d'un fichier sur la machine work
     IGCM_debug_PopStack "IGCM_sys_FichWork"
@@ -1164 +1110 @@
         echo "IGCM_sys_GetDate_FichArchive :" $@
     fi
+    typeset dateF
+    set +A dateF -- $( ls -l --full-time --time-style='+%Y%m%d%H%M%S' ${1} )
+    eval ${2}=${dateF[5]}
+
     IGCM_debug_PopStack "IGCM_sys_FichArchive"
 }