Changeset 9598 for NEMO/trunk/mk/Fprep_agrif.sh

Timestamp:

2018-05-16T00:47:16+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Reorganisation plan for NEMO repository: changes to make compilation succeed with new structure
Juste one issue left with AGRIF_NORDIC with AGRIF preprocessing
Standardisation of routines header with version 4.0 and year 2018
Fix for some broken symlinks

Location:

NEMO/trunk/mk

Files:

• . (modified) (1 prop)
• Fprep_agrif.sh (modified) (3 diffs)

NEMO/trunk/mk/Fprep_agrif.sh

@@ -58 +58 @@
 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
+if [ ! -f ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h ];then
+   echo '#if defined key_mpp_mpi' > ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+   echo '#define AGRIF_MPI'      >> ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+   echo '#endif'                 >> ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
 fi
 
@@ -67 +67 @@
 fcm build ${COMPIL_DIR}/conv.cfg || exit 1
 #C_COMPILER=${CC-cc}
-#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
+#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/ext/AGRIF/LIB
 
 #- AGRIF sources
@@ -73 +73 @@
 [ ! -d $2/$1/NEMOFILES/AGRIF_INC ] && mkdir  $2/$1/NEMOFILES/AGRIF_INC
 [ ! -d $2/$1/NEMOFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/NEMOFILES/AGRIF_MODELFILES
-cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_oce.in  $2/$1/NEMOFILES/
-#cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/NEMOFILES/
+cp -f -r ${MAIN_DIR}/ext/AGRIF/agrif_oce.in  $2/$1/NEMOFILES/
+#cp -f -r ${MAIN_DIR}/ext/AGRIF/conv  $2/$1/NEMOFILES/
 cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/NEMOFILES/