Changeset 3213


Ignore:
Timestamp:
2011-12-12T13:43:24+01:00 (10 years ago)
Author:
rblod
Message:

Correct maketools according to previous changes

Location:
branches/2011/dev_NEMO_MERGE_2011/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo

    r3201 r3213  
    134134   echo "makenemo -n MY_CONFIG -d \"OPA_SRC LIM_SRC_2\""; 
    135135   echo ""; 
    136    echo "Available configurations :"; cat ${COMPIL_DIR}/cfg.txt;  
     136   echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt;  
    137137   echo ""; 
    138138   echo "Example to remove bad configuration "; 
     
    216216if [ "${NEW_CONF}" == help ] ; then 
    217217    echo "Available configurations :"  
    218     cat ${COMPIL_DIR}/cfg.txt 
     218    cat ${CONFIG_DIR}/cfg.txt 
    219219    exit 
    220220fi 
     
    252252    . ${COMPIL_DIR}/Fmake_config.sh ${NEW_CONF} ${REF_CONF} 
    253253else 
    254     sed -e "/${NEW_CONF} /d"  ${COMPIL_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp 
    255     \mv  ${COMPIL_DIR}/cfg.tmp  ${COMPIL_DIR}/cfg.txt 
     254    sed -e "/${NEW_CONF} /d"  ${CONFIG_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp 
     255    \mv  ${COMPIL_DIR}/cfg.tmp  ${CONFIG_DIR}/cfg.txt 
    256256fi 
    257257 
    258258#- 
    259259#- Save new configuration and directories names --- 
    260 echo ${NEW_CONF} ${TAB[*]} >> ${COMPIL_DIR}/cfg.txt 
     260echo ${NEW_CONF} ${TAB[*]} >> ${CONFIG_DIR}/cfg.txt 
    261261 
    262262#- 
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/maketools

    r2331 r3213  
    8484#- 
    8585#- Choice of the options --- 
     86x_h=""; 
    8687x_n=""; 
    8788x_m=""; 
     
    9293  do 
    9394    case $V in 
    94       (h)  echo "Usage   : "${b_n} \ 
     95      (h)  x_h=${OPTARG}; 
     96                          echo "Usage   : "${b_n} \ 
    9597                " [-h] [-n name] [-m arch] [-j No] [-t tmpdir]"; 
    9698           echo " -h  : help"; 
     99                          echo " -h institute : specific help for consortium members"; 
    97100           echo " -n name : tool name, [-n help] to list existing tools"; 
    98101           echo " -m arch : choose compiler, [-m help] to list exiting compilers"; 
     
    105108                          printf "%s\n" "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools`; 
    106109           echo ""; 
    107                           . ${COMPIL_DIR}/Flist_archfile.sh  ; 
     110                          . ${COMPIL_DIR}/Flist_archfile.sh  ${x_h}; 
    108111           echo ""; 
    109112           echo "Default : previous tool and compiler"; 
     
    140143#- Check if the tool or the compiler exist or list it 
    141144[ "${NEW_CONF}" == help ] && printf "%s\n"  "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools` && exit 
    142 [ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh && exit 
     145[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit 
    143146 
    144147#- When used for the first time, choose a compiler --- 
Note: See TracChangeset for help on using the changeset viewer.