Changeset 13055 for utils

Timestamp:

2020-06-07T12:44:20+02:00 (4 years ago)

Author:

rblod

Message:

ticket #2129 : capability to compile tools (domaincfg) with key_agrif

Location:

utils

Files:

• build/mk/agrifpp.sh (modified) (1 diff)
• build/mk/bld_preproagr.cfg (modified) (1 diff)
• build/mk/bld_preproagr_tools.cfg (added)
• build/mk/bld_tools.cfg (modified) (3 diffs)
• build/mk/bldxag_tools.cfg (added)
• tools_dev_r12970_AGRIF_CMEMS/maketools (modified) (2 diffs)

utils/build/mk/agrifpp.sh

@@ -55 +55 @@
 #
 #-
-MYFILE=$(basename "$1")
+MYDIR=$1
+MYFILE=$(basename "$2")
 if [ "$MYFILE" == "agrif2model.f90" ];then
-   \cp ${NEMO_TDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
+   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
+   fi   
 else
-cd ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/conv ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null 
+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

utils/build/mk/bld_preproagr.cfg

@@ -21 +21 @@
 bld::tool::fc_compile
 bld::tool::fc_include
-bld::tool::fc        $COMPIL_DIR/agrifpp.sh 
+bld::tool::fc        $COMPIL_DIR/agrifpp.sh ${NEMO_TDIR}
 bld::tool::fflags    
 bld::tool::ld       

utils/build/mk/bld_tools.cfg

@@ -13 +13 @@
 search_src           1
 
-src::nemo            $TOOLS_DIR/$NEW_CONF/src
+src::agrif           $MAIN_DIR/ext/AGRIF/AGRIF_FILES
+src::nemo            $TOOLS_DIR/$NEW_CONF/NEMOFILES/obj
+
+
+bld::target  make_domain_cfg.exe
+bld::exe_dep
+
 
 dir::root            $TOOLS_DIR/$NEW_CONF/BLD
+
 
 bld::tool::cpp       %CPP
@@ -29 +36 @@
 # Pre-process code before analysing dependencies
 bld::pp::nemo     1
+bld::pp::agrif    1
 bld::tool::fppflags::nemo      %FPPFLAGS -I$TOOLS_DIR/$NEW_CONF/NEMOFILES/inc
+bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+
+
+
 
 # Ignore the following dependencies
@@ -41 +53 @@
 bld::excl_dep        use::mod_oasis
 
+
+
 # Don't generate interface files
 bld::tool::geninterface none

utils/tools_dev_r12970_AGRIF_CMEMS/maketools

@@ -159 +159 @@
 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp_tools.fcm ${CMP_NAM} || exit
 
+#- At this stage the configuration has beeen chosen
+#- We coose the default light file
+export USEBLD=bldxag_tools.cfg
+
+#- We look after agrif
+grep key_agrif ${COMPIL_DIR}/cpp_tools.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/}
+
+. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${TOOLS_DIR} || exit 3
+
+
 #-
 #_ END OF CONFIGURATION PHASE
@@ -167 +177 @@
 
 if [ "${NBR_PRC}" -gt 0 ]; then
-cd ${NEMO_TDIR}/${NEW_CONF} || cd -
-
-fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd -
-if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then
-for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe`
-   do
-      ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/.
-   done
-fi
+cd ${TOOLS_DIR}/${NEW_CONF} || cd -
+
+   ## if AGRIF we do a first preprocessing
+   if [[ ${#x_c} -eq 0 && "$AGRIFUSE" -eq 1 ]]; then
+      fcm build --ignore-lock -j 1 ${COMPIL_DIR}/bld_preproagr_tools.cfg ||{ cd - ; exit 1 ;}
+      echo ''
+      echo "---------------------------------"
+      echo "CONV preprocessing successfull !!"
+      echo "---------------------------------"
+      echo ''
+   fi
+
+   fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/${USEBLD} || cd -
+   if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then
+      for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe`
+      do
+         ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/.
+      done
+   fi
 fi
 #-