Changeset 2010 for branches/DEV_r1879_FCM/NEMOGCM/TOOLS/agrifpp.sh

Timestamp:

2010-07-13T22:54:34+02:00 (14 years ago)

Author:

rblod

Message:

Fix somme pre-processing issues with IBM on branch FCM

File:

• branches/DEV_r1879_FCM/NEMOGCM/TOOLS/agrifpp.sh (modified) (2 diffs)

branches/DEV_r1879_FCM/NEMOGCM/TOOLS/agrifpp.sh

@@ -6 +6 @@
 #+
 #
+#inc $MAIN_DIR/TOOLS/arch.fcm
+
 # ==========
 # agrifpp.sh
@@ -63 +65 @@
 
 
-   MYFILE=`echo $* |awk -F" " '{print $NF}' `
    if [ "${MYFILE}" != "par_oce.F90" -a  ! -f ${NEMO_TDIR}/${NEW_CONF}}/OPAFILES/param_done ]; then
-      cpp -P -C -traditional  ${FPP_OPT} ${CONFIG_DIR}/${NEW_CONF}/WORK/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90
+      cpp ${FPP_OPT} ${CONFIG_DIR}/${NEW_CONF}/WORK/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90
       (cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES ; ${NEMO_TDIR}/${NEW_CONF}/AGRIFLIB/bin/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile par_oce.F90 > /dev/null )
-      cpp -P -C -traditional  -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC  ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_MODELFILES/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90
+      cpp ${FPP_OPT}  -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC  ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_MODELFILES/par_oce.F90 > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/par_oce.F90
       touch ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done
    elif  [ "${MYFILE}" == "par_oce.F90" -a -f ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/param_done ] ; then
       cd  ${NEMO_TDIR}/${NEW_CONF}/OPAFILES
-      cpp -P -C -traditional -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${MYFILE}
+      cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${MYFILE}
       exit
    fi
 
    if [ "${MYFILE}" == agrif2model.F90 ]; then
-      cpp  -P -C -traditional -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@
+      cpp  -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@
       exit
    fi 
 
-   cpp   -P -traditional -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/${MYFILE}
+   cpp  -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@ > ${NEMO_TDIR}/${NEW_CONF}/OPAFILES/${MYFILE}
    ( cd ${NEMO_TDIR}/${NEW_CONF}/OPAFILES ; ${NEMO_TDIR}/${NEW_CONF}/AGRIFLIB/bin/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile ${MYFILE} > /dev/null )
    cd  ${NEMO_TDIR}/${NEW_CONF}
    mv -f OPAFILES/AGRIF_MODELFILES/${MYFILE} OPAFILES/${MYFILE}
-   cpp  -P -C -traditional -IOPAFILES/AGRIF_INC OPAFILES/${MYFILE} 
+   cpp ${FPP_OPT} -IOPAFILES/AGRIF_INC OPAFILES/${MYFILE} 
 else
    shift
-   cpp -P -C -traditional $@
+   cpp $@
 fi