Ignore:
Timestamp:
03/22/12 18:02:50 (12 years ago)
Author:
mafoipsl
Message:

Second merge of libIGCM_MPI_OpenMP branch with libIGCM trunk, revision 591.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/libIGCM_MPI_OpenMP/libIGCM_sys/libIGCM_sys_mercure.ksh

    r571 r592  
    102102 
    103103#==================================================== 
    104 #- ARCHIVE 
    105 typeset -r ARCHIVE=${DMFDIR} 
     104#- ARCHIVE (dedicated to large files) 
     105typeset -r ARCHIVE=${CCCSTOREDIR} 
     106 
     107#- ARCHIVE (dedicated to small/medium files) 
     108typeset -r STORAGE=${CCCWORKDIR} 
    106109 
    107110#==================================================== 
    … …  
    113116#- R_OUT 
    114117typeset -r R_OUT=${ARCHIVE}/IGCM_OUT 
     118 
     119#==================================================== 
     120#- R_FIG (hosting figures : monitoring and atlas, and/or small files) 
     121typeset -r R_FIG=${STORAGE}/IGCM_OUT 
    115122 
    116123#==================================================== 
    … …  
    532539    echo "IGCM_sys_QsubPost :" $@ 
    533540  fi 
    534   /usr/bin/nqsII/qsub -o ${POST_DIR}/${Script_Post_Output}.out ${libIGCM}/$1.job -v ${listVarEnv} 
     541  /usr/bin/nqsII/qsub -q scalaire -o ${POST_DIR}/${Script_Post_Output}.out ${libIGCM}/$1.job -v ${listVarEnv} 
    535542  if [ $? -gt 0 ] ; then 
    536543    echo "IGCM_sys_QsubPost : erreur " $@ 
    … …  
    833840    #USUAL WAY 
    834841    # add dmget (to demigrate all offline files) to reduce time of this command : 
    835     dmget $1/* 
     842    #dmget $1/* 
     843    ccc_hsm get $1/* 
    836844    \cp -r $1 $2 > out_rsync 2>&1 
    837845    RET=$? 
    … …  
    10271035    if [ -f $2 ] ; then 
    10281036      IGCM_debug_Print 1 "$2 already exist" 
    1029       dmget $2 
     1037      #dmget $2 
     1038      ccc_hsm get $2 
    10301039      exist=true 
    10311040      if [ "X$( diff $1 $2 )" = X ] ; then 
    … …  
    11661175    fi 
    11671176 
    1168     dmget ${dm_liste[*]} > out_rsync 2>&1 
     1177    #dmget ${dm_liste[*]} > out_rsync 2>&1 
     1178    ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    11691179    RET=$? 
    11701180    if [ ${RET} -gt 0 ] ; then 
    … …  
    11801190    #   sleep 30 
    11811191    #   echo "We try another time" 
    1182     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1192    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1193    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    11831194    #   RET=$? 
    11841195    #   if [ ${RET} -gt 0 ] ; then 
    … …  
    13211332  RET=0 
    13221333  if [ $DRYRUN = 0 ]; then 
    1323     if [ ! -d /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} ] ; then 
    1324       echo "WARNING : IGCM_sys_Dods_Rm /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} DOES NOT EXIST ." 
    1325       echo "Nothing has been done." 
    1326       return 
    1327     fi 
    1328     dods_rm public/${LOGIN}/${R_DODS}/${1} # > out_dods_rm 2>&1 
     1334 
     1335#    if [ ! -d /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} ] ; then 
     1336#      echo "WARNING : IGCM_sys_Dods_Rm /dmnfs/cont003/dods/public/${LOGIN}/${R_DODS}/${1} DOES NOT EXIST ." 
     1337#      echo "Nothing has been done." 
     1338#      return 
     1339#    fi 
     1340 
     1341    /ccc/cont003/home/dsm/p86maf/bin/dods_rm public/${LOGIN}/${R_DODS}/${1} # > out_dods_rm 2>&1 
    13291342    RET=$? 
    13301343     
    … …  
    13551368  RET=0 
    13561369  if [ $DRYRUN = 0 ]; then 
    1357     if [ ! -d ${R_SAVE}/${1} ] ; then 
    1358       echo "WARNING : IGCM_sys_Dods_Cp ${R_SAVE}/${1} DOES NOT EXIST ." 
    1359       echo "Nothing has been done." 
    1360       return 
    1361     fi 
    1362     # 
    1363     dods_cp ${1} public/${LOGIN}/${R_DODS} # > out_dods_cp 2>&1 
     1370 
     1371#    if [ ! -d ${R_SAVE}/${1} ] ; then 
     1372#      echo "WARNING : IGCM_sys_Dods_Cp ${R_SAVE}/${1} DOES NOT EXIST ." 
     1373#      echo "Nothing has been done." 
     1374#      return 
     1375#    fi 
     1376 
     1377    /ccc/cont003/home/dsm/p86maf/bin/dods_cp ${1} public/${LOGIN}/${R_DODS} # > out_dods_cp 2>&1 
    13641378    RET=$? 
    13651379 
    … …  
    13881402    echo "IGCM_sys_Put_Dods :" $@ 
    13891403  fi 
     1404  typeset RET 
    13901405  if [ $DRYRUN = 0 ]; then 
    1391     if [ ! -d ${R_SAVE}/${1} ] ; then 
    1392       echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ." 
     1406    if ( [ ! -d ${R_SAVE}/${1} ] && [ ! -d ${R_FIGR}/${1} ] ) ; then 
     1407      echo "WARNING IGCM_sys_Put_Dods : None of the following directories exist. Exactly one should." 
     1408      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} DOES NOT EXIST." 
     1409      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} DOES NOT EXIST." 
    13931410      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
    13941411      return 
    13951412    fi 
    13961413 
    1397     typeset RET 
    1398         # 
    1399     cd ${R_SAVE} 
     1414    if ( [ -d ${R_SAVE}/${1} ] && [ -d ${R_FIGR}/${1} ] ) ; then 
     1415      echo "WARNING IGCM_sys_Put_Dods : Both of the following directories exist. Exactly one should." 
     1416      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} EXISTS." 
     1417      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} EXISTS." 
     1418      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
     1419      return 
     1420    fi 
     1421    # 
     1422    if [ -d ${R_SAVE}/${1} ] ; then 
     1423      cd ${R_SAVE} 
     1424    elif [ -d ${R_FIGR}/${1} ] ; then 
     1425      cd ${R_FIGR} 
     1426    fi 
     1427 
    14001428    IGCM_sys_Dods_Rm ${1} 
    14011429    IGCM_sys_Dods_Cp ${1} 
Note: See TracChangeset for help on using the changeset viewer.