Changeset 587


Ignore:
Timestamp:
03/19/12 15:49:25 (12 years ago)
Author:
sdipsl
Message:
  • Start producing files on CCCSTOREDIR and CCCWORKDIR (all CCRT machines)
  • Adapt dods command to hanbdle both locations
  • Still need to adapt IDRIS system library to be compatible with that
  • Not fully tested
Location:
trunk/libIGCM
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_atlas_LMDZ

    r546 r587  
    178178    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    179179    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     180    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    180181    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    181182    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    182183else 
    183184    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     185    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    184186    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    185187    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    … …  
    221223 
    222224# Save files 
    223 IGCM_sys_Put_Dir ATLAS ${R_SAVE} 
     225IGCM_sys_Put_Dir ATLAS ${R_FIGR} 
    224226IGCM_sys_Rm -Rf ATLAS 
    225227IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_histmth.nc 
    226228 
    227229# DODS copy 
    228 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 
     230IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS} 
    229231[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    230232 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r546 r587  
    178178    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    179179    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     180    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    180181    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    181182    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    182183else 
    183184    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     185    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    184186    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    185187    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    … …  
    256258 
    257259# Save files 
    258 IGCM_sys_Put_Dir ATLAS ${R_SAVE} 
     260IGCM_sys_Put_Dir ATLAS ${R_FIGR} 
    259261 
    260262IGCM_sys_Rm -Rf ATLAS 
    … …  
    267269 
    268270# DODS copy 
    269 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 
     271IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS} 
    270272[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    271273 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r546 r587  
    187187    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    188188    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     189    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    189190    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    190191    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    191192else 
    192193    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     194    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    193195    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    194196    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    … …  
    227229 
    228230# Save files 
    229 IGCM_sys_Put_Dir ATLAS ${R_SAVE} 
     231IGCM_sys_Put_Dir ATLAS ${R_FIGR} 
    230232IGCM_sys_Rm -Rf ATLAS 
    231233IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_sechiba_history.nc 
    232234 
    233235# DODS copy 
    234 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 
     236IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS} 
    235237[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    236238 

  • trunk/libIGCM/AA_atlas_PISCES

    r546 r587  
    179179    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    180180    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     181    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    181182    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    182183    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    183184else 
    184185    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     186    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    185187    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    186188    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    … …  
    225227 
    226228# Save files 
    227 IGCM_sys_Put_Dir ATLAS ${R_SAVE} 
     229IGCM_sys_Put_Dir ATLAS ${R_FIGR} 
    228230 
    229231IGCM_sys_Rm -Rf ATLAS 
    … …  
    232234 
    233235# DODS copy 
    234 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 
     236IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS} 
    235237[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} 
    236238 

  • trunk/libIGCM/AA_monitoring

    r554 r587  
    224224    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    225225    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     226    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    226227    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    227228    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    228229else 
    229230    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     231    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    230232    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    231233    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    … …  
    285287 
    286288# Save files 
    287 IGCM_sys_Put_Dir MONITORING ${R_SAVE} 
     289IGCM_sys_Put_Dir MONITORING ${R_FIGR} 
    288290 
    289291# Dods copy 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r554 r587  
    180180    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    181181    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     182    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    182183    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    183184    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    184185  else 
    185186    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     187    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    186188    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    187189    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

    r548 r587  
    112112 
    113113#==================================================== 
    114 #- ARCHIVE 
    115 typeset -r ARCHIVE=${DMFDIR} 
     114#- ARCHIVE (dedicated to large files) 
     115typeset -r ARCHIVE=${CCCSTOREDIR} 
     116 
     117#- ARCHIVE (dedicated to small/medium files) 
     118typeset -r STORAGE=${CCCWORKDIR} 
     119 
     120#==================================================== 
    116121 
    117122#==================================================== 
    … …  
    123128#- R_OUT 
    124129typeset -r R_OUT=${ARCHIVE}/IGCM_OUT 
     130 
     131#==================================================== 
     132#- R_FIG (hosting figures : monitoring and atlas, and/or small files) 
     133typeset -r R_FIG=${STORAGE}/IGCM_OUT 
    125134 
    126135#==================================================== 
    … …  
    895904    # USUAL WAY 
    896905    # add dmfind/dmget (to demigrate all offline files) : 
    897     dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
     906    #dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
    898907    \cp -r $1 $2 > out_rsync 2>&1 
    899908    RET=$? 
    … …  
    10661075    if [ -f $2 ] ; then 
    10671076      IGCM_debug_Print 1 "$2 already exist" 
    1068       dmget $2 
     1077      #dmget $2 
     1078      ccc_hsm get $2 
    10691079      exist=true 
    10701080      if [ "X$( diff $1 $2 )" = X ] ; then 
    … …  
    11611171    fi 
    11621172 
    1163     dmget ${dm_liste[*]} > out_rsync 2>&1 
     1173    #dmget ${dm_liste[*]} > out_rsync 2>&1 
     1174    ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    11641175    RET=$? 
    11651176    if [ ${RET} -gt 0 ] ; then 
    … …  
    11751186    #   sleep 30 
    11761187    #   echo "We try another time" 
    1177     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1188    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1189    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    11781190    #   RET=$? 
    11791191    #   if [ ${RET} -gt 0 ] ; then 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

    r586 r587  
    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#==================================================== 
    … …  
    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 
    … …  
    11811191    #   sleep 30 
    11821192    #   echo "We try another time" 
    1183     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1193    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1194    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    11841195    #   RET=$? 
    11851196    #   if [ ${RET} -gt 0 ] ; then 
    … …  
    13891400    echo "IGCM_sys_Put_Dods :" $@ 
    13901401  fi 
     1402  typeset RET 
    13911403  if [ $DRYRUN = 0 ]; then 
    1392     if [ ! -d ${R_SAVE}/${1} ] ; then 
    1393       echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ." 
     1404    if ( [ ! -d ${R_SAVE}/${1} ] && [ ! -d ${R_FIGR}/${1} ] ) ; then 
     1405      echo "WARNING IGCM_sys_Put_Dods : None of the following directories exist. Exactly one should." 
     1406      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} DOES NOT EXIST." 
     1407      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} DOES NOT EXIST." 
    13941408      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
    13951409      return 
    13961410    fi 
    13971411 
    1398     typeset RET 
    1399         # 
    1400     cd ${R_SAVE} 
     1412    if ( [ -d ${R_SAVE}/${1} ] && [ -d ${R_FIGR}/${1} ] ) ; then 
     1413      echo "WARNING IGCM_sys_Put_Dods : Both of the following directories exist. Exactly one should." 
     1414      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} EXISTS." 
     1415      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} EXISTS." 
     1416      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
     1417      return 
     1418    fi 
     1419    # 
     1420    if [ -d ${R_SAVE}/${1} ] ; then 
     1421      cd ${R_SAVE} 
     1422    elif [ -d ${R_FIGR}/${1} ] ; then 
     1423      cd ${R_FIGR} 
     1424    fi 
     1425 
    14011426    IGCM_sys_Dods_Rm ${1} 
    14021427    IGCM_sys_Dods_Cp ${1} 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex8.ksh

    r548 r587  
    8989#==================================================== 
    9090 
     91# ============ CESIUM START ============ # 
     92 
     93#==================================================== 
     94#- Mirror libIGCM from mercure to cesium if needed 
     95#ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $3}' ) 
     96#if [ ! ${ROOTSYS} = "home" ] ; then 
     97#  typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
     98#else 
     99#  typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     100#fi 
     101 
     102#==================================================== 
     103#- libIGCM_POST 
     104#if ( ${MirrorlibIGCM} ) ; then 
     105#  PATHlibIGCM=$( echo ${libIGCM} | gawk -F"${LOGIN}/" '{print $2}' | sed -e "s&/libIGCM&&" ) 
     106#  typeset -r libIGCM_POST=${HOME}/MIRROR/${PATHlibIGCM}/libIGCM 
     107#else 
     108#  typeset -r libIGCM_POST=${libIGCM} 
     109#fi 
     110 
     111# ============ CESIUM  END  ============ # 
     112 
     113#==================================================== 
     114#- MirrorlibIGCM uncomment for frontend 
     115typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     116 
     117#==================================================== 
     118#- libIGCM_POST uncomment for frontend 
     119typeset -r libIGCM_POST=${libIGCM} 
     120 
    91121#==================================================== 
    92122#- R_EXE   (==> BIN_DIR = ${MODIPSL}/bin ) 
    … …  
    98128 
    99129#==================================================== 
    100 #- ARCHIVE 
    101 typeset -r ARCHIVE=${DMFDIR} 
    102  
    103 # ============ CESIUM START ============ # 
    104  
    105 #==================================================== 
    106 #- 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 
    113  
    114 #==================================================== 
    115 #- 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 
    122  
    123 # ============ CESIUM  END  ============ # 
    124  
    125 #==================================================== 
    126 #- Mirror libIGCM from mercure to cesium if needed 
    127 typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
    128  
    129 #==================================================== 
    130 #- libIGCM_POST 
    131 typeset -r libIGCM_POST=${libIGCM} 
     130#- ARCHIVE (dedicated to large files) 
     131typeset -r ARCHIVE=${CCCSTOREDIR} 
     132 
     133#- ARCHIVE (dedicated to small/medium files) 
     134typeset -r STORAGE=${CCCWORKDIR} 
    132135 
    133136#==================================================== 
    … …  
    139142#- R_OUT 
    140143typeset -r R_OUT=${ARCHIVE}/IGCM_OUT 
     144 
     145#==================================================== 
     146#- R_FIG (hosting figures : monitoring and atlas, and/or small files) 
     147typeset -r R_FIG=${STORAGE}/IGCM_OUT 
    141148 
    142149#==================================================== 
    … …  
    271278    status=completed 
    272279  fi 
    273  
    274   ssh ${MASTER} /bin/ksh <<-EOF 
    275   export LOGIN=${LOGIN} 
    276   export config_UserChoices_JobName=${config_UserChoices_JobName} 
    277   export config_UserChoices_MailName=${config_UserChoices_MailName} 
    278   export DateBegin=${DateBegin} 
    279   export DateEnd=${DateEnd} 
    280   export R_SAVE=${R_SAVE} 
    281   export SUBMIT_DIR=${SUBMIT_DIR} 
    282   export status=${status} 
    283  
    284280  cat  << END_MAIL > job_end.mail 
    285281  Dear ${LOGIN}, 
    … …  
    296292  elif [ -f ~/.forward ] ; then 
    297293    mailx -s "${config_UserChoices_JobName} ${status}" $( cat ~/.forward ) < job_end.mail 
    298   fi 
    299  
    300   sleep 10 
    301   rm -f job_end.mail 
    302 EOF 
     294  else 
     295    mailx -s "${config_UserChoices_JobName} ${status}" ${LOGIN} < job_end.mail 
     296  fi 
    303297 
    304298  if [ $? -gt 0 ] ; then 
    … …  
    627621# ============ FRONTEND START ============ # 
    628622 
    629   /usr/bin/nqsII/qsub -o ${POST_DIR}/${Script_Post_Output}.out ${libIGCM}/$1.job -v ${listVarEnv} 
     623  /usr/bin/nqsII/qsub -q scalaire -o ${POST_DIR}/${Script_Post_Output}.out ${libIGCM}/$1.job -v ${listVarEnv} 
    630624 
    631625# ============ FRONTEND  END  ============ # 
    632626 
    633627# ============ CESIUM START ============ # 
    634  
    635628#  typeset NB_ESSAI DELAI status i 
    636629#  # number of tentative 
    … …  
    649642#    (( i = i + 1 )) 
    650643#  done  
    651  
    652644# ============ CESIUM  END  ============ # 
    653645 
    … …  
    956948    # USUAL WAY 
    957949    # add dmfind/dmget (to demigrate all offline files) : 
    958     dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
     950    #dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
    959951    \cp -r $1 $2 > out_rsync 2>&1 
    960952    RET=$? 
    … …  
    12331225    fi 
    12341226 
    1235     dmget ${dm_liste[*]} > out_rsync 2>&1 
     1227    #dmget ${dm_liste[*]} > out_rsync 2>&1 
     1228    ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    12361229    RET=$? 
    12371230    if [ ${RET} -gt 0 ] ; then 
    … …  
    12471240    #   sleep 30 
    12481241    #   echo "We try another time" 
    1249     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1242    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1243    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    12501244    #   RET=$? 
    12511245    #   if [ ${RET} -gt 0 ] ; then 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

    r582 r587  
    8989#==================================================== 
    9090 
     91# ============ CESIUM START ============ # 
     92 
     93#==================================================== 
     94#- Mirror libIGCM from mercure to cesium if needed 
     95#ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $3}' ) 
     96#if [ ! ${ROOTSYS} = "home" ] ; then 
     97#  typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
     98#else 
     99#  typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     100#fi 
     101 
     102#==================================================== 
     103#- libIGCM_POST 
     104#if ( ${MirrorlibIGCM} ) ; then 
     105#  PATHlibIGCM=$( echo ${libIGCM} | gawk -F"${LOGIN}/" '{print $2}' | sed -e "s&/libIGCM&&" ) 
     106#  typeset -r libIGCM_POST=${HOME}/MIRROR/${PATHlibIGCM}/libIGCM 
     107#else 
     108#  typeset -r libIGCM_POST=${libIGCM} 
     109#fi 
     110 
     111# ============ CESIUM  END  ============ # 
     112 
     113#==================================================== 
     114#- MirrorlibIGCM uncomment for frontend 
     115typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
     116 
     117#==================================================== 
     118#- libIGCM_POST uncomment for frontend 
     119typeset -r libIGCM_POST=${libIGCM} 
     120 
    91121#==================================================== 
    92122#- R_EXE   (==> BIN_DIR = ${MODIPSL}/bin ) 
    … …  
    98128 
    99129#==================================================== 
    100 #- ARCHIVE 
    101 typeset -r ARCHIVE=${DMFDIR} 
    102  
    103 # ============ CESIUM START ============ # 
    104  
    105 #==================================================== 
    106 #- Mirror libIGCM from mercure to cesium if needed 
    107 ROOTSYS=$( echo ${libIGCM} | gawk -F"/" '{print $3}' ) 
    108 if [ ! ${ROOTSYS} = "home" ] ; then 
    109   typeset -r MirrorlibIGCM=${MirrorlibIGCM:=true} 
    110 else 
    111   typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
    112 fi 
    113  
    114 #==================================================== 
    115 #- 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 
    122  
    123 # ============ CESIUM  END  ============ # 
    124  
    125 #==================================================== 
    126 #- MirrorlibIGCM uncomment for frontend 
    127 #typeset -r MirrorlibIGCM=${MirrorlibIGCM:=false} 
    128  
    129 #==================================================== 
    130 #- libIGCM_POST uncomment for frontend 
    131 #typeset -r libIGCM_POST=${libIGCM} 
     130#- ARCHIVE (dedicated to large files) 
     131typeset -r ARCHIVE=${CCCSTOREDIR} 
     132 
     133#- ARCHIVE (dedicated to small/medium files) 
     134typeset -r STORAGE=${CCCWORKDIR} 
    132135 
    133136#==================================================== 
    … …  
    139142#- R_OUT 
    140143typeset -r R_OUT=${ARCHIVE}/IGCM_OUT 
     144 
     145#==================================================== 
     146#- R_FIG (hosting figures : monitoring and atlas, and/or small files) 
     147typeset -r R_FIG=${STORAGE}/IGCM_OUT 
    141148 
    142149#==================================================== 
    … …  
    941948    # USUAL WAY 
    942949    # add dmfind/dmget (to demigrate all offline files) : 
    943     dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
     950    #dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
    944951    \cp -r $1 $2 > out_rsync 2>&1 
    945952    RET=$? 
    … …  
    12181225    fi 
    12191226 
    1220     dmget ${dm_liste[*]} > out_rsync 2>&1 
     1227    #dmget ${dm_liste[*]} > out_rsync 2>&1 
     1228    ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    12211229    RET=$? 
    12221230    if [ ${RET} -gt 0 ] ; then 
    … …  
    12321240    #   sleep 30 
    12331241    #   echo "We try another time" 
    1234     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1242    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1243    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    12351244    #   RET=$? 
    12361245    #   if [ ${RET} -gt 0 ] ; then 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r584 r587  
    103103#==================================================== 
    104104 
    105 #==================================================== 
    106 #- R_EXE   (==> BIN_DIR = ${MODIPSL}/bin ) 
    107 typeset -r R_EXE="${MODIPSL}/bin" 
    108  
    109 #==================================================== 
    110 #- SUBMIT_DIR : submission dir 
    111 typeset SUBMIT_DIR=${SUBMIT_DIR:=${LS_SUBCWD}} 
    112  
    113 #==================================================== 
    114 #- ARCHIVE 
    115 typeset -r ARCHIVE=${DMFDIR} 
    116  
    117105# ============ CESIUM START ============ # 
    118106 
    … …  
    146134 
    147135#==================================================== 
     136#- R_EXE   (==> BIN_DIR = ${MODIPSL}/bin ) 
     137typeset -r R_EXE="${MODIPSL}/bin" 
     138 
     139#==================================================== 
     140#- SUBMIT_DIR : submission dir 
     141typeset SUBMIT_DIR=${SUBMIT_DIR:=${LS_SUBCWD}} 
     142 
     143#==================================================== 
     144#- ARCHIVE (dedicated to large files) 
     145typeset -r ARCHIVE=${CCCSTOREDIR} 
     146 
     147#- ARCHIVE (dedicated to small/medium files) 
     148typeset -r STORAGE=${CCCWORKDIR} 
     149 
     150#==================================================== 
    148151#- IN 
    149152typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM} 
    … …  
    153156#- R_OUT 
    154157typeset -r R_OUT=${ARCHIVE}/IGCM_OUT 
     158 
     159#==================================================== 
     160#- R_FIG (hosting figures : monitoring and atlas, and/or small files) 
     161typeset -r R_FIG=${STORAGE}/IGCM_OUT 
    155162 
    156163#==================================================== 
    … …  
    10271034    # USUAL WAY 
    10281035    # add dmfind/dmget (to demigrate all offline files) : 
    1029     dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
     1036    #dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget 
    10301037    \cp -r $1 $2 > out_rsync 2>&1 
    10311038    RET=$? 
    … …  
    13401347    fi 
    13411348 
    1342     dmget ${dm_liste[*]} > out_rsync 2>&1 
     1349    #dmget ${dm_liste[*]} > out_rsync 2>&1 
     1350    ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    13431351    RET=$? 
    13441352    if [ ${RET} -gt 0 ] ; then 
    … …  
    13541362    #   sleep 30 
    13551363    #   echo "We try another time" 
    1356     #   dmget ${dm_liste[*]} > out_rsync 2>&1 
     1364    ##  dmget ${dm_liste[*]} > out_rsync 2>&1 
     1365    #   ccc_hsm get ${dm_liste[*]} > out_rsync 2>&1 
    13571366    #   RET=$? 
    13581367    #   if [ ${RET} -gt 0 ] ; then 
    … …  
    15701579    echo "IGCM_sys_Put_Dods :" $@ 
    15711580  fi 
     1581  typeset RET 
    15721582  if [ $DRYRUN = 0 ]; then 
    1573     if [ ! -d ${R_SAVE}/${1} ] ; then 
    1574       echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ." 
     1583    if ( [ ! -d ${R_SAVE}/${1} ] && [ ! -d ${R_FIGR}/${1} ] ) ; then 
     1584      echo "WARNING IGCM_sys_Put_Dods : None of the following directories exist. Exactly one should." 
     1585      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} DOES NOT EXIST." 
     1586      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} DOES NOT EXIST." 
    15751587      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
    15761588      return 
    15771589    fi 
    15781590 
    1579     typeset RET 
    1580         # 
    1581     cd ${R_SAVE} 
     1591    if ( [ -d ${R_SAVE}/${1} ] && [ -d ${R_FIGR}/${1} ] ) ; then 
     1592      echo "WARNING IGCM_sys_Put_Dods : Both of the following directories exist. Exactly one should." 
     1593      echo "WARNING IGCM_sys_Put_Dods : ${R_SAVE}/${1} EXISTS." 
     1594      echo "WARNING IGCM_sys_Put_Dods : ${R_FIGR}/${1} EXISTS." 
     1595      IGCM_debug_PopStack "IGCM_sys_Put_Dods" 
     1596      return 
     1597    fi 
     1598    # 
     1599    if [ -d ${R_SAVE}/${1} ] ; then 
     1600      cd ${R_SAVE} 
     1601    elif [ -d ${R_FIGR}/${1} ] ; then 
     1602      cd ${R_FIGR} 
     1603    fi 
     1604 
    15821605    IGCM_sys_Dods_Rm ${1} 
    15831606    IGCM_sys_Dods_Cp ${1} 
Note: See TracChangeset for help on using the changeset viewer.