Changeset 2143 for branches/DEV_r1879_FCM/NEMOGCM/CONFIG/makenemo

Timestamp:

2010-10-04T14:49:55+02:00 (14 years ago)

Author:

rblod

Message:

Improvement of FCM branch

File:

• branches/DEV_r1879_FCM/NEMOGCM/CONFIG/makenemo (modified) (7 diffs, 1 prop)

branches/DEV_r1879_FCM/NEMOGCM/CONFIG/makenemo

@@ -72 +72 @@
 #
 #
-# - rblod 2010-06-20T16:11:47Z
 #
 #   * creation
@@ -98 +97 @@
 x_m="";
 x_t="";
+x_c="";
 x_j=1;
-while getopts :hld:n:r:m:j:t: V
+while getopts :hd:n:r:m:j:t: V
   do
     case $V in
       (h)  echo "Usage   : "${b_n} \
-                " [-h] [-l] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-j No]";
+                " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-j No]";
            echo " -h  : help";
-           echo " -l  : list existing configurations";
-           echo " -n name : config name";
-           echo " -m arch : choose machine";
+           echo " -n name : config name, [-n help] to list existing configurations";
+           echo " -m arch : choose compiler, [-m help] to list exiting compilers";
            echo " -d dir  : choose NEMO sub-directories";
            echo " -r conf : choose reference configuration";
@@ -117 +116 @@
            echo "makenemo -n MY_CONFIG -d \"OPA_SRC LIM_SRC_2\"";
            echo "";
-           echo "Defaults    : ";
+                          echo "Available configurations :"; cat ${COMPIL_DIR}/cfg.txt; 
            echo "";
+                          . ${COMPIL_DIR}/Flist_archfile.sh  ;
+                          echo "";
+                          echo "Default : previous configuration and compiler";
            exit 0;;
       (d)  x_d=${OPTARG};;
@@ -126 +128 @@
       (j)  x_j=${OPTARG};;
       (t)  x_t=${OPTARG};;
-      (l)  echo "Available configurations :"; cat ${COMPIL_DIR}/cfg.txt; exit;;
       (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
            exit 2;;
@@ -134 +135 @@
   done
 shift $(($OPTIND-1));
+
+#-
+#- Get the clean option
+[[ "${#@}" -ne 0 && "${@}" != clean ]] && echo "Invalid option "$@" " && exit
+[ "${#@}" -ne 0 ] && x_c="--$@"
 
 #-
@@ -148 +154 @@
 NEMO_TDIR=${x_t:-$NEMO_TDIR}
 export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR}
+
+#- Check if the tool or the compiler exist or list it
+if [ "${NEW_CONF}" == help ] ; then
+ echo "Available configurations :" 
+ cat ${COMPIL_DIR}/cfg.txt
+exit
+fi
+[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh && exit
 
 #- When used for the first time, choose a compiler ---
@@ -212 +226 @@
 
 #if AGRIF we do a first preprocessing
+if [ ${#x_c} -eq 0 ]; then
 [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld.cfg 
 [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/*
-fcm build --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld.cfg || cd -
+fi
+fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld.cfg || 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