Changeset 2437


Ignore:
Timestamp:
2010-11-26T13:10:15+01:00 (10 years ago)
Author:
rblod
Message:

Fix agrif execution problem by reverting changeset 2384

Location:
branches/nemo_v3_3_beta/NEMOGCM
Files:
1 added
8 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo

    r2409 r2437  
    270270 
    271271#- and test whether we need to build the ioserver 
    272 if [ "$AGRIFUSE" == 1 ]; then 
    273 export USEBLD=bld_afterconvxio.cfg 
    274 grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld_afterconv.cfg 
    275 else 
    276272export USEBLD=bldxio.cfg 
    277273grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld.cfg 
    278 fi 
    279274 
    280275#- 
     
    287282if [ "${NBR_PRC}" -gt 0 ]; then 
    288283    cd ${NEMO_TDIR}/${NEW_CONF} || cd - 
     284 
     285#if AGRIF we do a first preprocessing 
    289286    if [ ${#x_c} -eq 0 ]; then 
    290        if [ "$AGRIFUSE" == 1 ]; then 
    291      fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif1.cfg 
    292      fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif2.cfg 
    293           touch ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/* 
    294      fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif2.cfg 
    295      fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif3.cfg 
    296        fi 
    297        fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 
    298        [ -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 
    299        [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe 
    300     else  
    301    rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK 
    302    rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD 
    303    rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa 
    304    rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/server.exe 
    305    echo "cleaning ${NEW_CONF} WORK, BLD" 
     287        [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD 
     288        [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/* 
    306289    fi 
    307 fi 
    308  
    309 #- 
     290    fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 
     291    [ -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 
     292    [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe 
     293 
     294#add remove for clean option 
     295    if  [ ${#x_c} -ne 0 ]; then 
     296        rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK 
     297        rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD 
     298        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa 
     299        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/server.exe 
     300        echo "cleaning ${NEW_CONF} WORK, BLD" 
     301    fi 
     302 
     303fi 
     304 
    310305#- Come back to original directory --- 
    311306cd - 
  • branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

    r2384 r2437  
    6363 
    6464#- AGRIF sources 
    65 [ ! -d $2/$1/BLD/OPAFILES ] && mkdir  $2/$1/BLD/OPAFILES 
    66 [ ! -d $2/$1/BLD/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/BLD/OPAFILES/AGRIF_MODELFILES 
    67 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/BLD/OPAFILES/ 
    68 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/BLD/OPAFILES/ 
     65[ ! -d $2/$1/OPAFILES ] && mkdir  $2/$1/OPAFILES 
     66[ ! -d $2/$1/OPAFILES/AGRIF_INC ] && mkdir  $2/$1/OPAFILES/AGRIF_INC 
     67[ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/OPAFILES/AGRIF_MODELFILES 
     68cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/OPAFILES/ 
     69cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/ 
    6970 
    7071fi 
  • branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/bld.cfg

    r2384 r2437  
    5454bld::pp::nemo     1 
    5555bld::pp::agrif    1 
    56 bld::tool::fpp       cpp 
    57 bld::tool::fppflags::nemo %FPPFLAGS 
    58 bld::tool::fppflags::xmlio    %FPPFLAGS 
    59 bld::tool::fppflags::ioserver %FPPFLAGS 
    60 bld::tool::fppflags::ioipsl    %FPPFLAGS 
    61 bld::tool::fppflags::agrif    %FPPFLAGS 
     56bld::tool::fpp       $COMPIL_DIR/agrifpp.sh 
     57bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 
     58bld::tool::fppflags::xmlio    0 %FPPFLAGS 
     59bld::tool::fppflags::ioserver 0 %FPPFLAGS 
     60bld::tool::fppflags::ioipsl   0 %FPPFLAGS 
     61bld::tool::fppflags::agrif    0 %FPPFLAGS 
    6262 
    6363# Ignore the following dependencies 
  • branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/bldxio.cfg

    r2384 r2437  
    3737bld::pp::nemo     1 
    3838bld::pp::agrif    1 
    39 bld::tool::fpp     cpp 
    40 bld::tool::fppflags::nemo %FPPFLAGS 
    41 bld::tool::fppflags::ioipsl    %FPPFLAGS 
    42 bld::tool::fppflags::agrif    %FPPFLAGS 
     39bld::tool::fpp       $COMPIL_DIR/agrifpp.sh 
     40bld::tool::fppflags::nemo ${AGRIFUSE} %FPPFLAGS 
     41bld::tool::fppflags::ioipsl   0 %FPPFLAGS 
     42bld::tool::fppflags::agrif    0 %FPPFLAGS 
    4343 
    4444# Ignore the following dependencies 
Note: See TracChangeset for help on using the changeset viewer.