Changeset 2437 for branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo

Timestamp:

2010-11-26T13:10:15+01:00 (13 years ago)

Author:

rblod

Message:

Fix agrif execution problem by reverting changeset 2384

File:

• branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo

@@ -270 +270 @@
 
 #- and test whether we need to build the ioserver
-if [ "$AGRIFUSE" == 1 ]; then
-export USEBLD=bld_afterconvxio.cfg
-grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld_afterconv.cfg
-else
 export USEBLD=bldxio.cfg
 grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld.cfg
-fi
 
 #-
@@ -287 +282 @@
 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
-       if [ "$AGRIFUSE" == 1 ]; then
-     fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif1.cfg
-     fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif2.cfg
-          touch ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/*
-     fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif2.cfg
-     fcm build --ignore-lock -s 2 -j ${NBR_PRC} ${COMPIL_DIR}/bld_agrif3.cfg
-       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
-       [ -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
-    else 
-   rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
-   rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
-   rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa
-   rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/server.exe
-   echo "cleaning ${NEW_CONF} WORK, BLD"
+        [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD
+        [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/*
     fi
-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
+    [ -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
+
+#add remove for clean option
+    if  [ ${#x_c} -ne 0 ]; then
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa
+        rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/server.exe
+        echo "cleaning ${NEW_CONF} WORK, BLD"
+    fi
+
+fi
+
 #- Come back to original directory ---
 cd -