New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 15758 – NEMO

Changeset 15758


Ignore:
Timestamp:
2022-03-18T11:56:14+01:00 (19 months ago)
Author:
smueller
Message:

Prototypal incorporation of PSyclone processing in the NEMO build system

Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/NERC/dev_r4.0.4_MEDUSA_PSyclone

    • Property svn:externals

      •  

        old new  
        11^/utils/build/arch@12130      arch 
        2 ^/utils/build/makenemo@12191  makenemo 
        3 ^/utils/build/mk@11662        mk 
         2^/utils/build/dev_r4.0.4_makenemo_PSyclone  makenemo 
         3^/utils/build/dev_r4.0.4_mk_PSyclone        mk 
        44^/utils/tools_r4.0-HEAD@12672 tools 
        55^/vendors/AGRIF/dev@10586     ext/AGRIF 

  • utils/build/dev_r4.0.4_makenemo_PSyclone

    r15757 r15758  
    8888x_u=''; x_a=''; x_m=''; x_t=''; 
    8989x_c=''; 
    90 x_j='1'; x_e='none'; x_s='src'; x_v='1' 
     90x_j='1'; x_e='none'; x_s='src'; x_v='1'; x_A='' 
    9191 
    9292##- Local variables --- 
    … …  
    113113#- 
    114114#- Choice of the options --- 
    115 while getopts :hd:n:r:u:a:m:j:e:s:v:t:k: option; do 
     115while getopts :hd:n:r:u:a:m:j:e:s:v:t:k:A: option; do 
    116116 
    117117   case $option in 
    … …  
    140140   -t    Path for alter build  location (default: 'BLD' in configuration folder) 
    141141   -v    Level of verbosity ([0-3]) 
     142   -A    Enable additional pre-processing ('none' by default or 'PSyclone') 
    142143 
    143144Examples 
    … …  
    155156      ('a') x_a=${OPTARG};; ('m') x_m=${OPTARG};; ('j') x_j=${OPTARG};; ('t') x_t=${OPTARG};; 
    156157      ('e') x_e=${OPTARG};; ('s') x_s=${OPTARG};; ('v') x_v=${OPTARG}                      ;; 
    157       ('k') chk_key=${OPTARG}                                                              ;; 
     158      ('k') chk_key=${OPTARG};; ('A') x_A=${OPTARG}                                        ;; 
    158159      (':') echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;   exit 2             ;; 
    159160      ('?') echo ${b_n}" : -"${OPTARG}" option : not supported" 1>&2;   exit 2             ;; 
    … …  
    190191TML_CONF=${REF_CONF} 
    191192export NEMO_DIR=${MAIN_DIR}/${x_s} 
     193FPP_EXTRA='none'; [ "${x_A}" == 'PSyclone' ] && FPP_EXTRA='PSyclone' 
     194export FPP_EXTRA 
    192195 
    193196[ "${CMP_NAM}" == 'all' ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit 

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

    r9651 r15758  
    5858# 
    5959#- 
    60 [ ! -d ${3}/${2}     ] && \mkdir ${3}/${2} 
     60[ ! -d ${3}/${2}     ] && \mkdir -p ${3}/${2} 
    6161[ ! -d ${3}/${2}/BLD ] && \mkdir ${3}/${2}/BLD 
    62 [ ! -d ${1}/${2}/BLD ] && ln -sf ${3}/${2}/BLD ${1}/${2}/BLD 
     62[ ! -d ${1}/${2}/BLD -o -h ${1}/${2}/BLD ] && ln -sf ${3}/${2}/BLD ${1}/${2}/ 
    6363[ -f ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ] && ln -sf ${1}/${NEW_CONF}/cpp_${NEW_CONF}.fcm ${COMPIL_DIR}/cpp.fcm 
    6464rm -f  ${1}/${NEW_CONF}/BLD/fcm.bld.lock 

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

    r9598 r15758  
    2525 
    2626bld::tool::cpp       %CPP 
    27 bld::tool::fpp       %CPP 
     27bld::tool::fpp       ${COMPIL_DIR}/../mk_psyclone/fpp_wrapper.sh %CPP 
    2828bld::tool::fc        %FC  
    2929bld::tool::fflags    %FCFLAGS %USER_INC 
    … …  
    3939bld::pp::nemo     1 
    4040bld::pp::agrif    1 
    41 bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc 
    42 bld::tool::fppflags::ioipsl    %FPPFLAGS 
    43 bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h 
     41bld::tool::fppflags::nemo      ${FPP_EXTRA} %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc 
     42bld::tool::fppflags::ioipsl    none %FPPFLAGS 
     43bld::tool::fppflags::agrif     none %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h 
    4444 
    4545# Ignore the following dependencies 

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

    r9598 r15758  
    2424 
    2525bld::tool::cpp       %CPP 
    26 bld::tool::fpp       %CPP 
     26bld::tool::fpp       ${COMPIL_DIR}/../mk_psyclone/fpp_wrapper.sh %CPP 
    2727bld::tool::fc        %FC  
    2828bld::tool::fflags    %FCFLAGS %USER_INC 
    … …  
    3636bld::pp::ioipsl   1 
    3737bld::pp::nemo     1 
    38 bld::tool::fppflags::nemo     %FPPFLAGS 
    39 bld::tool::fppflags::ioipsl   %FPPFLAGS 
     38bld::tool::fppflags::nemo     ${FPP_EXTRA} %FPPFLAGS 
     39bld::tool::fppflags::ioipsl   none %FPPFLAGS 
    4040 
    4141# Ignore the following dependencies 
Note: See TracChangeset for help on using the changeset viewer.