Changeset 2306 for branches

Timestamp:

2010-10-25T16:36:50+02:00 (14 years ago)

Author:

flavoni

Message:

correct a small bug fix in add_key option for makenemo, see ticket #740

File:

• branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh (modified) (1 diff)

branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh

@@ -63 +63 @@
  echo "Adding keys in : ${NEW_CONF}" 
  for i in ${list_add_key} ; do
-   if [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then
-      if [ "$i" == "key_proci" || "$i" == "key_procij" ] ; then
-         sed -e "s/key_proc[ij]=.* / ${i} /"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-               mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-      fi
+   if [ "$(echo ${i} | grep -c key_proc )" -ne 0 ] ; then
+      sed -e "s/key_proc[ij]=.* //"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
+            mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
+      echo " "
+      sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
+            mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
+   elif [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then
    echo "key $i already present in cpp_${NEW_CONF}.fcm" 
    else