Changeset 3294 for trunk/NEMOGCM/CONFIG/makenemo

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/CONFIG/makenemo (modified) (10 diffs)

trunk/NEMOGCM/CONFIG/makenemo

@@ -76 +76 @@
 #
 #-
+
+#-
+#- Initialization of the options ---
+x_d="";
+x_h="";
+x_n="";
+x_r="";
+x_m="";
+x_t="";
+x_c="";
+x_j=1;
+x_e="none";
+x_s=NEMO;
+x_v=1;
 
 #- Local variables ---
@@ -89 +103 @@
 export TOOLS_DIR=${MAIN_DIR}/TOOLS
 export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE
-export NEMO_DIR=${MAIN_DIR}/NEMO
+export NEMO_DIR=${MAIN_DIR}/${x_s}
 export AGRIFUSE=10
-
 declare -a TAB
 #-
@@ -99 +112 @@
 #-
 #- Choice of the options ---
-x_d="";
-x_n="";
-x_r="";
-x_m="";
-x_t="";
-x_c="";
-x_j=1;
-while getopts :hd:n:r:m:j:t: V
+while getopts :hd:n:r:m:j:e:s:v:t: V
 do
     case $V in
-   (h)  echo "Usage   : "${b_n} \
-       " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-j No]";
-   echo " -h    : help";
-   echo " -n name : config name, [-n help] to list existing configurations";
-   echo " -m arch : choose compiler, [-m help] to list existing compilers";
-   echo " -d dir  : choose NEMO sub-directories";
-   echo " -r conf : choose reference configuration";
-   echo " -j No    : number of processes used to compile (0=nocompilation)";
-   echo " -t dir  : temporary directory for compilation"
+   (h) x_h=${OPTARG};
+        echo "Usage   : "${b_n} \
+       " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-s Path] [-e Path] [-j No] [-v No]";
+   echo " -h           : help";
+   echo " -h institute : specific help for consortium members";
+   echo " -n name      : config name, [-n help] to list existing configurations";
+   echo " -m arch      : choose compiler, [-m help] to list existing compilers";
+   echo " -d dir       : choose NEMO sub-directories";
+   echo " -r conf      : choose reference configuration";
+        echo " -s Path      : choose alternative location for NEMO main directory";
+        echo " -e Path      : choose alternative location for MY_SRC directory";
+        echo " -j No        : number of processes used to compile (0=nocompilation)";
+        echo " -v No        : set verbosity level for compilation [0-3]";
+   echo " -t dir       : temporary directory for compilation"
    echo "";
    echo "Example to install a new configuration MY_CONFIG";
@@ -123 +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 ";
@@ -137 +148 @@
    echo "./makenemo -n MY_CONFIG -j0 add_key \"key_iomput key_mpp_mpi\" del_key \"key_agrif\" ";
    echo "";
-   . ${COMPIL_DIR}/Flist_archfile.sh  ;
+   . ${COMPIL_DIR}/Flist_archfile.sh ${x_h}  ;
    echo "";
    echo "Default : previous configuration and compiler";
@@ -147 +158 @@
    (j)  x_j=${OPTARG};;
    (t)  x_t=${OPTARG};;
+    (e)  x_e=${OPTARG};;
+    (s)  x_s=${OPTARG};;
+    (v)  x_v=${OPTARG};;
    (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
    exit 2;;
@@ -198 +212 @@
 NEMO_TDIR=${x_t:-$NEMO_TDIR}
 export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR}
+export NEMO_DIR=${MAIN_DIR}/${x_s}
 
 #- Check if the tool or the compiler exist or list it
 if [ "${NEW_CONF}" == help ] ; then
     echo "Available configurations :" 
-    cat ${COMPIL_DIR}/cfg.txt
+    cat ${CONFIG_DIR}/cfg.txt
     exit
 fi
-[ "${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 ---
@@ -238 +253 @@
     . ${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
 
 #-
@@ -250 +265 @@
 #- Clean links and librairies ---
 #- Creating the good links, at first on OPA_SRC ---
-. ${COMPIL_DIR}/Fmake_WORK.sh ${NEW_CONF} ${TAB[*]} || exit
+. ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit
 
 . ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit
@@ -290 +305 @@
         [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/*
     fi
-    fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd -
+    fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd -
     [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa
     [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe