Changeset 3213 for branches

Timestamp:

2011-12-12T13:43:24+01:00 (12 years ago)

Author:

rblod

Message:

Correct maketools according to previous changes

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM

Files:

• CONFIG/makenemo (modified) (3 diffs)
• TOOLS/maketools (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo

@@ -134 +134 @@
    echo "makenemo -n MY_CONFIG -d \"OPA_SRC LIM_SRC_2\"";
    echo "";
-   echo "Available configurations :"; cat ${COMPIL_DIR}/cfg.txt; 
+   echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt; 
    echo "";
    echo "Example to remove bad configuration ";
@@ -216 +216 @@
 if [ "${NEW_CONF}" == help ] ; then
     echo "Available configurations :" 
-    cat ${COMPIL_DIR}/cfg.txt
+    cat ${CONFIG_DIR}/cfg.txt
     exit
 fi
@@ -252 +252 @@
     . ${COMPIL_DIR}/Fmake_config.sh ${NEW_CONF} ${REF_CONF}
 else
-    sed -e "/${NEW_CONF} /d"  ${COMPIL_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp
-    \mv  ${COMPIL_DIR}/cfg.tmp  ${COMPIL_DIR}/cfg.txt
+    sed -e "/${NEW_CONF} /d"  ${CONFIG_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp
+    \mv  ${COMPIL_DIR}/cfg.tmp  ${CONFIG_DIR}/cfg.txt
 fi
 
 #-
 #- Save new configuration and directories names ---
-echo ${NEW_CONF} ${TAB[*]} >> ${COMPIL_DIR}/cfg.txt
+echo ${NEW_CONF} ${TAB[*]} >> ${CONFIG_DIR}/cfg.txt
 
 #-

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/maketools

@@ -84 +84 @@
 #-
 #- Choice of the options ---
+x_h="";
 x_n="";
 x_m="";
@@ -92 +93 @@
   do
     case $V in
-      (h)  echo "Usage   : "${b_n} \
+      (h)  x_h=${OPTARG};
+                          echo "Usage   : "${b_n} \
                 " [-h] [-n name] [-m arch] [-j No] [-t tmpdir]";
            echo " -h  : help";
+                          echo " -h institute : specific help for consortium members";
            echo " -n name : tool name, [-n help] to list existing tools";
            echo " -m arch : choose compiler, [-m help] to list exiting compilers";
@@ -105 +108 @@
                           printf "%s\n" "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools`;
            echo "";
-                          . ${COMPIL_DIR}/Flist_archfile.sh  ;
+                          . ${COMPIL_DIR}/Flist_archfile.sh  ${x_h};
            echo "";
            echo "Default : previous tool and compiler";
@@ -140 +143 @@
 #- Check if the tool or the compiler exist or list it
 [ "${NEW_CONF}" == help ] && printf "%s\n"  "Available tools :" `ls ${TOOLS_DIR}|grep -v COMPILE | grep -v maketools` && exit
-[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh && exit
+[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit
 
 #- When used for the first time, choose a compiler ---