Changeset 4096

Timestamp:

2013-10-22T10:00:06+02:00 (10 years ago)

Author:

andrewryan

Message:

Reverse merging makenemo to revert build system to standard NEMO architecture

File:

• branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/CONFIG/makenemo (modified) (8 diffs)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/CONFIG/makenemo

@@ -82 +82 @@
 x_h="";
 x_n="";
-x_o=false;
 x_r="";
 x_m="";
@@ -115 +114 @@
 #-
 #- Choice of the options ---
-while getopts :hd:n:r:m:j:e:s:v:t:k:o V
+while getopts :hd:n:r:m:j:e:s:v:t:k: V
 do
     case $V in
@@ -133 +132 @@
         echo " -k 0/1       : used cpp keys check (default = 1 -> check activated)";
    echo " -t dir       : temporary directory for compilation"
-   echo " -o           : build offline obs_oper executable in addition to NEMO";
    echo "";
    echo "Example to install a new configuration MY_CONFIG";
@@ -164 +162 @@
    (r)  x_r=${OPTARG};;
    (m)  x_m=${OPTARG};;
-   (o)  x_o=true;;
    (j)  x_j=${OPTARG};;
    (t)  x_t=${OPTARG};;
@@ -226 +223 @@
 export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR}
 export NEMO_DIR=${MAIN_DIR}/${x_s}
-OFFLINE_OBSOPER=${x_o}
 
 #- Check if the tool or the compiler exist or list it
@@ -267 +263 @@
 fi
 
-#- Offline obs_oper settings
-if [ ${OFFLINE_OBSOPER}  ] ; then
-    # Append extra directory to NEMO sub-directory list
-    match=0
-    for DIR in "${TAB[@]}"; do
-        if [[ $DIR == "OOO_SRC" ]] ; then
-            match=1
-            break
-        fi
-    done
-    if [[ $match == 0 ]]; then
-        TAB+=('OOO_SRC')
-    fi
-
-    # Add extra keys to list_add_key
-    if ! echo ${list_add_key} | grep -q "key_offobsoper" ; then
-        echo "Adding key_offobsoper"
-        list_add_key="${list_add_key} key_offobsoper"
-    fi
-
-    if ! echo ${list_add_key} | grep -q "key_diaobs" ; then
-        echo "Adding key_diaobs"
-        list_add_key="${list_add_key} key_diaobs"
-    fi
-fi
-
 #-
 #- Save new configuration and directories names ---
@@ -357 +327 @@
 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit
 
-
-#- Offline obs_oper configuration
-if [ ${OFFLINE_OBSOPER} ] ; then
-    if ! grep -q "offline_oper.exe" ${COMPIL_DIR}/${USEBLD} ; then
-       sed '/bld::target.*nemo.exe/ s/$/ offline_oper.exe/' ${COMPIL_DIR}/${USEBLD} > ${COMPIL_DIR}/cfg.tmp
-       mv ${COMPIL_DIR}/cfg.tmp ${COMPIL_DIR}/${USEBLD}
-    fi
-fi
-
 #-
 #_ END OF CONFIGURATION PHASE
@@ -390 +351 @@
     [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa
 
-    # Offline obs_oper executable link
-    if [ ${OFFLINE_OBSOPER} ] ; then
-       [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/offline_oper.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/offline_oper.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/obs_oper
-    fi
-
 #add remove for clean option
     if  [ ${#x_c} -ne 0 ]; then