Changeset 108 for trunk


Ignore:
Timestamp:
04/17/09 14:27:15 (15 years ago)
Author:
sdipsl
Message:

May be last touch before tag 1.3

  • some cosmetics
  • prepare different rebuild policy
    • from Archive
    • from Workdir
  • for now only "from Archive" is available otherwise inside computing job as before
Location:
trunk/libIGCM
Files:
2 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_additionnal

    r68 r108  
    3232#-Q- aix6 # Nom du travail LoadLeveler 
    3333#-Q- aix6 # @ job_name   = ATL_ADD 
    34 #-Q- aix6 # Fichier de sortie standard du travail        
     34#-Q- aix6 # Fichier de sortie standard du travail    
    3535#-Q- aix6 # @ output     = $(job_name).$(jobid) 
    3636#-Q- aix6 # Fichier de sortie d'erreur du travail 
    … …  
    6161#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6262 
     63#set -eu 
     64#set -vx 
     65 
    6366date 
    6467 
    … …  
    6871######################################################################### 
    6972 
    70 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    71 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     ; #IGCM_debug_Check 
    72 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   ; #IGCM_card_Check 
     73. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     74      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     75. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     76     ( ${DEBUG_debug} ) && IGCM_card_Check 
     77. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     78     ( ${DEBUG_debug} ) && IGCM_date_Check 
     79#------- 
     80. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    7381 
    7482####################################################################### 
    … …  
    7684#set -vx 
    7785 
     86#=========================================== 
    7887R_ATLAS=ATLAS/SE_${YEARS} 
    7988R_OUT_OCE=${R_SAVE}/OCE 

  • trunk/libIGCM/AA_atlas_LMDZ

    r68 r108  
    6161#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6262 
     63#set -eu 
     64#set -vx 
     65 
    6366date 
    6467 
    6568#-Q- sx8brodie export OMP_NUM_THREADS=1 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
    6670 
    6771###################################################################### 
    6872 
    69 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    70 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     ; #IGCM_debug_Check 
    71 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   ; #IGCM_card_Check 
     73. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     74      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     75. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     76     ( ${DEBUG_debug} ) && IGCM_card_Check 
     77. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     78     ( ${DEBUG_debug} ) && IGCM_date_Check 
     79#------- 
     80. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    7281 
    7382###################################################################### 
    7483 
    75 #set -vx  
     84#set -vx 
    7685 
    7786R_ATLAS=ATLAS/SE_${YEARS} 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r95 r108  
    6161#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6262 
     63#set -eu 
    6364#set -vx  
    6465 
    … …  
    6667 
    6768#-Q- sx8brodie export OMP_NUM_THREADS=1 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
    6870 
    6971######################################################################## 
    7072 
    71 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    72 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     ; #IGCM_debug_Check 
    73 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   ; #IGCM_card_Check 
     73. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     74      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     75. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     76     ( ${DEBUG_debug} ) && IGCM_card_Check 
     77. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     78     ( ${DEBUG_debug} ) && IGCM_date_Check 
     79#------- 
     80. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    7481 
    7582######################################################################## 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r68 r108  
    6161#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6262 
     63#set -eu 
     64#set -vx 
     65 
    6366date 
    6467 
    6568#-Q- sx8brodie export OMP_NUM_THREADS=1 
    66  
    67 #set -vx 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
    6870 
    6971#D- Low level debug : to bypass lib test checks and stack construction 
    … …  
    7981######################################################################## 
    8082 
    81 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    82 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     ; #IGCM_debug_Check 
    83 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   ; #IGCM_card_Check 
     83. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     84      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     85. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     86     ( ${DEBUG_debug} ) && IGCM_card_Check 
     87. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     88     ( ${DEBUG_debug} ) && IGCM_date_Check 
     89#------- 
     90. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    8491 
    8592######################################################################## 

  • trunk/libIGCM/AA_create_se

    r87 r108  
    5555#-Q- default ################## 
    5656 
    57 #set -vx 
    58  
    59 date 
    60  
    61 #-Q- sx8brodie export OMP_NUM_THREADS=1 
    62  
    6357# $Date$ 
    6458# $Author$ 
    … …  
    6761#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6862 
     63#set -eu 
     64#set -vx 
     65 
     66date 
     67 
     68#-Q- sx8brodie export OMP_NUM_THREADS=1 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
     70 
    6971######################################################################## 
    7072 
    … …  
    8789#D- Low level debug : to bypass lib test checks and stack construction 
    8890#D- Default : value from AA_job if any 
    89 libIGCM=${libIGCM:=/home/rech/ces/rces452/libIGCM} 
     91libIGCM=${libIGCM:=/path/to/your/libIGCM} 
    9092 
    9193#D- TEMPORARY Flag to determine atmospheric resolution 
    … …  
    107109######################################################################## 
    108110 
    109 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    110 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     #; IGCM_debug_Check 
    111 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   #; IGCM_card_Check 
    112 . ${libIGCM}/libIGCM_date/libIGCM_date.ksh   #; IGCM_date_Check 
     111. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     112      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     113. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     114     ( ${DEBUG_debug} ) && IGCM_card_Check 
     115. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     116     ( ${DEBUG_debug} ) && IGCM_date_Check 
     117#------- 
     118. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    113119 
    114120######################################################################## 

  • trunk/libIGCM/AA_create_ts

    r88 r108  
    5555#-Q- default ################## 
    5656 
    57 #set -vx 
    58  
    59 date 
    60  
    61 #-Q- sx8brodie export OMP_NUM_THREADS=1 
    62  
    6357# $Date$ 
    6458# $Author$ 
    … …  
    6761#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6862 
     63#set -eu 
     64#set -vx 
     65 
     66date 
     67 
     68#-Q- sx8brodie export OMP_NUM_THREADS=1 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
     70 
    6971######################################################################## 
    7072 
    … …  
    8789#D- Low level debug : to bypass lib test checks and stack construction 
    8890#D- Default : value from AA_job if any 
    89 libIGCM=${libIGCM:=/work/cont003/p86denv/PARA_SX8_ORCA2xLMD144142/Prelude/modipsl/libIGCM} 
     91libIGCM=${libIGCM:=/path/to/your/libIGCM} 
    9092 
    9193#D- TEMPORARY Flag to determine atmospheric resolution 
    … …  
    105107RESOL_SRF=${RESOL_SRF:=LMD144142} 
    106108 
    107 ######################################################################## 
    108  
    109 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    110 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     #; IGCM_debug_Check 
    111 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   #; IGCM_card_Check 
    112 . ${libIGCM}/libIGCM_date/libIGCM_date.ksh   #; IGCM_date_Check 
     109#D- Flag to determine allready produced time series. 
     110#D- Default : Commented. Uncomment for StandAlone case if you want to continue a time series 
     111#CompletedFlag= 
     112 
     113######################################################################## 
     114 
     115. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     116      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     117. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     118     ( ${DEBUG_debug} ) && IGCM_card_Check 
     119. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     120     ( ${DEBUG_debug} ) && IGCM_date_Check 
     121#------- 
     122. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    113123 
    114124######################################################################## 
    … …  
    490500        if [ X${file} != X${NULL_STR} ] ; then 
    491501            IGCM_sys_Get /l liste_file[*] ${RUN_DIR_PATH}/${comp} 
     502            ExitFlag=false 
    492503            IGCM_debug_Verif_Exit_Post 
    493504        fi 
    … …  
    659670            # Get selected files 
    660671            IGCM_sys_Get /l liste_file[*] ${RUN_DIR_PATH}/${comp} 
    661             eval ExitFlag=false 
     672            ExitFlag=false 
    662673            IGCM_debug_Verif_Exit_Post 
    663674 
    … …  
    717728                fi 
    718729                # 
    719                 eval ExitFlag=false 
     730                ExitFlag=false 
    720731                IGCM_debug_Verif_Exit_Post 
    721732            done     # for var in ${liste_var} ; do 
    … …  
    723734        done         # for file in ${liste_file_brut} do 
    724735    done             # for comp in ${config_ListOfComponents[*]} ; do 
    725     eval ExitFlag=false 
     736    ExitFlag=false 
    726737    IGCM_debug_Verif_Exit_Post 
    727738    # GO AHEAD IN DEEPEST LOOP 

  • trunk/libIGCM/AA_monitoring

    r107 r108  
    6161#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    6262 
     63#set -eu 
     64#set -vx 
     65 
    6366date 
    6467 
    6568#-Q- sx8brodie export OMP_NUM_THREADS=1 
     69#-Q- aix6 export OMP_NUM_THREADS=1 
    6670 
    6771###################################################################### 
    6872 
    69 . ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh ; 
    70 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh     ; #IGCM_debug_Check 
    71 . ${libIGCM}/libIGCM_card/libIGCM_card.ksh   ; #IGCM_card_Check 
     73. ${libIGCM}/libIGCM_debug/libIGCM_debug.ksh 
     74      ( ${DEBUG_debug} ) && IGCM_debug_Check 
     75. ${libIGCM}/libIGCM_card/libIGCM_card.ksh 
     76     ( ${DEBUG_debug} ) && IGCM_card_Check 
     77. ${libIGCM}/libIGCM_date/libIGCM_date.ksh 
     78     ( ${DEBUG_debug} ) && IGCM_date_Check 
     79#------- 
     80. ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh 
    7281 
    7382###################################################################### 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r98 r108  
    134134        IGCM_debug_Print 3 "${option} : ${auxprint}" 
    135135    done 
     136 
     137    IGCM_debug_Print 1 "For now force RebuildFromArchive=true in libIGM_config" 
     138    config_Post_RebuildFromArchive=true 
     139    IGCM_debug_Print 3 "RebuildFromArchive : true" 
    136140 
    137141    #================================================================# 

  • trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

    r103 r108  
    2222#D-#================================================================== 
    2323#D-libIGCM_date 
    24 #D-This ksh library handles date calculs and convertions in different calendars.  
     24#D-This ksh library handles date calculs and convertions in different calendars. 
    2525#D-  types of calendars are possible : 
    2626#D- 

  • trunk/libIGCM/libIGCM_debug/libIGCM_debug.ksh

    r98 r108  
    180180    echo "IGCM_debug_Exit : " "${@}" 
    181181    IGCM_debug_CallStack 
    182     eval ExitFlag=true 
     182    ExitFlag=true 
    183183    IGCM_debug_PopStack "IGCM_debug_Exit" 
    184184} 

  • trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

    r105 r108  
    518518        IGCM_sys_MkdirWork ${POST_DIR} 
    519519        IGCM_debug_Verif_Exit 
    520         IGCM_sys_QsubPost rebuild 
     520        IGCM_sys_QsubPost rebuild_fromArchive 
    521521EOF 
     522 
    522523        else  
    523524        # 
    524525        IGCM_debug_Print 2 "REBUILD POST-TREATMENT FROM WORKDIR :" 
    525         echo 
    526         # 
    527         typeset listVarEnv 
    528         listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,RebuildFromArchive,POST_DIR,MASTER,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_SRF" 
    529         export DEBUG_debug=${DEBUG_debug} 
    530         export MODIPSL=${MODIPSL} 
    531         export libIGCM_SX=${libIGCM} 
    532         export libIGCM=${libIGCM} 
    533         export SUBMIT_DIR=${SUBMIT_DIR} 
    534         export RebuildFromArchive=${config_Post_RebuildFromArchive} 
    535         export REBUILD_DIR=${REBUILD_DIR} 
    536         export POST_DIR=${libIGCM} 
    537         export DateBegin=${DateBegin} 
    538         export PeriodDateBegin=${PeriodDateBegin} 
    539         export PeriodDateEnd=${PeriodDateEnd} 
    540         export NbRebuildDir=${NbRebuildDir} 
    541         export StandAlone=false 
    542         export RESOL_ATM=${RESOL_ATM} 
    543         export RESOL_OCE=${RESOL_OCE} 
    544         export RESOL_ICE=${RESOL_ICE} 
    545         export RESOL_SRF=${RESOL_SRF} 
    546         export listVarEnv=${listVarEnv} 
    547         IGCM_sys_Qsub rebuildtmp.job ${libIGCM} 
     526        echo 
     527        IGCM_debug_Print 2 "NOT FULLY SUPPORTED" 
     528        IGCM_debug_Print 2 "EXIT NOW TO AVOID BIG PROBLEM" 
     529        IGCM_debug_Print 2 "Contact libIGCM developpers" 
     530        # 
     531        IGCM_debug_Exit "FATAL ERROR IN REBUILD CONFIGURATION" 
     532        IGCM_debug_Verif_Exit  
     533        # 
     534 
     535#        typeset listVarEnv 
     536#        listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,RebuildFromArchive,POST_DIR,MASTER,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_SRF" 
     537#        export DEBUG_debug=${DEBUG_debug} 
     538#        export MODIPSL=${MODIPSL} 
     539#        export libIGCM_SX=${libIGCM} 
     540#        export libIGCM=${libIGCM} 
     541#        export SUBMIT_DIR=${SUBMIT_DIR} 
     542#        export RebuildFromArchive=${config_Post_RebuildFromArchive} 
     543#        export REBUILD_DIR=${REBUILD_DIR} 
     544#        export POST_DIR=${libIGCM} 
     545#        export DateBegin=${DateBegin} 
     546#        export PeriodDateBegin=${PeriodDateBegin} 
     547#        export PeriodDateEnd=${PeriodDateEnd} 
     548#        export NbRebuildDir=${NbRebuildDir} 
     549#        export StandAlone=false 
     550#        export RESOL_ATM=${RESOL_ATM} 
     551#        export RESOL_OCE=${RESOL_OCE} 
     552#        export RESOL_ICE=${RESOL_ICE} 
     553#        export RESOL_SRF=${RESOL_SRF} 
     554#        export listVarEnv=${listVarEnv} 
     555#        IGCM_sys_Qsub rebuild_fromWorkdir ${libIGCM} 
     556 
    548557        fi 
    549558    fi 
Note: See TracChangeset for help on using the changeset viewer.