Changeset 4148 for branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/makenemo

Timestamp:

2013-11-04T13:54:28+01:00 (11 years ago)

Author:

cetlod

Message:

merge in trunk changes between r3853 and r3940 and commit the changes, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/makenemo (modified) (10 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/makenemo

@@ -106 +106 @@
 export AGRIFUSE=10
 declare -a TAB
+list_key=0
+chk_key=1
 #-
 #- FCM and functions location ---
@@ -112 +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";
@@ -128 +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 "";
@@ -141 +144 @@
    echo "Example to clean ";
    echo "./makenemo clean";
+   echo "";
+   echo "Example to list the available keys of a CONFIG ";
+   echo "./makenemo list_key";
    echo "";
    echo "Example to add and remove keys";
@@ -158 +164 @@
    (j)  x_j=${OPTARG};;
    (t)  x_t=${OPTARG};;
-    (e)  x_e=${OPTARG};;
-    (s)  x_s=${OPTARG};;
-    (v)  x_v=${OPTARG};;
+   (e)  x_e=${OPTARG};;
+   (s)  x_s=${OPTARG};;
+   (v)  x_v=${OPTARG};;
+   (k)  chk_key=${OPTARG};;
    (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
    exit 2;;
@@ -188 +195 @@
        export ${list_del_key}
        shift
+       ;;
+   list_key)
+       list_key=1
        ;;
    *)
@@ -222 +232 @@
 [ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit
 
-#- When used for the first time, choose a compiler ---
-. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm ${CMP_NAM} || exit
-
 #-
 #- Choose a default configuration if needed ---
 #- ORCA2_LIM or last one used ---
 . ${COMPIL_DIR}/Fcheck_config.sh cfg.txt ${NEW_CONF} || exit
-
 
 if [ ${#NEW_CONF} -eq 0 ] ; then
@@ -269 +275 @@
 . ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit
 
+# build the complete list of the cpp keys of this configuration
+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
+
 #- At this stage new configuration has been added,
 #- We add or remove keys
@@ -278 +296 @@
     . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}
 fi
+
+#- 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
+    done
+fi
+
+#- At this stage cpp keys have been updated. we can check the arch file
+#- When used for the first time, choose a compiler ---
+. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm cpp.fcm ${CMP_NAM} || exit
 
 #- At this stage the configuration has beeen chosen
@@ -317 +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