Changeset 742


Ignore:
Timestamp:
11/05/12 10:59:01 (12 years ago)
Author:
sdipsl
Message:
  • ensemble handling : remove machine specific
Location:
trunk/libIGCM
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

    r741 r742  
    2626  IGCM_sys_Cp ${SUBMIT_DIR}/run.card.init ${RUN_DIR} 
    2727 
    28   if [ -f  ${SUBMIT_DIR}/CreatedDir.txt ] ; then 
    29     IGCM_sys_Cp ${SUBMIT_DIR}/CreatedDir.txt ${RUN_DIR} 
    30   fi 
    31   if [ -f  ${SUBMIT_DIR}/Qsub.txt ] ; then 
    32     IGCM_sys_Cp ${SUBMIT_DIR}/Qsub.txt ${RUN_DIR} 
    33   fi 
     28  # Useful? 
     29  #if [ -f  ${SUBMIT_DIR}/CreatedDir.txt ] ; then 
     30  #  IGCM_sys_Cp ${SUBMIT_DIR}/CreatedDir.txt ${RUN_DIR} 
     31  #fi 
     32  # Useful? 
     33  #if [ -f  ${SUBMIT_DIR}/Qsub.txt ] ; then 
     34  #  IGCM_sys_Cp ${SUBMIT_DIR}/Qsub.txt ${RUN_DIR} 
     35  #fi 
    3436 
    3537  IGCM_card_DefineVariableFromOption ${FileName} Ens_PERTURB actif 
    … …  
    202204        IGCM_sys_Cp Job_${ensemble_Ens_PERTURB_NAME} ${SUBMIT_DIR}/${StartDir}/${MemberDir}/${JobName} 
    203205 
    204         ############################## 
    205         # TO BE A SYS FUNCTION BEGIN # 
    206         ############################## 
    207  
    208         # Dump command to be lauched in Qsub.txt 
    209         echo "cd ${StartDir}/${MemberDir}/ ;"  >> Qsub.txt 
    210         echo "sed -e 's/PeriodNb=.*/PeriodNb=48/' ${JobName} > ${JobName}.tmp ; " >> Qsub.txt 
    211         echo "mv ${JobName}.tmp ${JobName} ; " >> Qsub.txt 
    212         echo "ccc_msub ${JobName} ; cd -"      >> Qsub.txt 
    213  
    214         ############################ 
    215         # TO BE A SYS FUNCTION END # 
    216         ############################ 
    217  
     206        # Dump command to be lauched 
     207        echo "cd ${StartDir}/${MemberDir}/ ;"  >> Qsub.${StartDir}.txt 
     208        echo "${SUBMIT} ${JobName} ; cd -"     >> Qsub.${StartDir}.txt 
    218209      fi 
    219210 
    … …  
    226217      (( i = i + 1 )) 
    227218    done 
     219 
     220    # Done. Save ${StartDir} submission text file 
     221    IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.txt ${SUBMIT_DIR} 
    228222 
    229223  # - Next DateBegin 
    … …  
    319313        IGCM_sys_Cp Job_${ensemble_Ens_PERTURB_NAME} ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} 
    320314 
    321         ############################## 
    322         # TO BE A SYS FUNCTION BEGIN # 
    323         ############################## 
    324  
    325         # Dump command to be lauched in Qsub.txt 
    326         echo "cd ${StartDir}/${MemberDir}/ ;"  >> Qsub.txt 
    327         echo "sed -e 's/PeriodNb=.*/PeriodNb=48/' ${JobName} > ${JobName}.tmp ; " >> Qsub.txt 
    328         echo "mv ${JobName}.tmp ${JobName} ; " >> Qsub.txt 
    329         echo "ccc_msub ${JobName} ; cd -"      >> Qsub.txt 
    330  
    331         ############################ 
    332         # TO BE A SYS FUNCTION END # 
    333         ############################ 
    334  
     315        # Dump command to be lauched 
     316        echo "cd ${StartDir}/${MemberDir}/ ;"  >> Qsub.${StartDir}.txt 
     317        echo "${SUBMIT} ${JobName} ; cd -"     >> Qsub.${StartDir}.txt 
    335318      fi 
    336319 
    … …  
    346329      (( i = i + 1 )) 
    347330    done 
     331 
     332    # Done. Save ${StartDir} submission text file 
     333    IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.txt ${SUBMIT_DIR} 
    348334 
    349335    (( DateNum = DateNum + 1 )) 
    … …  
    373359  IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card Restarts OverRule "n" 
    374360 
    375   for Comp in ${config_ListOfComponents[*]} ; do 
    376     IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${Comp} Restart "y" 
    377     IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${Comp} RestartDate ${HumanRestartDate} 
    378     IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${Comp} RestartJobName ${ensemble_Ens_PERTURB_INITFROM} 
    379     IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${Comp} RestartPath ${ensemble_Ens_PERTURB_INITPATH} 
     361  for comp in ${config_ListOfComponents[*]} ; do 
     362    IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} Restart "y" 
     363    IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} RestartDate ${HumanRestartDate} 
     364    IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} RestartJobName ${ensemble_Ens_PERTURB_INITFROM} 
     365    IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} RestartPath ${ensemble_Ens_PERTURB_INITPATH} 
    380366  done 
     367 
    381368  # ==> Job 
    382   ############################## 
    383   # TO BE A SYS FUNCTION BEGIN # 
    384   ############################## 
    385  
    386   #sed -e "s/\(#MSUB -r \)[A-Za-z0-9]*\( *#.*\)/\1 ${MemberDir} \2/"           \ 
    387   #    -e "s/\(#MSUB -o Script_Output_\)[A-Za-z0-9]*\(\.*\)/\1${MemberDir}\2/" \ 
    388   #    -e "s/\(#MSUB -e Script_Output_\)[A-Za-z0-9]*\(\.*\)/\1${MemberDir}\2/" \ 
    389   #    ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} > Job_${MemberDir}.tmp 
    390   #IGCM_sys_Mv Job_${MemberDir}.tmp ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} 
    391  
    392   ############################ 
    393   # TO BE A SYS FUNCTION END # 
    394   ############################ 
     369  sed -e "s/\(#.*\)${ensemble_Ens_PERTURB_NAME}\( *#.*\)/\1${MemberDir} \2/"            \ 
     370      -e "s/\(#.*Script_Output_\)${ensemble_Ens_PERTURB_NAME}\(\.*\)/\1${MemberDir}\2/" \ 
     371      -e "s/^PeriodNb=.*/PeriodNb=48/"                                                  \ 
     372      ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} > Job_${MemberDir}.tmp 
     373  IGCM_sys_Mv Job_${MemberDir}.tmp ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} 
    395374 
    396375  IGCM_debug_PopStack "IGCM_ensemble_CastFilesUpdate" 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

    r739 r742  
    7575#D-#================================================== 
    7676 
     77# Submit command 
     78typeset SUBMIT=${SUBMIT:=ccc_mprun} 
    7779# rsync with path 
    7880typeset -r RSYNC=/usr/bin/rsync 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_default.ksh

    r725 r742  
    7575#D-#================================================== 
    7676 
     77# Submit command 
     78typeset SUBMIT=${SUBMIT:=qsub} 
    7779# rsync with path 
    7880typeset -r RSYNC=/usr/bin/rsync 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

    r736 r742  
    7373#D-#================================================== 
    7474 
     75# Submit command 
     76typeset SUBMIT=${SUBMIT:=qsub} 
    7577# rsync with path 
    7678typeset -r RSYNC=/usr/bin/rsync 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

    r734 r742  
    7878#D-#================================================== 
    7979 
     80# Submit command 
     81typeset SUBMIT=${SUBMIT:=qsub} 
    8082# rsync with path 
    8183typeset -r RSYNC=/home/cont003/p86denv/SX_RSYNC/bin/rsync 
    … …  
    352354    echo "IGCM_sys_Mkdir :" $@ 
    353355  fi 
     356 
     357  typeset NB_ESSAI DELAI status i 
     358  # number of tentative 
     359  NB_ESSAI=3 
     360  # time delay between tentative 
     361  DELAI=2 
     362 
    354363  if [ ! -d ${1} ]; then 
    355     \mkdir -p $1 
    356     if [ $? -gt 0 ] ; then 
    357       echo "IGCM_sys_Mkdir : erreur." 
    358       IGCM_debug_Exit "IGCM_sys_Mkdir" 
    359     fi 
     364    i=0 
     365    while [ $i -lt $NB_ESSAI ] ; do 
     366      \mkdir -p $1 
     367      status=$? 
     368      if [ ${status} -gt 0 ] ; then 
     369        IGCM_debug_Print 2 "IGCM_sys_Mkdir : mkdir failed error code ${status} ${i}/${NB_ESSAI}" 
     370        IGCM_debug_Print 2 "IGCM_sys_Mkdir : sleep ${DELAI} seconds and try again." 
     371        sleep $DELAI 
     372      else 
     373        break 
     374      fi 
     375      (( i = i + 1 )) 
     376    done 
    360377  fi 
    361378  # vérification : 
    … …  
    377394    echo "IGCM_sys_MkdirArchive :" $@ 
    378395  fi 
    379   #- creation de repertoire sur le serveur fichier 
     396 
     397  typeset NB_ESSAI DELAI status i 
     398  # number of tentative 
     399  NB_ESSAI=3 
     400  # time delay between tentative 
     401  DELAI=2 
     402 
    380403  if [ ! -d ${1} ]; then 
    381     \mkdir -p $1 
    382     if [ $? -gt 0 ] ; then 
    383       echo "IGCM_sys_MkdirArchive : erreur." 
    384       IGCM_debug_Exit "IGCM_sys_MkdirArchive" 
    385     fi 
     404    i=0 
     405    while [ $i -lt $NB_ESSAI ] ; do 
     406      \mkdir -p $1 
     407      status=$? 
     408      if [ ${status} -gt 0 ] ; then 
     409        IGCM_debug_Print 2 "IGCM_sys_MkdirArchive : mkdir failed error code ${status} ${i}/${NB_ESSAI}" 
     410        IGCM_debug_Print 2 "IGCM_sys_MkdirArchive : sleep ${DELAI} seconds and try again." 
     411        sleep $DELAI 
     412      else 
     413        break 
     414      fi 
     415      (( i = i + 1 )) 
     416    done 
     417  fi 
     418 
     419  # vérification : 
     420  if [ ! -d ${1} ] ; then 
     421    echo "IGCM_sys_MkdirArchive : erreur." 
     422    IGCM_debug_Exit "IGCM_sys_MkdirArchive" 
    386423  fi 
    387424  IGCM_debug_PopStack "IGCM_sys_MkdirArchive" 
    … …  
    600637    echo "IGCM_sys_Tar :" $@ 
    601638  fi 
    602   \tar cf $@ 
     639  IGCM_sys_RshMaster "\tar $@" 
    603640  if [ $? -gt 0 ] ; then 
    604641    echo "IGCM_sys_Tar : erreur." 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

    r725 r742  
    6464# Host and user names 
    6565# $hostname ou hostname 
    66 typeset  HOST=${HOST:=$( hostname )} 
     66typeset HOST=${HOST:=$( hostname )} 
    6767# $username ou whoami 
    68 typeset  LOGIN=${LOGIN:=$( whoami )} 
     68typeset LOGIN=${LOGIN:=$( whoami )} 
    6969# $hostname of the MASTER job 
    70 typeset  MASTER=${MASTER:=$( hostname )} 
     70typeset MASTER=${MASTER:=$( hostname )} 
    7171 
    7272#D- 
    … …  
    7575#D-#================================================== 
    7676 
     77# Submit command 
     78typeset SUBMIT=${SUBMIT:=qsub} 
    7779# rsync with path 
    7880typeset -r RSYNC=/usr/bin/rsync 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

    r734 r742  
    7575#D-#================================================== 
    7676 
     77# Submit command 
     78typeset SUBMIT=${SUBMIT:=ccc_mprun} 
    7779# rsync with path 
    7880typeset -r RSYNC=/usr/bin/rsync 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_vargas.ksh

    r725 r742  
    7575#D-#================================================== 
    7676 
     77# Submit command 
     78typeset SUBMIT=${SUBMIT:=llsubmit} 
    7779# rsync with path 
    7880typeset -r RSYNC=/usr/local/bin/rsync 
Note: See TracChangeset for help on using the changeset viewer.