Changeset 1744 for modipsl/branches


Ignore:
Timestamp:
05/31/12 22:33:51 (12 years ago)
Author:
jgipsl
Message:

Changes due to previous commit in v5 family : USER_SPEC directory changed to EXPERIEMENTS and UserSpec? variable in config.card changed to ExpType?.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modipsl/branches/newconfig/util/ins_job

    r1644 r1744  
    109109 n_f=${F_RCI##*/}; 
    110110 
    111  if [ ! X$( echo ${j} | grep USER_SPEC ) = X ] ; then 
    112  # Do not treat config.card if it is in sub-directory of USER_SPEC 
     111 if [ ! X$( echo ${j} | grep EXPERIMENTS ) = X ] ; then 
     112 # Do not treat config.card if it is in sub-directory of EXPERIMENTS 
    113113 # Continue to next config.card 
    114114     continue 
     
    122122 config_UserChoices_JobClass=mono 
    123123 config_UserChoices_JobNumProcTot=1 
    124  config_UserChoices_UserSpec="" 
     124 config_UserChoices_ExpType="" 
    125125 RESOL_ATM_3D=this_is_a_test_string 
    126126 RESOL=this_is_another_test_string 
     
    145145 
    146146# Add specific treatment for new type of directory structure  
    147   if [ -d ${j}/USER_SPEC ] && [ -d ${j}/GENERAL ] ; then 
     147  if [ -d ${j}/EXPERIMENTS ] && [ -d ${j}/GENERAL ] ; then 
    148148      echo "This is new configuration structure" 
    149149 
    150       if [ "X${config_UserChoices_UserSpec}" = X ] ; then 
     150      if [ "X${config_UserChoices_ExpType}" = X ] ; then 
    151151        echo "\nERROR in ${j}/config.card" 
    152152        echo "ins_job stops here" 
    153         echo "=> The variable UserSpec must be added in config.card in section UserChoices" 
    154         echo "=> UserSpec gives the directory for the .card configurtaion files for the wanted experiement. For exemple UserSpec=IPSLCM5/historical" 
     153        echo "=> The variable ExpType must be added in config.card in section UserChoices" 
     154        echo "=> ExpType gives the directory for the .card configurtaion files for the wanted experiement. For exemple ExpType=IPSLCM5/historical" 
    155155        exit 4 
    156156      else 
    157         echo "UserSpec= ${config_UserChoices_UserSpec}" 
     157        echo "ExpType= ${config_UserChoices_ExpType}" 
    158158      fi 
    159159 
     
    162162          continue 
    163163      fi 
    164       cp -r ${j}/USER_SPEC/${config_UserChoices_UserSpec} ${j}/${JobName} 
     164      cp -r ${j}/EXPERIMENTS/${config_UserChoices_ExpType} ${j}/${JobName} 
    165165      cp -r ${j}/GENERAL/* ${j}/${JobName}/. 
    166166      cp -f ${j}/${F_CFG}  ${j}/${JobName}/. 
Note: See TracChangeset for help on using the changeset viewer.