Changeset 9598 for NEMO/trunk/cfgs


Ignore:
Timestamp:
2018-05-16T00:47:16+02:00 (3 years ago)
Author:
nicolasmartin
Message:

Reorganisation plan for NEMO repository: changes to make compilation succeed with new structure
Juste one issue left with AGRIF_NORDIC with AGRIF preprocessing
Standardisation of routines header with version 4.0 and year 2018
Fix for some broken symlinks

Location:
NEMO/trunk/cfgs
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/cfgs/SPITZ12/MY_SRC/sbcblk.F90

    r9576 r9598  
    137137   !! NEMO/OPA 3.7 , NEMO-consortium (2014) 
    138138   !! $Id: sbcblk.F90 6416 2016-04-01 12:22:17Z clem $ 
    139    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     139   !! Software governed by the CeCILL licence     (./LICENSE) 
    140140   !!---------------------------------------------------------------------- 
    141141CONTAINS 
  • NEMO/trunk/cfgs/cfg.txt

    r9577 r9598  
    1 AGRIF_NORDIC OCE_SRC ICE_SRC NST_SRC 
    2 AMM12 OCE_SRC 
    3 C1D_PAPA OCE_SRC 
    4 GYRE_BFM OCE_SRC TOP_SRC 
    5 GYRE_PISCES OCE_SRC TOP_SRC 
    6 ORCA2_OFF_PISCES OCE_SRC TOP_SRC OFF_SRC 
    7 ORCA2_OFF_TRC OCE_SRC TOP_SRC OFF_SRC 
    8 ORCA2_SAS_SI3 OCE_SRC ICE_SRC NST_SRC SAS_SRC 
    9 ORCA2_SI3_PISCES OCE_SRC TOP_SRC ICE_SRC NST_SRC 
    10 SPITZ12 OCE_SRC ICE_SRC 
     1AGRIF_NORDIC OCE ICE NST 
     2AMM12 OCE 
     3C1D_PAPA OCE 
     4GYRE_BFM OCE TOP 
     5GYRE_PISCES OCE TOP 
     6ORCA2_OFF_PISCES OCE TOP OFF 
     7ORCA2_OFF_TRC OCE TOP OFF 
     8ORCA2_SAS_SI3 OCE ICE NST SAS 
     9ORCA2_SI3_PISCES OCE TOP ICE NST 
     10SPITZ12 OCE ICE 
     11GYRE_PISCES_ST OCE TOP 
     12ORCA2_SI3_PISCES_ST OCE TOP ICE NST 
     13ORCA2_OFF_PISCES_ST OCE TOP OFF 
     14AMM12_ST OCE 
     15ORCA2_SAS_SI3_ST OCE ICE NST SAS 
     16ORCA2_SI3_OBS_ST OCE ICE 
     17AGRIF_NORDIC_ST OCE ICE NST 
     18AGRIF_NORDIC_NOAGRIF_ST OCE ICE NST 
     19SPITZ12_ST OCE ICE 
  • NEMO/trunk/cfgs/makenemo

    r9572 r9598  
    9696x_j=1; 
    9797x_e="none"; 
    98 x_s=NEMO; 
     98x_s=src; 
    9999x_v=1; 
    100100 
     
    104104MAIN_DIR=$(cd $(dirname "$0"); pwd) 
    105105MAIN_DIR=${MAIN_DIR%/SETTE*} 
    106 MAIN_DIR=${MAIN_DIR%/TOOLS*} 
    107 MAIN_DIR=${MAIN_DIR%/CONFIG*} 
     106MAIN_DIR=${MAIN_DIR%/tools*} 
     107MAIN_DIR=${MAIN_DIR%/cfgs*} 
    108108export MAIN_DIR 
    109109# 
    110 export CONFIG_DIR=${MAIN_DIR}/CONFIG 
    111 export TOOLS_DIR=${MAIN_DIR}/TOOLS 
    112 export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE 
     110export CONFIG_DIR=${MAIN_DIR}/cfgs 
     111export TOOLS_DIR=${MAIN_DIR}/tools 
     112export COMPIL_DIR=${MAIN_DIR}/mk 
    113113export NEMO_DIR=${MAIN_DIR}/${x_s} 
    114114export AGRIFUSE=10 
     
    120120#- 
    121121#- FCM and functions location --- 
    122 export PATH=${MAIN_DIR}/EXTERNAL/fcm/bin:$PATH 
     122export PATH=${MAIN_DIR}/ext/FCM/bin:$PATH 
    123123 
    124124#- 
     
    146146   echo ""; 
    147147   echo "Example to install a new configuration MY_CONFIG"; 
    148    echo "with OCE_SRC and ICE_SRC "; 
    149    echo "makenemo -n MY_CONFIG -d \"OCE_SRC ICE_SRC\""; 
     148   echo "with OCE and ICE "; 
     149   echo "makenemo -n MY_CONFIG -d \"OCE ICE\""; 
    150150   echo ""; 
    151151   echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt; 
     
    230230 
    231231#- 
    232 #- Go to NEMOGCM/CONFIG directory --- 
     232#- Go to NEMOGCM/cfgs directory --- 
    233233cd ${CONFIG_DIR} 
    234234 
     
    240240   export CONFIG_DIR=${CONFIG_DIR}/${ALT_DIR} 
    241241#- 
    242 #- Go to named subdirectory of the NEMOGCM/CONFIG directory --- 
     242#- Go to named subdirectory of the NEMOGCM/cfgs directory --- 
    243243   cd ${CONFIG_DIR} 
    244244 fi 
     
    274274   echo "You are installing a new default (ORCA2_LIM3_PISCES) configuration" 
    275275   ind=0 
    276    . ${COMPIL_DIR}/Fread_dir.sh OCE_SRC    YES 
    277    . ${COMPIL_DIR}/Fread_dir.sh ICE_SRC     NO 
    278    . ${COMPIL_DIR}/Fread_dir.sh TOP_SRC    NO 
    279    . ${COMPIL_DIR}/Fread_dir.sh NST_SRC    YES 
    280    . ${COMPIL_DIR}/Fread_dir.sh OFF_SRC    NO 
    281    . ${COMPIL_DIR}/Fread_dir.sh SAO_SRC    NO 
    282    . ${COMPIL_DIR}/Fread_dir.sh SAS_SRC    NO 
     276   . ${COMPIL_DIR}/Fread_dir.sh OCE  YES 
     277   . ${COMPIL_DIR}/Fread_dir.sh ICE  NO 
     278   . ${COMPIL_DIR}/Fread_dir.sh TOP  NO 
     279   . ${COMPIL_DIR}/Fread_dir.sh NST  YES 
     280   . ${COMPIL_DIR}/Fread_dir.sh OFF  NO 
     281   . ${COMPIL_DIR}/Fread_dir.sh SAO  NO 
     282   . ${COMPIL_DIR}/Fread_dir.sh SAS  NO 
    283283   REF_CONF=ORCA2_LIM3_PISCES 
    284284    elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then 
    285    echo "You are  installing a new configuration based on ORCA2_LIM3_PISCES" 
     285   echo "You are installing a new configuration based on ORCA2_LIM3_PISCES" 
    286286   TAB=( ${NEM_SUBDIR} ) 
    287287   REF_CONF=ORCA2_LIM3_PISCES 
    288288    elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#REF_CONF} -gt 0 ]; then 
    289    echo "You are  installing a new configuration based on ${REF_CONF}" 
     289   echo "You are installing a new configuration based on ${REF_CONF}" 
    290290   . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF} 
    291291    elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -gt 0 ]; then 
     
    320320#- Create the WORK --- 
    321321#- Clean links and librairies --- 
    322 #- Creating the good links, at first on OCE_SRC --- 
     322#- Creating the good links, at first on OCE --- 
    323323. ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 3 
    324324 
  • NEMO/trunk/cfgs/uspcfg.txt

    r9572 r9598  
    1 ORCA1_CICE # ORCA2_LIM # OCE_SRC TOP_SRC  # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ORCA1_CICE/v3.6.0/ORCA1_CICE_ctl.txt 
    2 ISOMIP     # GYRE      # OCE_SRC          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP/trunk/ISOMIP_ctl.txt 
    3 IRISHSEA   # GYRE      # OCE_SRC          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/IRISHSEA/v3.7.0/IRISHSEA_ctl.txt 
     1ORCA1_CICE # ORCA2_LIM # OCE TOP  # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ORCA1_CICE/v3.6.0/ORCA1_CICE_ctl.txt 
     2ISOMIP     # GYRE      # OCE          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP/trunk/ISOMIP_ctl.txt 
     3IRISHSEA   # GYRE      # OCE          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/IRISHSEA/v3.7.0/IRISHSEA_ctl.txt 
Note: See TracChangeset for help on using the changeset viewer.