Changeset 1475 for trunk


Ignore:
Timestamp:
12/04/18 14:42:38 (5 years ago)
Author:
flavoni
Message:

mv clean.month in clean.PeriodLength? script in ensemble, and use CCCWORKDIR in ins_job -e

Location:
trunk/libIGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libIGCM/ins_job

    r1473 r1475  
    454454  #.. Read input data from ensemble.card .. 
    455455  SUBMIT_DIR=${SUBMIT_DIR_ENS} 
    456   RUN_DIR="${WORKDIR}/ENSEMBLE_TMP" 
     456  RUN_DIR="${CCCWORKDIR}/ENSEMBLE_TMP" 
    457457  # 
    458458  # Copy initial things around and define variables (hindcast/forecast case) 
  • trunk/libIGCM/libIGCM_ensemble/ENSEMBLE_DOC.txt

    r1059 r1475  
    1010   Fix minor bug: periodic member names start to 0 as for non-periodic 
    1111 
    12    Create new files "Qclean.month.ENSNAME.sh" and "Qclean.year.ENSNAME.sh" which allow  
    13    user to use clean_month and clean_year scripts for all members. 
     12   Create new file "Qclean.PeriodLength.ENSNAME.sh" which allow  
     13   user to use clean_PeriodLength.job scripts for all members. 
    1414    
    1515   New option "INITFROM_NONPERIODIC" is avalaible in ensemble.card to use different  
     
    1717    
    18182) Updates of Ensemble PERTURB: 
    19    Create new files "Qclean.month.ENSNAME.sh" and "Qclean.year.ENSNAME.sh" which allow  
    20    user to use clean_month and clean_year scripts for all members. 
     19   Create new file "Qclean.PeriodLength.ENSNAME.sh" which allow  
     20   user to use clean_PeriodLength scripts for all members. 
    2121    
    22223) Updates for ins_job: 
     
    9191containing all command to submit all jobs (PeriodNb=60 for all simulations). 
    9292 
    93 The Qclean.month/year.xxx.sh are bash files to use clean_month or clean_year script for 
     93The Qclean.PeriodLength.xxx.sh is bash file to use clean_PeriodLength script for 
    9494all simulations. 
    9595 
  • trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

    r1394 r1475  
    11#!/bin/ksh 
     2#set -vx 
    23 
    34#************************************************************** 
     
    451452        echo "${SUBMIT} ${JobName} ; cd -"       >> ${RUN_DIR}/Qsub.${StartDir}.sh 
    452453 
    453         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    454         echo "${libIGCM}/clean_month.job ; cd -" >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    455  
    456         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
    457         echo "${libIGCM}/clean_year.job ; cd -"  >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
     454        echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
     455        echo "${libIGCM}/clean_PeriodLength.job ; cd -"  >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
    458456 
    459457        # * Update files : config.card, Job_, COMP/comp.card 
     
    469467    # Done. Save ${StartDir} submission text file 
    470468    IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.sh ${SUBMIT_DIR} 
    471     IGCM_sys_Cp ${RUN_DIR}/Qclean.month.${StartDir}.sh ${SUBMIT_DIR} 
    472     IGCM_sys_Cp ${RUN_DIR}/Qclean.year.${StartDir}.sh ${SUBMIT_DIR} 
     469    IGCM_sys_Cp ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh ${SUBMIT_DIR} 
    473470 
    474471  # - Next DateBegin 
     
    573570        echo "${SUBMIT} ${JobName} ; cd -"       >> Qsub.${StartDir}.sh 
    574571 
    575         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    576         echo "${libIGCM}/clean_month.job ; cd -" >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    577  
    578         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
    579         echo "${libIGCM}/clean_year.job ; cd -"  >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
     572        echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
     573        echo "${libIGCM}/clean_PeriodLength.job ; cd -"  >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
    580574 
    581575        # * Update files : config.card, Job_, COMP/comp.card 
     
    596590    # Done. Save ${StartDir} submission text file 
    597591    IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.sh ${SUBMIT_DIR} 
    598     IGCM_sys_Cp ${RUN_DIR}/Qclean.month.${StartDir}.sh ${SUBMIT_DIR} 
    599     IGCM_sys_Cp ${RUN_DIR}/Qclean.year.${StartDir}.sh ${SUBMIT_DIR} 
     592    IGCM_sys_Cp ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh ${SUBMIT_DIR} 
    600593 
    601594    (( DateNum = DateNum + 1 )) 
     
    681674      echo "${SUBMIT} ${JobName} ; cd -"        >> ${RUN_DIR}/Qsub.${StartDir}.sh 
    682675 
    683       echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    684       echo "${libIGCM}/clean_month.job ; cd -"  >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    685  
    686       echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
    687       echo "${libIGCM}/clean_year.job ; cd -"   >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
     676      echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
     677      echo "${libIGCM}/clean_PeriodLength.job ; cd -"   >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
    688678 
    689679      # * Update files : config.card, Job_, COMP/comp.card 
     
    699689  # Done. Save ${StartDir} submission text file 
    700690  IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.sh ${SUBMIT_DIR} 
    701   IGCM_sys_Cp ${RUN_DIR}/Qclean.month.${StartDir}.sh ${SUBMIT_DIR} 
    702   IGCM_sys_Cp ${RUN_DIR}/Qclean.year.${StartDir}.sh ${SUBMIT_DIR} 
     691  IGCM_sys_Cp ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh ${SUBMIT_DIR} 
    703692 
    704693  IGCM_debug_PopStack "IGCM_ensemble_CastMemberList" 
     
    733722    IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} RestartPath ${ensemble_Ens_PERTURB_INITPATH} 
    734723  done 
     724  # Adhoc exception for CMIP6 : exclude XIOS from the restart overrule mechanism. 
     725  if ( [ X${comp} = XIOS ] && [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ) ; then 
     726      IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card ${comp} Restart "n" 
     727  fi 
    735728 
    736729  # ==> Job 
    737730  sed -e "s/\(#.*Script_Output_\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir}\2/" \ 
    738731      -e "s/\(#.*\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir} \2/"            \ 
    739       -e "s/^PeriodNb=.*/PeriodNb=60/"                                                   \ 
     732      -e "s/^PeriodNb=.*/PeriodNb=5/"                                                   \ 
    740733      ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} > Job_${MemberDir}.tmp 
    741734  IGCM_sys_Mv Job_${MemberDir}.tmp ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} 
     
    12671260        echo "${SUBMIT} ${JobName} ; cd -"       >> ${RUN_DIR}/Qsub.${StartDir}.sh 
    12681261 
    1269         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    1270         echo "${libIGCM}/clean_month.job ; cd -" >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    1271  
    1272         echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
    1273         echo "${libIGCM}/clean_year.job ; cd -"  >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
     1262        echo "cd ${StartDir}/${MemberDir}/ ;"    >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
     1263        echo "${libIGCM}/clean_PeriodLength.job ; cd -"  >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
    12741264 
    12751265        # * Update files : config.card, Job_, COMP/comp.card 
     
    12941284  # Done. Save ${StartDir} submission text file 
    12951285  IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.sh ${SUBMIT_DIR} 
    1296   IGCM_sys_Cp ${RUN_DIR}/Qclean.month.${StartDir}.sh ${SUBMIT_DIR} 
    1297   IGCM_sys_Cp ${RUN_DIR}/Qclean.year.${StartDir}.sh ${SUBMIT_DIR} 
     1286  IGCM_sys_Cp ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh ${SUBMIT_DIR} 
    12981287 
    12991288  IGCM_debug_PopStack "IGCM_ensemble_DatePeriodicStarts" 
     
    13721361        echo "${SUBMIT} ${JobName} ; cd -"        >> ${RUN_DIR}/Qsub.${StartDir}.sh 
    13731362 
    1374         echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    1375         echo "${libIGCM}/clean_month.job ; cd -"  >> ${RUN_DIR}/Qclean.month.${StartDir}.sh 
    1376  
    1377         echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
    1378         echo "${libIGCM}/clean_year.job ; cd -"   >> ${RUN_DIR}/Qclean.year.${StartDir}.sh 
     1363        echo "cd ${StartDir}/${MemberDir}/ ;"     >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
     1364        echo "${libIGCM}/clean_PeriodLength.job ; cd -"   >> ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh 
    13791365 
    13801366        # * Update files : config.card, Job_, COMP/comp.card 
     
    13871373    # Done. Save ${StartDir} submission text file 
    13881374    IGCM_sys_Cp ${RUN_DIR}/Qsub.${StartDir}.sh ${SUBMIT_DIR} 
    1389     IGCM_sys_Cp ${RUN_DIR}/Qclean.month.${StartDir}.sh ${SUBMIT_DIR} 
    1390     IGCM_sys_Cp ${RUN_DIR}/Qclean.year.${StartDir}.sh ${SUBMIT_DIR} 
     1375    IGCM_sys_Cp ${RUN_DIR}/Qclean.PeriodLength.${StartDir}.sh ${SUBMIT_DIR} 
    13911376 
    13921377    (( DateNum = DateNum + 1 )) 
     
    14511436  sed -e "s/\(#.*Script_Output_\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir}\2/" \ 
    14521437      -e "s/\(#.*\)${config_UserChoices_JobName}\(\.*\)/\1${MemberDir} \2/"            \ 
    1453       -e "s/^PeriodNb=.*/PeriodNb=60/"                                                   \ 
     1438      -e "s/^PeriodNb=.*/PeriodNb=5/"                                                   \ 
    14541439      ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} > Job_${MemberDir}.tmp 
    14551440  IGCM_sys_Mv Job_${MemberDir}.tmp ${SUBMIT_DIR}/${StartDir}/${MemberDir}/Job_${MemberDir} 
Note: See TracChangeset for help on using the changeset viewer.