Changeset 2384 for branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/agrifpp2.sh

Timestamp:

2010-11-15T04:20:07+01:00 (13 years ago)

Author:

rblod

Message:

Modifications to compile agrif correctly(?) in the beta

File:

• branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/agrifpp2.sh (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/agrifpp.sh) (4 diffs)

branches/nemo_v3_3_beta/NEMOGCM/TOOLS/COMPILE/agrifpp2.sh

@@ -7 +7 @@
 #
 
-# ==========
-# agrifpp.sh
-# ==========
+# ===========
+# agrifpp2.sh
+# ===========
 #
 # ----------------------------
@@ -20 +20 @@
 # ::
 #
-#  $ agrifpp.sh
+#  $ agrifpp2.sh
 #
 #
@@ -34 +34 @@
 # ::
 #
-#  $ ./agrifpp.sh 1 -Dkey
+#  $ ./agrifpp2.sh 1 -Dkey
 # 
 #  or
 #
-#  $ ./agrifpp.sh -Dkey
+#  $ ./agrifpp2.sh -Dkey
 #
 # TODO
@@ -62 +62 @@
    FPP_OPT=` echo $* |awk '{  for (i=1 ; i<NF ; i++ )  { printf " %s",  $i } }'`
 
+[ ! -d ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC ] && mkdir  ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC
 
-   if [ "${MYFILE}" != "par_oce.F90" -a  ! -f ${NEMO_TDIR}/${NEW_CONF}}/OPAFILES/param_done ]; then
-      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}/OPAFILES/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile par_oce.F90 > /dev/null )
-      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 ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC ${MYFILE}
-      exit
-   fi
-
-   if [ "${MYFILE}" == agrif2model.F90 ]; then
-      cpp  -I${NEMO_TDIR}/${NEW_CONF}/OPAFILES/AGRIF_INC $@
-      exit
-   fi 
-
-   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}/OPAFILES/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 ${FPP_OPT} -IOPAFILES/AGRIF_INC OPAFILES/${MYFILE} 
+   ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/conv ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/agrif_opa.in -rm -comdirin ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/ -comdirout ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/AGRIF_MODELFILES/ -convfile ${MYFILE}   > /dev/null
+   cpp ${FPP_OPT} -I${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/BLD1/ppsrc/nemo/AGRIF_INC ${NEMO_TDIR}/${NEW_CONF}/BLD/OPAFILES/AGRIF_MODELFILES/${MYFILE} 
 else
    shift
    cpp $@
 fi
-