Changeset 10082


Ignore:
Timestamp:
2018-09-04T17:04:24+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Revert previous commits shared with other branches and set up dev organisation for AGRIF CMEMS #2129

Files:
4 deleted
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r10077_Agrif

    • Property svn:externals
      •  

        old new  
        1 ^/utils/build/arch        arch 
        2 ^/utils/build/makenemo    makenemo 
        3 ^/utils/build/mk          mk 
        4 ^/utils/tools             tools 
        5 ^/vendors/AGRIF/dev       ext/AGRIF 
        6 ^/vendors/FCM             ext/FCM 
        7 ^/vendors/IOIPSL          ext/IOIPSL 
         1^/utils/build/arch                  arch 
         2^/utils/build/makenemo              makenemo 
         3^/utils/build/mk_AGRIF_CMEMS_2020   mk 
         4^/utils/tools_AGRIF_CMEMS_2020      tools 
         5^/vendors/AGRIF/CMEMS_2020          ext/AGRIF 
         6^/vendors/FCM                       ext/FCM 
         7^/vendors/IOIPSL                    ext/IOIPSL 
  • utils/tools/maketools

    r10081 r10082  
    164164#- 
    165165#- Compile --- 
     166 
    166167if [ "${NBR_PRC}" -gt 0 ]; then 
    167168cd ${NEMO_TDIR}/${NEW_CONF} || cd - 
    168169 
    169 if [ "${NEW_CONF}" == NESTING_AGRIF ]; then 
    170 AGRIFUSE=1 
    171 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 3 
    172  
    173  
    174 fcm build --ignore-lock -j 1 ${COMPIL_DIR}/bld_preproagr_tools.cfg ||{ cd - ; exit 1 ;} 
    175  
    176  
    177 fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_nesting.cfg || cd - 
    178 else 
    179170fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd - 
    180 fi 
    181  
    182171if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then 
    183172for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe` 
Note: See TracChangeset for help on using the changeset viewer.