Changeset 3922 for trunk/NEMOGCM/CONFIG

Timestamp:

2013-06-14T12:37:08+02:00 (11 years ago)

Author:

smasson

Message:

trunk:compilation enhancements, 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;
 #-
 #- FCM and functions location ---
@@ -142 +143 @@
    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";
    echo "./makenemo add_key \"key_iomput key_mpp_mpi\" del_key \"key_agrif\" ";
@@ -158 +162 @@
    (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};;
    (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
    exit 2;;
@@ -188 +192 @@
        export ${list_del_key}
        shift
+       ;;
+   list_key)
+       list_key=1
        ;;
    *)
@@ -222 +229 @@
 [ "${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 +272 @@
 . ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit
 
+# build the complete list of the cpp keys of this configuration
+for i in $( grep "^# .*key" GYRE/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
+fi
+
 #- At this stage new configuration has been added,
 #- We add or remove keys
@@ -278 +291 @@
     . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}
 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
+   fi
+    fi
+done
+
+#- 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