Changeset 658


Ignore:
Timestamp:
04/18/12 17:00:47 (12 years ago)
Author:
labetoulle
Message:

Add Ensemble functionality to libIGCM - First step :
modify output directories according to an option in section [Ensemble]
in config.card (modification of config.card yet to be done).

Location:
trunk/libIGCM
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_SE_Checker

    r637 r658  
    7979 
    8080#================================== 
     81# Read Ensemble section:  
     82IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     83echo 
     84 
     85for option in ${config_Ensemble[*]} ; do 
     86    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     87    eval auxprint=\${config_Ensemble_${option}} 
     88    IGCM_debug_Print 3 "${option} : ${auxprint}" 
     89done 
     90# 
     91echo 
     92 
     93#================================== 
    8194# Read Post section:  
    8295IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card Post 
    … …  
    106119#R_BUFR : Job output buffered directory 
    107120if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    108     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     121  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     122  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     123    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     124    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     125    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     126  else 
    109127    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    110128    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    111129    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     130  fi 
    112131else 
     132  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     133    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     134    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     135    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     136  else 
    113137    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    114138    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    115139    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     140  fi 
    116141fi 
    117142 

  • trunk/libIGCM/AA_TimeSeries_Checker

    r591 r658  
    9898    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
    9999    eval auxprint=\${config_UserChoices_${option}} 
     100    IGCM_debug_Print 3 "${option} : ${auxprint}" 
     101done 
     102# 
     103echo 
     104 
     105#================================== 
     106# Read Ensemble section:  
     107IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     108echo 
     109 
     110for option in ${config_Ensemble[*]} ; do 
     111    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     112    eval auxprint=\${config_Ensemble_${option}} 
    100113    IGCM_debug_Print 3 "${option} : ${auxprint}" 
    101114done 
    … …  
    153166if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    154167  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    155   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    156   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    157   R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     168  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     169    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     170    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     171    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     172  else 
     173    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     174    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     175    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     176  fi 
    158177else 
    159   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    160   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    161   R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     178  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     179    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     180    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     181    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     182  else 
     183    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     184    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     185    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     186  fi 
    162187fi 
    163188 

  • trunk/libIGCM/AA_atlas_LMDZ

    r647 r658  
    173173done 
    174174 
     175IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     176typeset option 
     177for option in ${config_Ensemble[*]} ; do 
     178    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     179done 
    175180# 
    176181echo 
    … …  
    185190IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    186191IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     192IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     193IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    187194echo 
    188195 
    189196#================================== 
    190197#R_SAVE : Job output directory 
     198#R_BUFR : Job output buffered directory 
    191199if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    192     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     200  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     201  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     202    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     203    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     204    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     205    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     206  else 
    193207    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    194208    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    195209    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    196210    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     211  fi 
    197212else 
     213  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     214    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     215    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     216    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     217    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     218  else 
    198219    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    199220    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    200221    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    201222    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     223  fi 
    202224fi 
    203225# 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r647 r658  
    173173    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
    174174done 
     175 
     176IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     177typeset option 
     178for option in ${config_Ensemble[*]} ; do 
     179    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     180done 
    175181# 
    176182echo 
    … …  
    185191IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    186192IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     193IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     194IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    187195echo 
    188196 
    … …  
    191199#R_BUFR : Job output buffered directory 
    192200if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    193     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     201  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     202  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     203    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     204    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     205    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     206    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     207  else 
    194208    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    195209    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    196210    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    197211    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     212  fi 
    198213else 
     214  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     215    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     216    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     217    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     218    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     219  else 
    199220    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    200221    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    201222    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    202223    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     224  fi 
    203225fi 
    204226# 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r647 r658  
    181181    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
    182182done 
     183 
     184IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     185typeset option 
     186for option in ${config_Ensemble[*]} ; do 
     187    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     188done 
    183189# 
    184190echo 
    … …  
    193199IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    194200IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     201IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     202IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    195203echo 
    196204 
    … …  
    199207#R_BUFR : Job output buffered directory 
    200208if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    201     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     209  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     210  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     211    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     212    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     213    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     214    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     215  else 
    202216    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    203217    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    204218    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    205219    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     220  fi 
    206221else 
     222  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     223    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     224    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     225    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     226    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     227  else 
    207228    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    208229    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    209230    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    210231    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     232  fi 
    211233fi 
    212234# 

  • trunk/libIGCM/AA_atlas_PISCES

    r647 r658  
    173173done 
    174174 
     175IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     176typeset option 
     177for option in ${config_Ensemble[*]} ; do 
     178    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     179done 
    175180# 
    176181echo 
    … …  
    185190IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    186191IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     192IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     193IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    187194echo 
    188195 
    … …  
    191198#R_BUFR : Job output buffered directory 
    192199if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    193     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     200  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     201  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     202    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     203    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     204    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     205    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     206  else 
    194207    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    195208    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    196209    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    197210    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     211  fi 
    198212else 
     213  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     214    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     215    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     216    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     217    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     218  else 
    199219    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    200220    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    201221    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    202222    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     223  fi 
    203224fi 
    204225# 

  • trunk/libIGCM/AA_clean_month

    r635 r658  
    6363done 
    6464 
     65IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Ensemble 
     66 
     67for option in ${config_Ensemble[*]} ; do 
     68    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Ensemble ${option} 
     69done 
     70 
    6571IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
    6672IGCM_debug_PrintVariables 3 config_UserChoices_JobName 
    … …  
    7480IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    7581IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     82IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     83IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    7684 
    7785#================================== 
    … …  
    93101#R_BUFR : Job output buffered directory 
    94102if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    95     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     103  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     104  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     105    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     106    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     107  else 
    96108    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    97109    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     110  fi 
    98111else 
     112  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     113    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     114    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     115  else 
    99116    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    100117    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     118  fi 
    101119fi 
    102120IGCM_sys_TestDirArchive ${R_SAVE} 

  • trunk/libIGCM/AA_create_multi_se

    r647 r658  
    232232    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
    233233done 
     234 
     235IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     236typeset option 
     237for option in ${config_Ensemble[*]} ; do 
     238    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     239done 
    234240# 
    235241echo 
    … …  
    241247IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    242248IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     249IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     250IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    243251echo 
    244252 
    … …  
    247255#R_BUFR : Job output buffered directory 
    248256if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    249     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     257  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     258  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     259    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     260    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     261    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     262  else 
    250263    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    251264    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    252265    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     266  fi 
    253267else 
     268  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     269    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     270    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     271    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     272  else 
    254273    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    255274    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    256275    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     276  fi 
    257277fi 
    258278# 

  • trunk/libIGCM/AA_create_se

    r647 r658  
    250250 
    251251#================================== 
     252# Read Ensemble section:  
     253IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     254echo 
     255IGCM_debug_Print 1 "DefineArrayFromOption  : config_Ensemble" 
     256for option in ${config_Ensemble[*]} ; do 
     257    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     258    eval auxprint=\${config_Ensemble_${option}} 
     259    IGCM_debug_Print 3 "${option} : ${auxprint}" 
     260done 
     261# 
     262echo 
     263 
     264#================================== 
    252265# Read Post section:  
    253266IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card Post 
    … …  
    280293#R_BUFR : Job output buffered directory 
    281294if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    282     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     295  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     296  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     297    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     298    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     299    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     300  else 
    283301    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    284302    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    285303    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     304  fi 
    286305else 
     306  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     307    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     308    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     309    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     310  else 
    287311    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    288312    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    289313    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     314  fi 
    290315fi 
    291316# 

  • trunk/libIGCM/AA_create_ts

    r647 r658  
    270270 
    271271#================================== 
     272# Read Ensemble section:  
     273IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     274echo 
     275IGCM_debug_Print 1 "DefineArrayFromOption  : config_Ensemble" 
     276for option in ${config_Ensemble[*]} ; do 
     277    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     278    eval auxprint=\${config_Ensemble_${option}} 
     279    IGCM_debug_Print 3 "${option} : ${auxprint}" 
     280done 
     281# 
     282echo 
     283 
     284#================================== 
    272285# Read Post section:  
    273286IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card Post 
    … …  
    300313#R_BUFR : Job output buffered directory 
    301314if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    302     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     315  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     316  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     317    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     318    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     319    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     320  else 
    303321    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    304322    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    305323    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     324  fi 
    306325else 
     326  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     327    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     328    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     329    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     330  else 
    307331    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    308332    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    309333    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     334  fi 
    310335fi 
    311336# 

  • trunk/libIGCM/AA_monitoring

    r647 r658  
    230230    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
    231231done 
     232 
     233IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble 
     234typeset option 
     235for option in ${config_Ensemble[*]} ; do 
     236    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     237done 
    232238IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card ListOfComponents 
    233239 
    … …  
    236242#R_BUFR : Job output buffered directory 
    237243if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    238     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     244  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
     245  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     246    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     247    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     248    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     249    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     250  else 
    239251    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    240252    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    241253    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    242254    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     255  fi 
    243256else 
     257  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     258    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     259    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     260    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     261    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     262  else 
    244263    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    245264    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    246265    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    247266    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     267  fi 
    248268fi 
    249269 

  • trunk/libIGCM/AA_pack_debug

    r647 r658  
    241241# 
    242242# Read config.card 
     243 
    243244IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card UserChoices 
    244245typeset option 
    245246for option in ${config_UserChoices[*]} ; do 
    246247  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option} 
     248done 
     249# 
     250IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card Ensemble 
     251typeset option 
     252for option in ${config_Ensemble[*]} ; do 
     253  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
    247254done 
    248255# 
    … …  
    258265IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    259266IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     267IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     268IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    260269echo 
    261270 
    … …  
    268277if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    269278  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    270   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    271   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     279  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     280    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     281    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     282  else 
     283    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     284    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     285  fi 
    272286else 
    273   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    274   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     287  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     288    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     289    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     290  else 
     291    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     292    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     293  fi 
    275294fi 
    276295IGCM_sys_TestDirArchive ${R_SAVE} 

  • trunk/libIGCM/AA_pack_output

    r656 r658  
    225225done 
    226226# 
     227IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card Ensemble 
     228typeset option 
     229for option in ${config_Ensemble[*]} ; do 
     230  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     231done 
     232# 
    227233echo 
    228234IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
    … …  
    236242IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    237243IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     244IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     245IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    238246echo 
    239247 
    … …  
    247255if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    248256  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    249   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    250   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     257  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     258    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     259    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     260  else 
     261    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     262    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     263  fi 
    251264else 
    252   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    253   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     265  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     266    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     267    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     268  else 
     269    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     270    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     271  fi 
    254272fi 
    255273IGCM_sys_TestDirArchive ${R_SAVE} 

  • trunk/libIGCM/AA_pack_restart

    r653 r658  
    248248done 
    249249# 
     250IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card Ensemble 
     251typeset option 
     252for option in ${config_Ensemble[*]} ; do 
     253  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option} 
     254done 
     255# 
    250256echo 
    251257IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices" 
    … …  
    259265IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd 
    260266IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength 
     267IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     268IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
    261269echo 
    262270 
    … …  
    269277if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    270278  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    271   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    272   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     279  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     280    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     281    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     282  else 
     283    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     284    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     285  fi 
    273286else 
    274   R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    275   R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     287  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     288    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     289    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     290  else 
     291    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     292    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     293  fi 
    276294fi 
    277295IGCM_sys_TestDirArchive ${R_SAVE} 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r653 r658  
    8989 
    9090  #================================== 
     91  # Read Ensemble section: 
     92  IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Ensemble 
     93 
     94  for option in ${config_Ensemble[*]} ; do 
     95    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Ensemble ${option} 
     96  done 
     97 
     98  IGCM_debug_Print 1 "DefineArrayFromOption  : config_Ensemble" 
     99  if [ X${config_Ensemble_EnsembleRun} != X ] ; then 
     100    IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleRun 
     101  fi 
     102  if [ X${config_Ensemble_EnsembleName} != X ] ; then 
     103    IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName 
     104  fi 
     105  if [ X${config_Ensemble_EnsembleDate} != X ] ; then 
     106    IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate 
     107  fi 
     108 
     109  #================================== 
    91110  # Read Post section: 
    92111  IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Post 
    … …  
    198217  if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then 
    199218    FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' ) 
    200     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    201     R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    202     R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    203     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
    204   else 
    205     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    206     R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    207     R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
    208     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     219    if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     220      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     221      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     222      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     223      R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName} 
     224    else 
     225      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     226      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     227      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     228      R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName} 
     229    fi 
     230  else 
     231    if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then 
     232      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     233      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     234      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     235      R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName} 
     236    else 
     237      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     238      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     239      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     240      R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName} 
     241    fi 
    209242  fi 
    210243 
Note: See TracChangeset for help on using the changeset viewer.