Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (6 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/makenemo

    r4148 r4990  
    3838# 
    3939# - NEW_CONF    : configuration to be created 
    40 # - REF_CONF    : reference configuration to build the new one 
     40# - REF_CONF    : reference configuration to build the new one from 
    4141# - CMP_NAM     : compiler name 
    4242# - NBR_PRC     : number of processes used to compile 
     43# - USP_CONF    : unsupported (external) configuration to build the new one from 
    4344# - NEM_SUBDIR  : NEMO subdirectory used (specified) 
    4445# 
     
    5152# - TOOLS_DIR   :   "    "    " 
    5253# - NEMO_DIR    :   "    "    " 
     54# - REMOTE_CTL  : URL link to a remote resource list for an external configuration  
     55#                 which is not part of the reference suite 
     56# - LOCAL_REF   : Nearest reference configuration to an external configuration  
     57#                 which is not part of the reference suite 
     58#                 (used to populate work directories if remote access is not available) 
    5359# 
    5460# EXAMPLES 
     
    8389x_n=""; 
    8490x_r=""; 
     91x_u=""; 
    8592x_m=""; 
    8693x_t=""; 
     
    106113export AGRIFUSE=10 
    107114declare -a TAB 
     115declare -a REMOTE_CTL 
     116declare -a LOCAL_REF 
    108117list_key=0 
    109118chk_key=1 
     
    114123#- 
    115124#- Choice of the options --- 
    116 while getopts :hd:n:r:m:j:e:s:v:t:k: V 
     125while getopts :hd:n:r:u:m:j:e:s:v:t:k: V 
    117126do 
    118127    case $V in 
    119128   (h) x_h=${OPTARG}; 
    120129        echo "Usage   : "${b_n} \ 
    121        " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-s Path] [-e Path] [-j No] [-v No] [-k 0/1]"; 
     130       " [-h] [-n name] [-m arch] [-d "dir1 dir2"] [-r conf] [-u conf] [-s Path] [-e Path] [-j No] [-v No] [-k 0/1]"; 
    122131   echo " -h           : help"; 
    123132   echo " -h institute : specific help for consortium members"; 
     
    126135   echo " -d dir       : choose NEMO sub-directories"; 
    127136   echo " -r conf      : choose reference configuration"; 
     137   echo " -u conf      : choose an unsupported (external) configuration"; 
    128138        echo " -s Path      : choose alternative location for NEMO main directory"; 
    129139        echo " -e Path      : choose alternative location for MY_SRC directory"; 
     
    139149   echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt; 
    140150   echo ""; 
     151        echo "Available unsupported (external) configurations :"; cat ${CONFIG_DIR}/uspcfg.txt; 
     152   echo ""; 
    141153   echo "Example to remove bad configuration "; 
    142154   echo "./makenemo -n MY_CONFIG clean_config"; 
     
    161173   (n)  x_n=${OPTARG};; 
    162174   (r)  x_r=${OPTARG};; 
     175   (u)  x_u=${OPTARG};; 
    163176   (m)  x_m=${OPTARG};; 
    164177   (j)  x_j=${OPTARG};; 
     
    220233NEM_SUBDIR=${x_d} 
    221234REF_CONF=${x_r} 
     235USP_CONF=${x_u} 
    222236NEMO_TDIR=${x_t:-$NEMO_TDIR} 
    223237export NEMO_TDIR=${NEMO_TDIR:-$CONFIG_DIR} 
     
    228242    echo "Available configurations :" 
    229243    cat ${CONFIG_DIR}/cfg.txt 
     244    echo 
     245    echo "Available unsupported (external) configurations :"  
     246    cat ${CONFIG_DIR}/uspcfg.txt 
    230247    exit 
    231248fi 
     
    238255 
    239256if [ ${#NEW_CONF} -eq 0 ] ; then 
    240     if [ ${#NEM_SUBDIR} -eq 0 -a ${#REF_CONF} -eq 0 ]; then 
    241    echo "You are  installing a new configuration" 
     257    if [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then 
     258   echo "You are installing a new default (ORCA2_LIM) configuration" 
    242259   ind=0 
    243260   . ${COMPIL_DIR}/Fread_dir.sh OPA_SRC    YES 
     
    248265   . ${COMPIL_DIR}/Fread_dir.sh OFF_SRC    NO 
    249266   REF_CONF=ORCA2_LIM 
    250     elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -eq 0 ]; then 
    251    echo "You are  installing a new configuration" 
     267    elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then 
     268   echo "You are  installing a new configuration based on ORCA2_LIM" 
    252269   TAB=( ${NEM_SUBDIR} ) 
    253270   REF_CONF=ORCA2_LIM 
     
    255272   echo "You are  installing a new configuration based on ${REF_CONF}" 
    256273   . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF} 
     274    elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#USP_CONF} -gt 0 ]; then 
     275   echo "You are  installing a new configuration based on the unsupported (external) ${USP_CONF}" 
     276   . ${COMPIL_DIR}/Fcopy_extdir.sh ${USP_CONF}   
     277        #echo "TTT " ${TAB} 
     278        #echo "RRR " ${REMOTE_CTL} 
     279        #echo "LLL " ${LOCAL_REF} 
    257280    fi 
    258281    NEW_CONF=${x_n} 
    259     . ${COMPIL_DIR}/Fmake_config.sh ${NEW_CONF} ${REF_CONF} 
     282 
     283    if [ ${#USP_CONF} -gt 0 ]; then 
     284      . ${COMPIL_DIR}/Fmake_extconfig.sh ${NEW_CONF} ${LOCAL_REF} 
     285      . ${COMPIL_DIR}/Ffetch_extdir.sh ${NEW_CONF} ${REMOTE_CTL}   
     286    else 
     287      . ${COMPIL_DIR}/Fmake_config.sh ${NEW_CONF} ${REF_CONF} 
     288    fi 
    260289else 
    261290    sed -e "/${NEW_CONF} /d"  ${CONFIG_DIR}/cfg.txt >  ${COMPIL_DIR}/cfg.tmp 
Note: See TracChangeset for help on using the changeset viewer.