From c5ba3101976e46981859077f4502b1d04184941b Mon Sep 17 00:00:00 2001
From: Guillaume S <gsamson@mercator-ocean.fr>
Date: Wed, 10 Aug 2022 15:57:20 +0200
Subject: [PATCH] set correct directory variables for AGRIF
---
mk/agrifpp.sh | 4 ++--
mk/bld.cfg | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mk/agrifpp.sh b/mk/agrifpp.sh
index 32f63a440..308125ce8 100755
--- a/mk/agrifpp.sh
+++ b/mk/agrifpp.sh
@@ -60,8 +60,8 @@ if [ "$MYFILE" == "agrif2model.f90" ];then
if [ -d ${MYDIR}/${NEW_CONF}/WORK ]; then
\cp ${MYDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
else
- \cp ${MYDIR}/${NEW_CONF}/src/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
+ \cp ${CONFIG_DIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
fi
else
cd ${MYDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${MYDIR}/${NEW_CONF}/NEMOFILES/conv ${MYDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${MYDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${MYDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null
-fi
\ No newline at end of file
+fi
diff --git a/mk/bld.cfg b/mk/bld.cfg
index 1e596ae79..67352be6c 100644
--- a/mk/bld.cfg
+++ b/mk/bld.cfg
@@ -14,7 +14,7 @@ search_src 1
src::ioipsl $MAIN_DIR/ext/IOIPSL/src
src::agrif $MAIN_DIR/ext/AGRIF/AGRIF_FILES
-src::nemo $CONFIG_DIR/$NEW_CONF/NEMOFILES/obj
+src::nemo $NEMO_TDIR/$NEW_CONF/NEMOFILES/obj
src::ppr_1d $MAIN_DIR/ext/PPR/src
@@ -41,7 +41,7 @@ bld::pp::ioipsl 1
bld::pp::nemo 1
bld::pp::agrif 1
bld::pp::ppr_1d 1
-bld::tool::fppflags::nemo %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc
+bld::tool::fppflags::nemo %FPPFLAGS -I$NEMO_TDIR/$NEW_CONF/NEMOFILES/inc
bld::tool::fppflags::ioipsl %FPPFLAGS
bld::tool::fppflags::agrif %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
bld::tool::fppflags::ppr_1d %FPPFLAGS
--
GitLab