Changeset 4785 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE

Timestamp:

2014-09-24T14:03:02+02:00 (10 years ago)

Author:

rblod

Message:

dev_r4765_CNRS_agrif: First update of AGRIF for dynamic only (_flt and _ts), see ticket #1380 and associated wiki page

Location:

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE

Files:

• Fprep_agrif.sh (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• bld_preproagr.cfg (modified) (1 diff)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/Fprep_agrif.sh

@@ -57 +57 @@
 #- AGRIF conv
 if [ "$AGRIFUSE" == 1 ]; then
+#-MPI for AGRIF
+if [ ! -f ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h ];then
+   echo '#if defined key_mpp_mpi' > ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+   echo '#define AGRIF_MPI'      >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+   echo '#endif'                 >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+fi
 
-#- CONV
-#fcm build ${TOOLS_DIR}/conv.cfg || exit 1
-gmake -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
+ #- CONV
+ #fcm build ${TOOLS_DIR}/conv.cfg || exit 1
+COMPILER=${CC-cc}
+gmake CC=${COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
 
 #- AGRIF sources

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/bld.cfg

@@ -39 +39 @@
 bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/OPAFILES/inc
 bld::tool::fppflags::ioipsl    %FPPFLAGS
-bld::tool::fppflags::agrif     %FPPFLAGS
+bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
 
 # Ignore the following dependencies

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/TOOLS/COMPILE/bld_preproagr.cfg

@@ -56 +56 @@
 bld::excl_dep       use::ioipsl
 bld::excl_dep       use::xios
+bld::excl_dep        use::agrif_grids
 bld::excl_dep       use::agrif_types
 bld::excl_dep       use::agrif_util