Ignore:
Timestamp:
04/09/10 12:08:01 (14 years ago)
Author:
sdipsl
Message:
  • Add mercure-new : libIGCM_sys_mercure.ksh
  • SX9 use mercure-new for post-processing
  • Few feature missing on mercure-new dmget not yet install for example
  • Properly reset all svn:keywords feature
  • Bugfix in libIGCM_post.ksh when RebuildFromArchive? was false
  • Bugfix in IGCM_Patch_20090317_histcomFillvalue.ksh when renaming _Fillvalue we now just add missing_value to be retro-compatible
  • Some more comments
Location:
trunk/libIGCM/libIGCM_sys
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

    r222 r257  
    4848 
    4949    ulam) 
    50         echo "sys source ulam Intel Xeon lib." 
     50        echo "sys source ulam Intel X-64 lib." 
    5151        . ${libIGCM}/libIGCM_sys/libIGCM_sys_ulam.ksh;; 
     52 
     53    mercure) 
     54        echo "sys source mercure frontend TX7 IA-64 lib." 
     55        . ${libIGCM}/libIGCM_sys/libIGCM_sys_mercureTX.ksh;; 
     56 
     57    mercure0?) 
     58        echo "sys source mercure frontend X-64 lib." 
     59        . ${libIGCM}/libIGCM_sys/libIGCM_sys_mercure.ksh;; 
    5260 
    5361    mercure1?) 
    … …  
    6775        . ${libIGCM}/libIGCM_sys/libIGCM_sys_titane.ksh;; 
    6876 
    69     mercure) 
    70         echo "sys source mercure TX IA-64 lib." 
    71         . ${libIGCM}/libIGCM_sys/libIGCM_sys_mercureTX.ksh;; 
    72  
    7377    cesium*) 
    74         echo "sys source cesium Intel Xeon lib." 
     78        echo "sys source cesium Intel X-64 lib." 
    7579        . ${libIGCM}/libIGCM_sys/libIGCM_sys_cesium.ksh;; 
    7680 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex8.ksh

    r228 r257  
    103103typeset -r ARCHIVE=${DMFDIR} 
    104104 
     105# ============ CESIUM START ============ # 
     106 
     107#==================================================== 
     108#- Mirror libIGCM from mercure to cesium if needed 
     109#ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $2}' ) 
     110#if [ ! ${ROOTSYS} = "home" ] ; then 
     111#    typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
     112#else 
     113#    typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     114#fi 
     115 
     116#==================================================== 
     117#- libIGCM_POST 
     118#if ( ${MirrorlibIGCM} ) ; then 
     119#    PATHlibIGCM=$( echo ${libIGCM} | gawk -F"${LOGIN}/" '{print $2}' | sed -e "s&/libIGCM&&" ) 
     120#    typeset -r libIGCM_POST=${HOME}/MIRROR/${PATHlibIGCM}/libIGCM 
     121#else 
     122#    typeset -r libIGCM_POST=${libIGCM} 
     123#fi 
     124 
     125# ============ CESIUM  END  ============ # 
     126 
     127#==================================================== 
     128#- Mirror libIGCM from mercure to cesium if needed 
     129typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     130 
    105131#==================================================== 
    106132#- libIGCM_POST 
    … …  
    162188        echo "IGCM_sys_RshPost :" $@ 
    163189    fi 
     190 
     191# ============ CESIUM START ============ # 
     192#    typeset NB_ESSAI DELAI status 
     193#    #nombre d'essai avant abandon 
     194#    NB_ESSAI=5 
     195#    #temps entre chaque essai 
     196#    DELAI=10 
     197#    i=0 
     198#    while [ $i -ne $NB_ESSAI ] ; do 
     199#        ssh -t mercure ssh cesium /bin/ksh ${@} 2>/dev/null 
     200#        status=$? 
     201#        if [ ${status} -ne 0 ]; 
     202#        then 
     203#            sleep $DELAI 
     204#        else 
     205#            break 
     206#        fi 
     207#        let i=$i+1 
     208#    done  
     209# ============ CESIUM  END  ============ # 
     210 
     211 
    164212    /bin/ksh ${@} 
    165213    if [ $? -gt 0 ] ; then 
    … …  
    381429function IGCM_sys_TestFileArchive { 
    382430    IGCM_debug_PushStack "IGCM_sys_TestFileArchive" $@ 
    383     if ( $DEBUG_sys ) ; then 
    384         echo "IGCM_sys_TestFileArchive :" $@ 
    385     fi 
    386431    typeset ExistFlag 
    387432    ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 
    … …  
    485530        echo "IGCM_sys_QsubPost :" $@ 
    486531    fi 
    487     /usr/bin/nqsII/qsub -q scalaire -o ${POST_DIR}/$1.${PeriodDateEnd}.out ${libIGCM}/$1.job -v ${listVarEnv} 
     532    # ============ CESIUM START ============ # 
     533    #/usr/local/bin/ccc_msub -o ${POST_DIR}/$1.${PeriodDateEnd}.out -e ${POST_DIR}/$1.${PeriodDateEnd}.e.out -E "-v ${listVarEnv}" ${libIGCM_POST}/$1.job 
     534    # ============ CESIUM  END  ============ # 
     535    /usr/bin/nqsII/qsub -o ${POST_DIR}/$1.${PeriodDateEnd}.out ${libIGCM}/$1.job -v ${listVarEnv} 
    488536    if [ $? -gt 0 ] ; then 
    489537        echo "IGCM_sys_QsubPost : erreur " $@ 
    … …  
    608656} 
    609657     
     658 
     659#D-#================================================== 
     660#D-function IGCM_sys_Miror_libIGCM 
     661#D-* Purpose: Mirror libIGCM PATH and lib to cesium 
     662#D-* Examples: 
     663#D- 
     664function IGCM_sys_Mirror_libIGCM { 
     665    IGCM_debug_PushStack "IGCM_sys_Mirror_libIGCM" 
     666    if ( $DEBUG_sys ) ; then 
     667        echo "IGCM_sys_Mirror_libIGCM" 
     668    fi 
     669 
     670    typeset RET DEST 
     671 
     672    mkdir -p ${HOME}/MIRROR/${PATHlibIGCM} 
     673 
     674    echo ${RSYNC} ${RSYNC_opt} ${libIGCM} ${HOME}/MIRROR/${PATHlibIGCM} > out_rsync 2>&1 
     675    ${RSYNC} ${RSYNC_opt} ${libIGCM} ${HOME}/MIRROR/${PATHlibIGCM} >> out_rsync 2>&1 
     676    RET=$? 
     677 
     678    if [ ${RET} -gt 0 ] ; then 
     679        echo "IGCM_sys_Mirror_libIGCM Warning : no libIGCM on cesium." 
     680        cat out_rsync 
     681    fi 
     682    IGCM_debug_PopStack "IGCM_sys_Mirror_libIGCM" 
     683} 
     684 
     685#==================================================== 
     686#- Call IGCM_sys_Mirror_libIGCM now ! 
     687if ( $MirrorlibIGCM ) ; then 
     688    IGCM_sys_Mirror_libIGCM 
     689fi 
     690 
    610691#D-#================================================== 
    611692#D-function IGCM_sys_Cp 
    … …  
    641722    IGCM_debug_PushStack "IGCM_sys_Rm" -- $@ 
    642723    if ( $DEBUG_sys ) ; then 
    643         echo "IGCM_sys_Rm :" $@ 
     724        echo "IGCM_sys_Rm :" $@ 
    644725    fi 
    645726 
    … …  
    651732 
    652733    if [ ${RET} -gt 0 ] ; then 
    653         echo "IGCM_sys_Rm : error." 
    654         cat out_rsync 
    655         IGCM_debug_Exit "IGCM_sys_Rm" 
     734        echo "IGCM_sys_Rm : error." 
     735        cat out_rsync 
     736        IGCM_debug_Exit "IGCM_sys_Rm" 
    656737    fi 
    657738    IGCM_debug_PopStack "IGCM_sys_Rm" 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

    • Property svn:keywords set to Date Author Revision
    r228 r257  
    44# Author: Sebastien Denvil, Martial Mancip 
    55# Contact: Martial.Mancip_ipsl.jussieu.fr 
    6 # $Date: 2009-04-09 19:09:08 +0200 (Thu, 09 Apr 2009) $ 
    7 # $Author: sdipsl $ 
    8 # $Revision: 92 $ 
     6# $Date$ 
     7# $Author$ 
     8# $Revision$ 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    … …  
    8585typeset -r RSYNC_opt="-va" 
    8686# ie storage filesystem 
    87 typeset -r RHOST=cesium 
     87typeset -r RHOST=mercure 
    8888 
    8989#==================================================== 
    … …  
    103103typeset -r ARCHIVE=${DMFDIR} 
    104104 
     105# ============ CESIUM START ============ # 
     106 
    105107#==================================================== 
    106108#- Mirror libIGCM from mercure to cesium if needed 
    107 ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $2}' ) 
    108 if [ ! ${ROOTSYS} = "home" ] ; then 
    109     typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
    110 else 
    111     typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
    112 fi 
     109#ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $2}' ) 
     110#if [ ! ${ROOTSYS} = "home" ] ; then 
     111#    typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
     112#else 
     113#    typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     114#fi 
    113115 
    114116#==================================================== 
    115117#- libIGCM_POST 
    116 if ( ${MirrorlibIGCM} ) ; then 
    117     PATHlibIGCM=$( echo ${libIGCM} | gawk -F"${LOGIN}/" '{print $2}' | sed -e "s&/libIGCM&&" ) 
    118     typeset -r libIGCM_POST=${HOME}/MIRROR/${PATHlibIGCM}/libIGCM 
    119 else 
    120     typeset -r libIGCM_POST=${libIGCM} 
    121 fi 
     118#if ( ${MirrorlibIGCM} ) ; then 
     119#    PATHlibIGCM=$( echo ${libIGCM} | gawk -F"${LOGIN}/" '{print $2}' | sed -e "s&/libIGCM&&" ) 
     120#    typeset -r libIGCM_POST=${HOME}/MIRROR/${PATHlibIGCM}/libIGCM 
     121#else 
     122#    typeset -r libIGCM_POST=${libIGCM} 
     123#fi 
     124 
     125# ============ CESIUM  END  ============ # 
     126 
     127#==================================================== 
     128#- Mirror libIGCM from mercure to cesium if needed 
     129typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     130 
     131#==================================================== 
     132#- libIGCM_POST 
     133typeset -r libIGCM_POST=${libIGCM} 
    122134 
    123135#==================================================== 
    … …  
    176188        echo "IGCM_sys_RshPost :" $@ 
    177189    fi 
    178     typeset NB_ESSAI DELAI status 
    179     #nombre d'essai avant abandon 
    180     NB_ESSAI=5 
    181     #temps entre chaque essai 
    182     DELAI=10 
    183  
    184     i=0 
    185     while [ $i -ne $NB_ESSAI ] ; do 
    186         ssh -t mercure ssh cesium /bin/ksh ${@} 2>/dev/null 
    187         status=$? 
    188         if [ ${status} -ne 0 ]; 
    189         then 
    190             sleep $DELAI 
    191         else 
    192             break 
    193         fi 
    194         let i=$i+1 
    195     done  
    196  
    197     if [ ${status} -gt 0 ] ; then 
     190 
     191# ============ CESIUM START ============ # 
     192#    typeset NB_ESSAI DELAI status 
     193#    #nombre d'essai avant abandon 
     194#    NB_ESSAI=5 
     195#    #temps entre chaque essai 
     196#    DELAI=10 
     197#    i=0 
     198#    while [ $i -ne $NB_ESSAI ] ; do 
     199#        ssh -t mercure ssh cesium /bin/ksh ${@} 2>/dev/null 
     200#        status=$? 
     201#        if [ ${status} -ne 0 ]; 
     202#        then 
     203#            sleep $DELAI 
     204#        else 
     205#            break 
     206#        fi 
     207#        let i=$i+1 
     208#    done  
     209# ============ CESIUM  END  ============ # 
     210 
     211 
     212    /bin/ksh ${@} 
     213    if [ $? -gt 0 ] ; then 
    198214        echo "IGCM_sys_RshPost : erreur." 
    199215        IGCM_debug_Exit "IGCM_sys_RshPost" 
    … …  
    213229    fi 
    214230 
    215     IGCM_sys_RshPost <<-EOF 
     231    ssh mercure /bin/ksh <<-EOF 
    216232    export LOGIN=${LOGIN} 
    217233    export config_UserChoices_JobName=${config_UserChoices_JobName} 
    … …  
    514530        echo "IGCM_sys_QsubPost :" $@ 
    515531    fi 
    516     /usr/local/bin/ccc_msub -o ${POST_DIR}/$1.${PeriodDateEnd}.out -e ${POST_DIR}/$1.${PeriodDateEnd}.e.out -E "-v ${listVarEnv}" ${libIGCM_POST}/$1.job 
     532    # ============ CESIUM START ============ # 
     533    #/usr/local/bin/ccc_msub -o ${POST_DIR}/$1.${PeriodDateEnd}.out -e ${POST_DIR}/$1.${PeriodDateEnd}.e.out -E "-v ${listVarEnv}" ${libIGCM_POST}/$1.job 
     534    # ============ CESIUM  END  ============ # 
     535    /usr/bin/nqsII/qsub -o ${POST_DIR}/$1.${PeriodDateEnd}.out ${libIGCM}/$1.job -v ${listVarEnv} 
    517536    if [ $? -gt 0 ] ; then 
    518537        echo "IGCM_sys_QsubPost : erreur " $@ 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

    • Property svn:keywords set to Date Author Revision
    r256 r257  
    44# Author: Sebastien Denvil, Martial Mancip, Christian Laguerre 
    55# Contact: Martial.Mancip_ipsl.jussieu.fr 
    6 # $Date: 2008-05-29 21:29:09 +0200 (Thu, 29 May 2008) $ 
    7 # $Author: laguerre $ 
    8 # $Revision: 7 $ 
     6# $Date$ 
     7# $Author$ 
     8# $Revision$ 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    • Property svn:keywords set to Date Author Revision
    r245 r257  
    44# Author: Sebastien Denvil, Martial Mancip 
    55# Contact: Martial.Mancip_ipsl.jussieu.fr 
    6 # $Date: 2009-11-25 17:19:33 +0100 (Wed, 25 Nov 2009) $ 
    7 # $Author: sdipsl $ 
    8 # $Revision: 203 $ 
     6# $Date$ 
     7# $Author$ 
     8# $Revision$ 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh

    • Property svn:keywords set to Date Author Revision
    r228 r257  
    44# Author: Sebastien Denvil 
    55# Contact: sebastien.denvil.@ipsl.jussieu.fr 
    6 # $Date: 2008-12-15 16:00:58 +0100 (Mon, 15 Dec 2008) $ 
    7 # $Author: sdipsl $ 
    8 # $Revision: 44 $ 
     6# $Date$ 
     7# $Author$ 
     8# $Revision$ 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

    • Property svn:keywords set to Date Author Revision
    r228 r257  
    44# Author: Sébastien Denvil 
    55# Contact: sebastien.denvil.@ipsl.jussieu.fr 
    6 # $Date: 2008-09-18 17:46:57 +0200 (Thu, 18 Sep 2008) $ 
    7 # $Author: mmaipsl $ 
    8 # $Revision: 17 $ 
     6# $Date$ 
     7# $Author$ 
     8# $Revision$ 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
Note: See TracChangeset for help on using the changeset viewer.