Resolve "DOMAINcfg + AGRIF not compiling anymore with main branch"

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

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   

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