From 0ca323fd2337ebbb3dce9dc1e6812d5e38ad7db9 Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@mercator-ocean.fr>
Date: Tue, 7 Feb 2023 09:31:07 +0000
Subject: [PATCH] Resolve "DOMAINcfg + AGRIF not compiling anymore with main
branch"
---
mk/agrifpp.sh | 8 +++++---
mk/bld_preproagr_tools.cfg | 6 +++---
tools/maketools | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/mk/agrifpp.sh b/mk/agrifpp.sh
index 5ff5bcdb..622c3e64 100755
--- a/mk/agrifpp.sh
+++ b/mk/agrifpp.sh
@@ -58,11 +58,13 @@ MYDIR=$1
MYFILE=$(basename "$2")
if [ "$MYFILE" == "agrif2model.f90" ];then
+ # generic case
if [ -d ${MYDIR}/WORK ]; then
- \cp ${MYDIR}//WORK/${MYFILE/.f90/.F90} ${MYDIR}/NEMOFILES/obj/$MYFILE
- else
\cp ${MYDIR}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/NEMOFILES/obj/$MYFILE
- fi
+ # DOMAINcfg case
+ elif [ -d ${MYDIR}/src ]; then
+ \cp ${MYDIR}/src/${MYFILE/.f90/.F90} ${MYDIR}/NEMOFILES/obj/$MYFILE
+ fi
else
cd ${MYDIR}/NEMOFILES/ppsrc/nemo ; ${MYDIR}/NEMOFILES/conv ${MYDIR}/NEMOFILES/agrif_oce.in -rm -incdir ${MYDIR}/NEMOFILES/inc -comdirout ${MYDIR}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null
fi
diff --git a/mk/bld_preproagr_tools.cfg b/mk/bld_preproagr_tools.cfg
index 32cd0956..fd2ea09c 100644
--- a/mk/bld_preproagr_tools.cfg
+++ b/mk/bld_preproagr_tools.cfg
@@ -12,16 +12,16 @@ inc TOOLS_DIR/CUR_CONF/BLD/cpp_tools.fcm
search_src 1
-src::nemo TOOLS_DIR/CUR_CONF/src
+src::nemo TOOLS_DIR/CUR_CONF/src
bld::target make_domain_cfg.f90 agrif_user.f90 agrif2model.f90
-dir::root TOOLS_DIR/CUR_CONF/NEMOFILES
+dir::root TOOLS_DIR/CUR_CONF/NEMOFILES
bld::tool::fc_output
bld::tool::fc_compile
bld::tool::fc_include
-bld::tool::fc COMPIL_DIR/agrifpp.sh TOOLS_DIR
+bld::tool::fc COMPIL_DIR/agrifpp.sh TOOLS_DIR/CUR_CONF
bld::tool::fflags
bld::tool::ld
bld::tool::ldflags
diff --git a/tools/maketools b/tools/maketools
index 33ed7352..f43aac9f 100755
--- a/tools/maketools
+++ b/tools/maketools
@@ -172,9 +172,9 @@ if [ "${NBR_PRC}" -gt 0 ]; then
${COMPIL_DIR}/Fprep_agrif.sh ${MAIN_DIR} ${TOOLS_DIR}/${CUR_CONF} || exit 3
# compile & copy conv
- sed -e "s~MAIN_DIR~${MAIN_DIR}~; s~NEMO_TDIR~${NEMO_TDIR}~; s~CUR_CONF~${CUR_CONF}~; s~COMPIL_DIR~${COMPIL_DIR}~" ${COMPIL_DIR}/conv.cfg > ${NEMO_TDIR}/${CUR_CONF}/BLD/conv.cfg
+ sed -e "s~MAIN_DIR~${MAIN_DIR}~; s~NEMO_TDIR~${NEMO_TDIR}~; s~CUR_CONF~${CUR_CONF}~; s~COMPIL_DIR~${COMPIL_DIR}~; s~arch_nemo~arch_tools~" ${COMPIL_DIR}/conv.cfg > ${NEMO_TDIR}/${CUR_CONF}/BLD/conv.cfg
fcm build ${NEMO_TDIR}/${CUR_CONF}/BLD/conv.cfg || exit 1
- cp -fa ${MAIN_DIR}/ext/AGRIF/agrif_oce.in $2/$1/AGRIFLIB/bin/conv ${NEMO_TDIR}/${CUR_CONF}/NEMOFILES/.
+ cp -fa ${MAIN_DIR}/ext/AGRIF/agrif_oce.in ${NEMO_TDIR}/${CUR_CONF}/AGRIFLIB/bin/conv ${NEMO_TDIR}/${CUR_CONF}/NEMOFILES/.
sed -e "s~MAIN_DIR~${MAIN_DIR}~; s~TOOLS_DIR~${TOOLS_DIR}~; s~CUR_CONF~${CUR_CONF}~; s~COMPIL_DIR~${COMPIL_DIR}~" ${COMPIL_DIR}/bld_preproagr_tools.cfg > ${NEMO_TDIR}/${CUR_CONF}/BLD/bld_preproagr_tools.cfg
fcm build --ignore-lock -j 1 ${NEMO_TDIR}/${CUR_CONF}/BLD/bld_preproagr_tools.cfg || exit 1
--
GitLab