Changeset 3165

Timestamp:

2011-11-21T19:51:03+01:00 (12 years ago)

Author:

rblod

Message:

Test addition of a subdirectory for ARCH on LOCEAN branch

Location:

branches/2011/dev_LOCEAN_2011/NEMOGCM

Files:

• ARCH/LOCAL (added)
• ARCH/LOCAL/arch-XT6_HECTOR.fcm (moved) (moved from branches/2011/dev_LOCEAN_2011/NEMOGCM/ARCH/arch-XT6_HECTOR.fcm)
• CONFIG/cfg.txt (moved) (moved from branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt) (1 diff)
• TOOLS/COMPILE/Fcheck_archfile.sh (modified) (1 diff)
• TOOLS/COMPILE/Fcheck_config.sh (modified) (3 diffs)
• TOOLS/COMPILE/Fclean_config.sh (modified) (2 diffs)
• TOOLS/COMPILE/Fcopy_dir.sh (modified) (1 diff)
• TOOLS/COMPILE/Flist_archfile.sh (modified) (1 diff)

branches/2011/dev_LOCEAN_2011/NEMOGCM/CONFIG/cfg.txt

@@ -6 +6 @@
 ORCA2_LIM3 OPA_SRC LIM_SRC_3
 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
-ORCA2_LIM_CFC OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
-ORCA2_OFF_CFC OPA_SRC OFF_SRC TOP_SRC

branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

@@ -69 +69 @@
    fi
 else
-   ln -sf ${MAIN_DIR}/ARCH/arch-${2}.fcm ${COMPIL_DIR}/$1
+   if [ -f  ${MAIN_DIR}/ARCH/arch-${2}.fcm ]; then
+      ln -sf ${MAIN_DIR}/ARCH/arch-${2}.fcm ${COMPIL_DIR}/$1
+   else
+      ln -sf ${MAIN_DIR}/ARCH/LOCAL/arch-${2}.fcm ${COMPIL_DIR}/$1
+   fi   
 fi

branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/Fcheck_config.sh

@@ -39 +39 @@
 # - Nothing set, use the previous in use 
 #
-# We use TOOLS/COMPILE/cfg.txt to check if the onfiguration exists.
+# We use TOOLS/CONFIG_DIR/cfg.txt to check if the onfiguration exists.
 #
 # EXAMPLES
@@ -68 +68 @@
 declare -a ZTAB
 if [ ${#2} -eq 0 ]; then
-   tail -1  ${COMPIL_DIR}/$1  > ${COMPIL_DIR}/cfg.tmp
-   read -a ZTAB < ${COMPIL_DIR}/cfg.tmp
+   tail -1  ${CONFIG_DIR}/$1  > ${CONFIG_DIR}/cfg.tmp
+   read -a ZTAB < ${CONFIG_DIR}/cfg.tmp
    NEW_CONF=${ZTAB[0]} ; TAB=( ${ZTAB[@]:1} )
-   \rm ${COMPIL_DIR}/cfg.tmp
+   \rm ${CONFIG_DIR}/cfg.tmp
    echo "Warning !!!"
    echo "No configuration specified"
@@ -79 +79 @@
 fi
 if [ "$1" == cfg.txt ]; then
-   cat ${COMPIL_DIR}/$1 | grep "${NEW_CONF} " > ${COMPIL_DIR}/cfg.tmp
-   read -a ZTAB < ${COMPIL_DIR}/cfg.tmp
+   cat ${CONFIG_DIR}/$1 | grep "${NEW_CONF} " > ${CONFIG_DIR}/cfg.tmp
+   read -a ZTAB < ${CONFIG_DIR}/cfg.tmp
    NEW_CONF=${ZTAB[0]} ; TAB=( ${ZTAB[@]:1} )
-   \rm ${COMPIL_DIR}/cfg.tmp
+   \rm ${CONFIG_DIR}/cfg.tmp
 fi
 

branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/Fclean_config.sh

@@ -69 +69 @@
  if [  -z "$answer" -o "x$answer" = "xy" ]; then
    # testing if configuration exists
-   if [ "$(cat ${COMPIL_DIR}/cfg.txt | grep "${NEW_CONF} ")"  == "" ] ; then
+   if [ "$(cat ${CONFIG_DIR}/cfg.txt | grep "${NEW_CONF} ")"  == "" ] ; then
       echo "The configuration ${NEW_CONF} does not exist in file cfg.txt"     
       echo "No removing configuration"
@@ -75 +75 @@
         else
       rm -rf ${CONFIG_DIR}/${NEW_CONF}
-      sed -e "/${NEW_CONF} /d"  ${COMPIL_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp
-      mv  ${COMPIL_DIR}/cfg.tmp  ${COMPIL_DIR}/cfg.txt
+      sed -e "/${NEW_CONF} /d"  ${CONFIG_DIR}/cfg.txt >  ${CONFIG_DIR}/cfg.tmp
+      mv  ${CONFIG_DIR}/cfg.tmp  ${CONFIG_DIR}/cfg.txt
       echo "${NEW_CONF} configuration REMOVED" 
         fi

branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/Fcopy_dir.sh

@@ -55 +55 @@
 
 declare -a ZTAB
-grep "$1 " ${COMPIL_DIR}/cfg.txt > ${COMPIL_DIR}/cfg.tmp
-read -a ZTAB < ${COMPIL_DIR}/cfg.tmp
+grep "$1 " ${CONFIG_DIR}/cfg.txt > ${CONFIG_DIR}/cfg.tmp
+read -a ZTAB < ${CONFIG_DIR}/cfg.tmp
 TAB=( ${ZTAB[@]:1} )
-\rm ${COMPIL_DIR}/cfg.tmp
+\rm ${CONFIG_DIR}/cfg.tmp
 
 unset -v ZTAB

branches/2011/dev_LOCEAN_2011/NEMOGCM/TOOLS/COMPILE/Flist_archfile.sh

@@ -55 +55 @@
 #-
 echo "Available compilers for -m option :"
-for file in `ls ${MAIN_DIR}/ARCH`
+for file in  $(ls ${MAIN_DIR}/ARCH ${MAIN_DIR}/ARCH/LOCAL | grep fcm )
 do
 zvar1=${file#arch-}
+if [ -f ${MAIN_DIR}/ARCH/$file ]; then
 zvar2=$(head -1 ${MAIN_DIR}/ARCH/$file)
+else
+zvar2=$(head -1 ${MAIN_DIR}/ARCH/LOCAL/$file)
+fi
 #echo "${zvar1%.fcm} : ${zvar2#\#}"
 printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"