Changeset 2016

Timestamp:

2010-07-20T18:37:45+02:00 (14 years ago)

Author:

rblod

Message:

Come back to an old fashion makefile to compile the conv without FCM on FCM branch

Location:

branches/DEV_r1879_FCM/NEMOGCM/TOOLS

Files:

• Fprep_agrif.sh (modified) (2 diffs)
• agrifpp.sh (modified) (2 diffs)
• conv.cfg (modified) (1 diff)

branches/DEV_r1879_FCM/NEMOGCM/TOOLS/Fprep_agrif.sh

@@ -60 +60 @@
 
 #- CONV
-[ ! -d $2/$1/AGRIFLIB ] && mkdir -p $2/$1/AGRIFLIB
-fcm build ${TOOLS_DIR}/conv.cfg || exit 1
+#fcm build ${TOOLS_DIR}/conv.cfg || exit 1
+gmake -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
 
 #- AGRIF sources
@@ -68 +68 @@
 [ ! -d $2/$1/OPAFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/OPAFILES/AGRIF_MODELFILES
 cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_opa.in  $2/$1/OPAFILES/
+cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/OPAFILES/
 
 fi

branches/DEV_r1879_FCM/NEMOGCM/TOOLS/agrifpp.sh

@@ -67 +67 @@
    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}/AGRIFLIB/bin/conv agrif_opa.in -rm -comdirin ./ -comdirout AGRIF_MODELFILES/ -convfile par_oce.F90 > /dev/null )
+      (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
@@ -82 +82 @@
 
    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}/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}

branches/DEV_r1879_FCM/NEMOGCM/TOOLS/conv.cfg

@@ -1 +1 @@
 # ----------------------- FCM extract configuration file -----------------------
+# template to compile agrif conv, currently not used
 cfg::type                           bld
 cfg::version                        1.0