Changeset 263 for trunk/libIGCM


Ignore:
Timestamp:
04/19/10 14:27:48 (14 years ago)
Author:
mafoipsl
Message:

Adapt libIGCM and jobs to new output Names : ${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName?} if SpaceName? and ExperimentName? are set into config.card. Still working with old types : ${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}.
More information here : IPSLCM5A?
Add IPSLCM5A into atlas.

Location:
trunk/libIGCM
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_atlas_LMDZ

    r257 r263  
    2222#-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2323#-Q- sx8brodie # @ notification = error 
    24 #-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     24#-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    2525#-Q- sx8brodie # @ queue 
    2626#-Q- aix6 #!/bin/ksh 
    … …  
    3838#-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    3939#-Q- aix6 # @ notification = error 
    40 #-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     40#-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    4141#-Q- aix6 # @ queue 
    4242#-Q- sx8mercure #!/bin/ksh 
    … …  
    106106#set -vx 
    107107 
     108IGCM_sys_MkdirWork ${RUN_DIR_PATH} 
     109IGCM_sys_Cd ${RUN_DIR_PATH} 
     110 
     111if [ ${StandAlone} = true ] ; then 
     112    CARD_DIR=${SUBMIT_DIR} 
     113else 
     114    CARD_DIR=${RUN_DIR_PATH}/$( basename ${SUBMIT_DIR} ) 
     115    IGCM_sys_Get_Master ${SUBMIT_DIR} ${RUN_DIR_PATH} 
     116fi 
     117# 
     118# First of all 
     119# 
     120IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card UserChoices 
     121typeset option 
     122for option in ${config_UserChoices[*]} ; do 
     123    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
     124done 
     125 
     126# 
     127echo 
     128IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
     129IGCM_debug_PrintVariables 3 config_UserChoices_JobName 
     130IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
     131IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     132IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     133IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
     134IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
     135IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
     136IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
     137IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     138echo 
     139 
     140#================================== 
     141#R_SAVE : Job output directory 
     142if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     143    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     144    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     145    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     146else 
     147    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     148    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     149fi 
     150# 
     151 
    108152R_ATLAS=ATLAS/SE_${YEARS} 
    109153R_OUT_ATM=${R_SAVE}/ATM 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r257 r263  
    2222#-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2323#-Q- sx8brodie # @ notification = error 
    24 #-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     24#-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    2525#-Q- sx8brodie # @ queue 
    2626#-Q- aix6 #!/bin/ksh 
    … …  
    3838#-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    3939#-Q- aix6 # @ notification = error 
    40 #-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     40#-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    4141#-Q- aix6 # @ queue 
    4242#-Q- sx8mercure #!/bin/ksh 
    … …  
    106106#set -vx  
    107107 
     108IGCM_sys_MkdirWork ${RUN_DIR_PATH} 
     109IGCM_sys_Cd ${RUN_DIR_PATH} 
     110 
     111if [ ${StandAlone} = true ] ; then 
     112    CARD_DIR=${SUBMIT_DIR} 
     113else 
     114    CARD_DIR=${RUN_DIR_PATH}/$( basename ${SUBMIT_DIR} ) 
     115    IGCM_sys_Get_Master ${SUBMIT_DIR} ${RUN_DIR_PATH} 
     116fi 
     117# 
     118# First of all 
     119# 
     120IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card UserChoices 
     121typeset option 
     122for option in ${config_UserChoices[*]} ; do 
     123    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
     124done 
     125# 
     126echo 
     127IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
     128IGCM_debug_PrintVariables 3 config_UserChoices_JobName 
     129IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
     130IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     131IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     132IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
     133IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
     134IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
     135IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
     136IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     137echo 
     138 
     139#================================== 
     140#R_SAVE : Job output directory 
     141if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     142    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     143    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     144    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     145else 
     146    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     147    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     148fi 
     149# 
     150 
    108151R_ATLAS=ATLAS/SE_${YEARS} 
    109152R_OUT_OCE=${R_SAVE}/OCE 
    … …  
    161204 
    162205# WHILE WAITING FOR A MORE GENERIC SOLUTION 
    163 if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2_PISCES" ] ) ; then 
     206if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "IPSLCM5A" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2_PISCES" ] ) ; then 
    164207    IGCM_sys_Get ${R_OUT_OCE}/Analyse/SE/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc  ${RUN_DIR} ; 
    165208    atlas -o ${RUN_DIR}/${R_ATLAS}/ZNL   -d -l ${FER_ATLAS}/atlas_l_${RESOL_OCE}_znl.cfg         ${RUN_DIR}/${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ; 
    … …  
    180223IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_icemod.nc       
    181224# WHILE WAITING FOR A MORE GENERIC SOLUTION 
    182 if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2_PISCES" ] ) ; then 
     225if ( [ ${config_UserChoices_TagName} = "IPSLCM5" ] || [ ${config_UserChoices_TagName} = "IPSLCM5A" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2" ] || [ ${config_UserChoices_TagName} = "ORCA2_LIM2_PISCES" ] ) ; then 
    183226    IGCM_sys_Rm ${config_UserChoices_JobName}_SE_${YEARS}_1M_diaptr.nc ;  
    184227fi 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r257 r263  
    2222#-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2323#-Q- sx8brodie # @ notification = error 
    24 #-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     24#-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    2525#-Q- sx8brodie # @ queue 
    2626#-Q- aix6 #!/bin/ksh 
    … …  
    3838#-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    3939#-Q- aix6 # @ notification = error 
    40 #-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     40#-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    4141#-Q- aix6 # @ queue 
    4242#-Q- sx8mercure #!/bin/ksh 
    … …  
    9191#-Q- aix6 export OMP_NUM_THREADS=1 
    9292 
    93 #D- Low level debug : to bypass lib test checks and stack construction 
    94 #D- Default : value from AA_job if any 
    95 DEBUG_debug=${DEBUG_debug:=false} 
    96  
    97 if [ ${DEBUG_debug} = true ] ; then 
    98     echo $RUN_DIR_PATH 
    99     MYWORK=$(echo $HOME | sed -e "s|home|scratchdir|") 
    100     RUN_DIR_PATH=${MYWORK}/IGCM_OUT/${config_UserChoices_TagName}/${config_UserChoices_JobName}/MO2SE.${an_fin} 
    101 fi 
    102  
    10393######################################################################## 
    10494 
    … …  
    115105 
    116106#set -vx  
     107 
     108IGCM_sys_MkdirWork ${RUN_DIR_PATH} 
     109IGCM_sys_Cd ${RUN_DIR_PATH} 
     110 
     111if [ ${StandAlone} = true ] ; then 
     112    CARD_DIR=${SUBMIT_DIR} 
     113else 
     114    CARD_DIR=${RUN_DIR_PATH}/$( basename ${SUBMIT_DIR} ) 
     115    IGCM_sys_Get_Master ${SUBMIT_DIR} ${RUN_DIR_PATH} 
     116fi 
     117# 
     118# First of all 
     119# 
     120IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card UserChoices 
     121typeset option 
     122for option in ${config_UserChoices[*]} ; do 
     123    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
     124done 
     125# 
     126echo 
     127IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
     128IGCM_debug_PrintVariables 3 config_UserChoices_JobName 
     129IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
     130IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     131IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     132IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
     133IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
     134IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
     135IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
     136IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     137echo 
     138 
     139#================================== 
     140#R_SAVE : Job output directory 
     141if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     142    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     143    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     144    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     145else 
     146    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     147    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     148fi 
     149# 
    117150 
    118151R_ATLAS=ATLAS/SE_${YEARS} 

  • trunk/libIGCM/AA_atlas_PISCES

    r257 r263  
    2222#-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    2323#-Q- sx8brodie # @ notification = error 
    24 #-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     24#-Q- sx8brodie # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    2525#-Q- sx8brodie # @ queue 
    2626#-Q- aix6 #!/bin/ksh 
    … …  
    3838#-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.) 
    3939#-Q- aix6 # @ notification = error 
    40 #-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER 
     40#-Q- aix6 # @ environment  = $POST_DIR ; $SUBMIT_DIR ; $libIGCM ; $R_INIT ; $R_BC ; $StandAlone ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $R_SAVE ; $config_UserChoices_JobName ; $config_UserChoices_TagName ; $YEARS ; $MASTER ; $libIGCM_SX 
    4141#-Q- aix6 # @ queue 
    4242#-Q- sx8mercure #!/bin/ksh 
    … …  
    9494#set -vx  
    9595 
     96IGCM_sys_MkdirWork ${RUN_DIR_PATH} 
     97IGCM_sys_Cd ${RUN_DIR_PATH} 
     98 
     99if [ ${StandAlone} = true ] ; then 
     100    CARD_DIR=${SUBMIT_DIR} 
     101else 
     102    CARD_DIR=${RUN_DIR_PATH}/$( basename ${SUBMIT_DIR} ) 
     103    IGCM_sys_Get_Master ${SUBMIT_DIR} ${RUN_DIR_PATH} 
     104fi 
     105# 
     106# First of all 
     107# 
     108IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card UserChoices 
     109typeset option 
     110for option in ${config_UserChoices[*]} ; do 
     111    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
     112done 
     113 
     114# 
     115echo 
     116IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
     117IGCM_debug_PrintVariables 3 config_UserChoices_JobName 
     118IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
     119IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     120IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     121IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
     122IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
     123IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
     124IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
     125IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     126echo 
     127 
     128#================================== 
     129#R_SAVE : Job output directory 
     130if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     131    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     132    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     133    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     134else 
     135    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     136    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     137fi 
     138# 
     139 
    96140R_ATLAS=ATLAS/SE_${YEARS} 
    97141R_OUT_MBG=${R_SAVE}/MBG 

  • trunk/libIGCM/AA_create_se

    r257 r263  
    186186IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
    187187IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     188IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     189IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
    188190IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
    189191IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
    … …  
    193195 
    194196#================================== 
    195  
    196 R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     197#R_SAVE : Job output directory 
     198if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     199    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     200    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     201    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     202else 
     203    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     204    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     205fi 
    197206# 
    198207IGCM_card_DefineArrayFromSection   ${CARD_DIR}/config.card ListOfComponents 
    … …  
    559568    IGCM_sys_QsubPost additionnal        ; 
    560569    # 
    561 elif [ ${config_UserChoices_TagName} = "IPSLCM5" ] ; then 
     570elif [ ${config_UserChoices_TagName} = "IPSLCM5" ]  || \ 
     571     [ ${config_UserChoices_TagName} = "IPSLCM5A" ] ; then 
    562572    IGCM_sys_QsubPost atlas_ORCHIDEE     ; 
    563573    IGCM_sys_QsubPost atlas_LMDZ         ; 

  • trunk/libIGCM/AA_create_ts

    r257 r263  
    204204IGCM_debug_PrintVariables 3 config_UserChoices_LongName 
    205205IGCM_debug_PrintVariables 3 config_UserChoices_TagName 
     206IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName 
     207IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName 
    206208IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType 
    207209IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin 
    … …  
    211213 
    212214#================================== 
    213 R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     215#R_SAVE : Job output directory 
     216if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     217    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     218    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     219    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     220else 
     221    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     222    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     223fi 
    214224# 
    215225# Determine component to take care of depending on kind of task create_ts will perform 

  • trunk/libIGCM/AA_monitoring

    r257 r263  
    128128IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card ListOfComponents 
    129129 
    130 # 
    131 R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    132  
     130#================================== 
     131#R_SAVE : Job output directory 
     132if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     133    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     134    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     135    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     136else 
     137    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     138    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     139fi 
    133140# 
    134141IGCM_sys_TestDirArchive ${R_SAVE}/MONITORING 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r230 r263  
    161161    #==================================================== 
    162162    #R_SAVE : Job output directory 
    163     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     163    if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
     164        FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     165        R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     166        R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     167    else 
     168        R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     169        R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     170    fi 
     171    echo MAF $R_SAVE $R_DODS 
    164172 
    165173    if [ ! -f ${SUBMIT_DIR}/run.card ]; then  

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

    r228 r263  
    11251125        # 
    11261126        cd ${R_SAVE} 
    1127         dods_rm public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1} > /dev/null 2>&1 
    1128         #/bin/chmod -R u+w  ${R_SAVE}/${1} 
    1129         dods_cp ${1} public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName} > /dev/null 2>&1 
    1130         #/bin/chmod -R +rX ${R_SAVE}/${1} 
    1131         #/bin/chmod -R a+rX /dmnfs/cont003/dods/public/${LOGIN}/${config_UserChoices_TagName} 
    1132         #RET=$? 
     1127        dods_rm public/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1 
     1128        dods_cp ${1} public/${LOGIN}/${R_DODS} > /dev/null 2>&1 
    11331129        RET=0 
    11341130         

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

    r261 r263  
    942942        # 
    943943        cd ${R_SAVE} 
    944         dods_rm public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1} > /dev/null 2>&1 
    945         #/bin/chmod -R u+w  ${R_SAVE}/${1} 
    946         dods_cp ${1} public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName} > /dev/null 2>&1 
    947         #/bin/chmod -R +rX ${R_SAVE}/${1} 
    948         #/bin/chmod -R a+rX /dmnfs/cont003/dods/public/${LOGIN}/${config_UserChoices_TagName} 
    949         #RET=$? 
     944        dods_rm public/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1 
     945        dods_cp ${1} public/${LOGIN}/${R_DODS} > /dev/null 2>&1 
    950946        RET=0 
    951947         

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercureTX.ksh

    r228 r263  
    947947        # 
    948948        cd ${R_SAVE} 
    949         dods_rm public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1} > /dev/null 2>&1 
    950         #/bin/chmod -R u+w  ${R_SAVE}/${1} 
    951         dods_cp ${1} public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName} > /dev/null 2>&1 
    952         #/bin/chmod -R +rX ${R_SAVE}/${1} 
    953         #/bin/chmod -R a+rX /dmnfs/cont003/dods/public/${LOGIN}/${config_UserChoices_TagName} 
    954         #RET=$? 
     949        dods_rm public/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1 
     950        dods_cp ${1} public/${LOGIN}/${R_DODS} > /dev/null 2>&1 
    955951        RET=0 
    956952         

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh

    r226 r263  
    10721072        # 
    10731073        cd ${R_SAVE} 
    1074         dods_rm public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1} > /dev/null 2>&1 
    1075         #/bin/chmod -R u+w  ${R_SAVE}/${1} 
    1076         dods_cp ${1} public/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName} > /dev/null 2>&1 
    1077         #/bin/chmod -R +rX ${R_SAVE}/${1} 
    1078         #/bin/chmod -R a+rX /dmnfs/cont003/dods/public/${LOGIN}/${config_UserChoices_TagName} 
    1079         #RET=$? 
     1074        dods_rm public/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1 
     1075        dods_cp ${1} public/${LOGIN}/${R_DODS} > /dev/null 2>&1 
    10801076        RET=0 
    10811077 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh

    r257 r263  
    949949        rsh gaya exec /bin/ksh <<EOF 
    950950        cd ${R_SAVE} 
    951         /usr/local/bin/dods_rm DODS/pub/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName}/${1} > /dev/null 2>&1 
    952         /sbin/chmod -R u+w ${R_SAVE}/${1} 
    953         /usr/local/bin/dods_cp ${1} DODS/pub/${LOGIN}/${config_UserChoices_TagName}/${config_UserChoices_JobName} > /dev/null 2>&1 
    954         /sbin/chmod -R +rX ${R_SAVE}/${1} 
    955         /sbin/chmod -R u+w ${R_SAVE}/${1} 
     951        /usr/local/bin/dods_rm DODS/pub/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1 
     952        /bin/chmod -R u+w ${R_SAVE}/${1} 
     953        /usr/local/bin/dods_cp ${1} DODS/pub/${LOGIN}/${R_DODS} > /dev/null 2>&1 
     954        /bin/chmod -R +rX ${R_SAVE}/${1} 
     955        /bin/chmod -R u+w ${R_SAVE}/${1} 
    956956EOF 
    957957        RET=$? 
Note: See TracChangeset for help on using the changeset viewer.