Changeset 15758 for utils

Timestamp:

2022-03-18T11:56:14+01:00 (2 years ago)

Author:

smueller

Message:

Prototypal incorporation of PSyclone processing in the NEMO build system

Location:

utils/build

Files:

• dev_r4.0.4_makenemo_PSyclone (modified) (5 diffs)
• dev_r4.0.4_mk_PSyclone/Fmake_bld.sh (modified) (1 diff)
• dev_r4.0.4_mk_PSyclone/bld.cfg (modified) (2 diffs)
• dev_r4.0.4_mk_PSyclone/bldxag.cfg (modified) (2 diffs)

utils/build/dev_r4.0.4_makenemo_PSyclone

@@ -88 +88 @@
 x_u=''; x_a=''; x_m=''; x_t='';
 x_c='';
-x_j='1'; x_e='none'; x_s='src'; x_v='1'
+x_j='1'; x_e='none'; x_s='src'; x_v='1'; x_A=''
 
 ##- Local variables ---
@@ -113 +113 @@
 #-
 #- Choice of the options ---
-while getopts :hd:n:r:u:a:m:j:e:s:v:t:k: option; do
+while getopts :hd:n:r:u:a:m:j:e:s:v:t:k:A: option; do
 
    case $option in
@@ -140 +140 @@
    -t    Path for alter build  location (default: 'BLD' in configuration folder)
    -v    Level of verbosity ([0-3])
+   -A    Enable additional pre-processing ('none' by default or 'PSyclone')
 
 Examples
@@ -155 +156 @@
       ('a') x_a=${OPTARG};; ('m') x_m=${OPTARG};; ('j') x_j=${OPTARG};; ('t') x_t=${OPTARG};;
       ('e') x_e=${OPTARG};; ('s') x_s=${OPTARG};; ('v') x_v=${OPTARG}                      ;;
-      ('k') chk_key=${OPTARG}                                                              ;;
+      ('k') chk_key=${OPTARG};; ('A') x_A=${OPTARG}                                        ;;
       (':') echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;   exit 2             ;;
       ('?') echo ${b_n}" : -"${OPTARG}" option : not supported" 1>&2;   exit 2             ;;
@@ -190 +191 @@
 TML_CONF=${REF_CONF}
 export NEMO_DIR=${MAIN_DIR}/${x_s}
+FPP_EXTRA='none'; [ "${x_A}" == 'PSyclone' ] && FPP_EXTRA='PSyclone'
+export FPP_EXTRA
 
 [ "${CMP_NAM}" == 'all' ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit

utils/build/dev_r4.0.4_mk_PSyclone/Fmake_bld.sh

@@ -58 +58 @@
 #
 #-
-[ ! -d ${3}/${2}     ] && \mkdir ${3}/${2}
+[ ! -d ${3}/${2}     ] && \mkdir -p ${3}/${2}
 [ ! -d ${3}/${2}/BLD ] && \mkdir ${3}/${2}/BLD
-[ ! -d ${1}/${2}/BLD ] && ln -sf ${3}/${2}/BLD ${1}/${2}/BLD
+[ ! -d ${1}/${2}/BLD -o -h ${1}/${2}/BLD ] && ln -sf ${3}/${2}/BLD ${1}/${2}/
 [ -f ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ] && ln -sf ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ${COMPIL_DIR}/cpp.fcm
 rm -f  ${1}/${NEW_CONF}/BLD/fcm.bld.lock

utils/build/dev_r4.0.4_mk_PSyclone/bld.cfg

@@ -25 +25 @@
 
 bld::tool::cpp       %CPP
-bld::tool::fpp       %CPP
+bld::tool::fpp       ${COMPIL_DIR}/../mk_psyclone/fpp_wrapper.sh %CPP
 bld::tool::fc        %FC 
 bld::tool::fflags    %FCFLAGS %USER_INC
@@ -39 +39 @@
 bld::pp::nemo     1
 bld::pp::agrif    1
-bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$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::nemo      ${FPP_EXTRA} %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc
+bld::tool::fppflags::ioipsl    none %FPPFLAGS
+bld::tool::fppflags::agrif     none %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
 
 # Ignore the following dependencies

utils/build/dev_r4.0.4_mk_PSyclone/bldxag.cfg

@@ -24 +24 @@
 
 bld::tool::cpp       %CPP
-bld::tool::fpp       %CPP
+bld::tool::fpp       ${COMPIL_DIR}/../mk_psyclone/fpp_wrapper.sh %CPP
 bld::tool::fc        %FC 
 bld::tool::fflags    %FCFLAGS %USER_INC
@@ -36 +36 @@
 bld::pp::ioipsl   1
 bld::pp::nemo     1
-bld::tool::fppflags::nemo     %FPPFLAGS
-bld::tool::fppflags::ioipsl   %FPPFLAGS
+bld::tool::fppflags::nemo     ${FPP_EXTRA} %FPPFLAGS
+bld::tool::fppflags::ioipsl   none %FPPFLAGS
 
 # Ignore the following dependencies