Changeset 3937 for trunk

Timestamp:

2013-06-24T18:04:26+02:00 (11 years ago)

Author:

smasson

Message:

trunk:compilation enhancements, bugfix of changeset r3922, see ticket #1117

File:

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

trunk/NEMOGCM/CONFIG/makenemo

@@ -106 +106 @@
 export AGRIFUSE=10
 declare -a TAB
-list_key=0;
+list_key=0
+chk_key=1
 #-
 #- FCM and functions location ---
@@ -113 +114 @@
 #-
 #- Choice of the options ---
-while getopts :hd:n:r:m:j:e:s:v:t: V
+while getopts :hd:n:r:m:j:e:s:v:t:k: V
 do
     case $V in
    (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]";
+       " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-s Path] [-e Path] [-j No] [-v No] [-k 0/1]";
    echo " -h           : help";
    echo " -h institute : specific help for consortium members";
@@ -129 +130 @@
         echo " -j No        : number of processes used to compile (0=nocompilation)";
         echo " -v No        : set verbosity level for compilation [0-3]";
+        echo " -k 0/1       : used cpp keys check (default = 1 -> check activated)";
    echo " -t dir       : temporary directory for compilation"
    echo "";
@@ -165 +167 @@
    (s)  x_s=${OPTARG};;
    (v)  x_v=${OPTARG};;
+   (k)  chk_key=${OPTARG};;
    (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
    exit 2;;
@@ -273 +276 @@
 
 # build the complete list of the cpp keys of this configuration
-for i in $( grep "^ *#.* key_" ${NEW_CONF}/WORK/* ) 
-do
-    echo $i | grep key_
-done | sort -d | uniq > ${COMPIL_DIR}/full_key_list.txt
-if [ $list_key -eq 1 ]; then
-    cat ${COMPIL_DIR}/full_key_list.txt
-    exit 0
+if [ $chk_key -eq 1 ] ; then
+    for i in $( grep "^ *#.* key_" ${NEW_CONF}/WORK/* ) 
+    do
+   echo $i | grep key_ | sed -e "s/=.*//"
+    done | sort -d | uniq > ${COMPIL_DIR}/full_key_list.txt
+    if [ $list_key -eq 1 ]; then
+   cat ${COMPIL_DIR}/full_key_list.txt
+   exit 0
+    fi
 fi
 
@@ -292 +297 @@
 fi
 
-for kk in $( cat ${NEW_CONF}/cpp_${NEW_CONF}.fcm )
-do
-    if [ "$( echo $kk | cut -c 1-4 )" == "key_" ]; then
-   nb=$( grep -c $kk ${COMPIL_DIR}/full_key_list.txt )
-   if [ $nb -eq 0 ]; then
-       echo
-       echo "E R R O R : key "$kk" is not found in ${NEW_CONF}/WORK routines..."
-       echo "we stop..."
-       echo
-       exit 1
+#- check that all keys are really existing...
+if [ $chk_key -eq 1 ] ; then
+    for kk in $( cat ${NEW_CONF}/cpp_${NEW_CONF}.fcm )
+    do
+   if [ "$( echo $kk | cut -c 1-4 )" == "key_" ]; then
+       kk=${kk/=*/}
+       nb=$( grep -c $kk ${COMPIL_DIR}/full_key_list.txt )
+       if [ $nb -eq 0 ]; then
+      echo
+      echo "E R R O R : key "$kk" is not found in ${NEW_CONF}/WORK routines..."
+      echo "we stop..."
+      echo
+      exit 1
+       fi
    fi
-    fi
-done
+    done
+fi
 
 #- At this stage cpp keys have been updated. we can check the arch file
@@ -348 +357 @@
         rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
         rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa
+        rm -f ${COMPIL_DIR}/*history ${COMPIL_DIR}/*fcm ${COMPIL_DIR}/*txt
         echo "cleaning ${NEW_CONF} WORK, BLD"
     fi