Changeset 2815 for branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/CONFIG/makenemo

Timestamp:

2011-07-28T19:00:06+02:00 (13 years ago)

Author:

rblod

Message:

branch dev_r2802_LOCEAN10_agrif_lim2: avoid to recompile everything with key_agrif, allow parallel compilation with agrif etc

File:

• branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/CONFIG/makenemo (modified) (3 diffs)

branches/2011/dev_r2802_LOCEAN10_agrif_lim/NEMOGCM/CONFIG/makenemo

@@ -90 +90 @@
 export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE
 export NEMO_DIR=${MAIN_DIR}/NEMO
-export AGRIFUSE=10
+export AGRIFUSE=""
 
 declare -a TAB
@@ -269 +269 @@
 
 #- We look after agrif
-grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/}
+grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE="WITH_AGRIF" && export USEBLD=${USEBLD/xag/}
 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit
 
@@ -284 +284 @@
 if [ "${NBR_PRC}" -gt 0 ]; then
     cd ${NEMO_TDIR}/${NEW_CONF} || cd -
-
-#if AGRIF we do a first preprocessing
-    if [ ${#x_c} -eq 0 ]; then
-        [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD
-        [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/*
-    fi
     fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd -
     [ -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