Changeset 1025 for tags


Ignore:
Timestamp:
07/24/14 09:41:56 (10 years ago)
Author:
sdipsl
Message:

merge trunk and tag to fix #195 and taking other minor things

Location:
tags/libIGCM_v2.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • tags/libIGCM_v2.3/AA_monitoring

    r982 r1025  
    186186  if [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/monitoring01_${compname}.cfg ]] ; then 
    187187    PATH_monitoring_file=${CARD_DIR}/POST/monitoring01_${compname}.cfg 
     188  elif [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/${monitoring_file} ]] ; then 
     189    PATH_monitoring_file=${CARD_DIR}/POST/${monitoring_file} 
    188190  elif [ -f ${FER_ATLAS}/${monitoring_file} ] ; then 
    189191    PATH_monitoring_file=${FER_ATLAS}/${monitoring_file} 

  • tags/libIGCM_v2.3/libIGCM_check/libIGCM_check.ksh

    • Property svn:keywords set to Date Author Rev
    r961 r1025  
    22 
    33#************************************************************** 
    4 # Author: Sebastien Denvil, Martial Mancip 
    5 # Contact: Sebastien.Denvil__at__ipsl.jussieu.fr Martial.Mancip__at__ipsl.jussieu.fr 
    6 # $Revision:: 939                                      $ Revision of last commit 
    7 # $Author:: sdipsl                                     $ Author of last commit 
    8 # $Date:: 2013-08-23 11:38:24 +0200 (Fri, 23 Aug 2013) $ Date of last commit 
     4# Author: Sonia Labetoulle, Sébastien Denvil 
     5# Contact: Sonia.Labetoulle__at__ipsl.jussieu.fr Sebastien.Denvil_at__ipsl.jussieu.fr 
     6# $Revision::                                          $ Revision of last commit 
     7# $Author::                                            $ Author of last commit 
     8# $Date::                                             $ Date of last commit 
    99# IPSL (2006) 
    1010#  This software is governed by the CeCILL licence see libIGCM/libIGCM_CeCILL.LIC 
    … …  
    1212#************************************************************** 
    1313 
    14 #=================================== 
     14#D-#================================================== 
     15#D-function IGCM_check_CommonDef 
     16#D-* Purpose: 
     17#D-* Examples: 
     18#D- 
    1519function IGCM_check_CommonDef 
    1620{ 
    17  
    1821  IGCM_debug_PushStack "IGCM_check_CommonDef" $@ 
    1922 
    … …  
    6063  set -A JobType_list "${RebuildJob}" "pack_output" "pack_restart" "pack_debug" 
    6164 
    62   for JobType in ${JobType_list[*]} ; do  
     65  for JobType in ${JobType_list[*]} ; do 
    6366    typeset    name1="${JobType}_String" 
    6467    typeset    name2="${JobType}_Field" 
    … …  
    8487 
    8588  IGCM_debug_PopStack "IGCM_check_CommonDef" 
    86  
    87 } 
    88  
    89 #=================================== 
     89} 
     90 
     91#D-#================================================== 
     92#D-function IGCM_check_ChangeUsr 
     93#D-* Purpose: 
     94#D-* Examples: 
     95#D- 
    9096function IGCM_check_ChangeUsr 
    9197{ 
    92  
    9398  IGCM_debug_PushStack "IGCM_check_ChangeUsr" $@ 
    9499 
    … …  
    100105 
    101106  IGCM_debug_PopStack "IGCM_check_ChangeUsr" 
    102  
    103 } 
    104  
    105  
    106  
    107 #=================================== 
     107} 
     108 
     109#D-#================================================== 
     110#D-function IGCM_check_SearchCatalog 
     111#D-* Purpose: 
     112#D-* Examples: 
     113#D- 
    108114function IGCM_check_SearchCatalog 
    109115{ 
    110  
    111116  IGCM_debug_PushStack "IGCM_check_SearchCatalog" $@ 
    112117 
    … …  
    213218 
    214219  IGCM_debug_PopStack "IGCM_check_SearchCatalog" 
    215  
    216 } 
    217  
    218 #=================================== 
     220} 
     221 
     222#D-#================================================== 
     223#D-function IGCM_check_PrintHeader 
     224#D-* Purpose: 
     225#D-* Examples: 
     226#D- 
    219227function IGCM_check_PrintHeader 
    220228{ 
    221  
    222229  IGCM_debug_PushStack "IGCM_check_PrintHeader" $@ 
    223230 
    … …  
    280287 
    281288  IGCM_debug_PopStack "IGCM_check_PrintHeader" 
    282  
    283 } 
    284  
    285 #=================================== 
     289} 
     290 
     291#D-#================================================== 
     292#D-function IGCM_check_PrintJob 
     293#D-* Purpose: 
     294#D-* Examples: 
     295#D- 
    286296function IGCM_check_PrintJob 
    287297{ 
    288  
    289298  IGCM_debug_PushStack "IGCM_check_PrintJob" $@ 
    290299 
    … …  
    293302  # Print rebuild and pack jobs 
    294303  # --------------------------- 
    295   for JobType in ${JobType_list[*]} ; do  
     304  for JobType in ${JobType_list[*]} ; do 
    296305    eval Date=\${${JobType}_Date[${ind}]} 
    297306    eval Status=\${${JobType}_Status[${ind}]} 
    … …  
    327336 
    328337  IGCM_debug_PopStack "IGCM_check_PrintJob" 
    329  
    330 } 
    331  
    332 #=================================== 
     338} 
     339 
     340#D-#================================================== 
     341#D-function IGCM_check_PrintFooter 
     342#D-* Purpose: 
     343#D-* Examples: 
     344#D- 
    333345function IGCM_check_PrintFooter 
    334346{ 
    335  
    336347  IGCM_debug_PushStack "IGCM_check_PrintFooter" $@ 
    337348 
    … …  
    340351 
    341352  IGCM_debug_PopStack "IGCM_check_PrintFooter" 
    342  
    343 } 
    344  
    345 #=================================== 
     353} 
     354 
     355#D-#================================================== 
     356#D-function IGCM_check_CheckPendingRebuild 
     357#D-* Purpose: 
     358#D-* Examples: 
     359#D- 
    346360function IGCM_check_CheckPendingRebuild 
    347361{ 
    348  
    349362  IGCM_debug_PushStack "IGCM_check_PendingRebuild" $@ 
    350363 
    … …  
    364377 
    365378  IGCM_debug_PopStack "IGCM_check_PendingRebuild" 
    366  
    367 } 
    368  
    369 #=================================== 
     379} 
     380 
     381#D-#================================================== 
     382#D-function IGCM_check_CheckRebPackJobs 
     383#D-* Purpose: 
     384#D-* Examples: 
     385#D- 
    370386function IGCM_check_CheckRebPackJobs 
    371387{ 
    372  
    373388  IGCM_debug_PushStack "IGCM_check_CheckRebPackJobs" $@ 
    374389 
    … …  
    432447 
    433448  IGCM_debug_PopStack "IGCM_check_CheckRebPackJobs" 
    434  
    435 } 
    436  
    437 #=================================== 
     449} 
     450 
     451#D-#================================================== 
     452#D-function IGCM_check_CheckMonitoring 
     453#D-* Purpose: 
     454#D-* Examples: 
     455#D- 
    438456function IGCM_check_CheckMonitoring 
    439457{ 
    440  
    441458  IGCM_debug_PushStack "IGCM_check_CheckMonitoring" $@ 
    442459 
    … …  
    452469 
    453470  IGCM_debug_PopStack "IGCM_check_CheckMonitoring" 
    454  
    455 } 
    456  
    457 #=================================== 
     471} 
     472 
     473#D-#================================================== 
     474#D-function IGCM_check_CheckAtlas 
     475#D-* Purpose: 
     476#D-* Examples: 
     477#D- 
    458478function IGCM_check_CheckAtlas 
    459479{ 
    460  
    461480  IGCM_debug_PushStack "IGCM_check_CheckAtlas" $@ 
    462481 
    … …  
    479498 
    480499  IGCM_debug_PopStack "IGCM_check_CheckAtlas" 
    481  
    482 } 
    483  
    484 #=================================== 
     500} 

  • tags/libIGCM_v2.3/libIGCM_comp/libIGCM_comp.ksh

    r1017 r1025  
    9898 
    9999    # Define BUFFERED Dirs 
    100     if [ ! ${config_Post_PackFrequency} = NONE ] ; then 
     100    if ( [ ! ${config_Post_PackFrequency} = NONE ] || [ X${config_UserChoices_SpaceName} = XTEST ] ) ; then 
    101101      eval R_BUF_${comp}=${R_BUFR}/${comp} 
    102102      eval IGCM_sys_Mkdir \${R_BUF_${comp}} 
Note: See TracChangeset for help on using the changeset viewer.