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 1365 – NEMO

Changeset 1365


Ignore:
Timestamp:
2009-04-01T11:43:14+02:00 (15 years ago)
Author:
cetlod
Message:

Adding a new target platform : mercure, see ticket:393

Location:
trunk/NVTK
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/NVTK/INSTALL/JOBS/assessment.ksh

    r1356 r1365  
    7272REV_USE=$( (awk '/Revision:/ {print $2}' specifs.txt) ) 
    7373TITLE="NEMO VALIDATION ${EXPER} : $CONF on $TARGET" 
    74 EMAIL='cethe@lsce.ipsl.fr' 
     74EMAIL='ctlod@locean-ipsl.upmc.fr' 
    7575 
    7676\rm endjob.txt 2> /dev/null 

  • trunk/NVTK/INSTALL/JOBS/job_GYRE.ksh

    r1301 r1365  
    170170#-T- sx8brodie echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
    171171#-T- sx8brodie echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
     172#-T- sx8mercure export F_PROGINF=detail 
     173#-T- sx8mercure echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
     174#-T- sx8mercure echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
    172175#-T- aix6     ;; 
    173176#-T- ax6_mono echo "Stack memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"    >> memory_size.txt  
    … …  
    177180        'mpi' )  
    178181#-T- sx8brodie export MPIPROGINF=detail ;; 
     182#-T- sx8mercure export MPIPROGINF=detail ;; 
    179183#-T- aix6     ;; 
    180184#-T- ax6_mono ;; 
    … …  
    183187#-T- sx8brodie export F_PROGINF=detail 
    184188#-T- sx8brodie export OMP_NUM_THREADS=${NB_PROCS} ;; 
     189#-T- sx8mercure export F_PROGINF=detail 
     190#-T- sx8mercure export OMP_NUM_THREADS=${NB_PROCS} ;; 
    185191#-T- aix6     ;; 
    186192#-T- ax6_mono ;; 
    … …  
    195201              ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    196202        'mpi' )  
    197 #-T- sx8brodie              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     203#-T- sx8brodie         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     204#-T- sx8mercure         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    198205#-T- aix6              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    199206#-T- osxxlf   mpd& 

  • trunk/NVTK/INSTALL/JOBS/job_GYRE_LOBSTER.ksh

    r1301 r1365  
    8686 
    8787# Biogeochemistry namelists 
    88 get_namelist ${LOC_NAM} namelist_top ${MYO_EXP} namelist_top_f90 
    89 get_namelist ${LOC_NAM} namelist_lobster ${MYO_EXP} namelist_lobster_f90 
     88get_namelist ${LOC_NAM} namelist_top ${MYO_EXP} namelist_top 
     89get_namelist ${LOC_NAM} namelist_lobster ${MYO_EXP} namelist_lobster 
    9090 
    9191# namelist modifications 
    … …  
    113113 
    114114# namelist modifications 
    115 PAT_NWRITRC=$( supergrep nwritetrc               namelist_top_f90 ) 
    116 PAT_NWRITRD=$( supergrep ntrd_trc                namelist_top_f90 ) 
    117 PAT_RESTTRD=$( supergrep ln_trdmld_trc_restart   namelist_top_f90 ) 
    118 PAT_LTRCRAD=$( supergrep ln_trcrad               namelist_top_f90 ) 
     115PAT_NWRITRC=$( supergrep nwritetrc               namelist_top ) 
     116PAT_NWRITRD=$( supergrep ntrd_trc                namelist_top ) 
     117PAT_RESTTRD=$( supergrep ln_trdmld_trc_restart   namelist_top ) 
     118PAT_LTRCRAD=$( supergrep ln_trcrad               namelist_top ) 
    119119 
    120120sed -e "s%$PAT_NWRITRC%   nwritetrc   = ${ITERATIONS}%" \ 
    121121    -e "s%$PAT_NWRITRD%   ntrd_trc    = ${ITERATIONS}%" \ 
    122122    -e "s%$PAT_LTRCRAD%   ln_trcrad   =  .false.%"      \ 
    123     -e "s%$PAT_RESTTRD%   ln_trdmld_trc_restart =  .false.%" namelist_top_f90 > nam.tmp 
     123    -e "s%$PAT_RESTTRD%   ln_trdmld_trc_restart =  .false.%" namelist_top > nam.tmp 
    124124 
    125125mv nam.tmp namelist_top 
    126126 
    127 PAT_ADD=$( supergrep nwritedia namelist_lobster_f90 ) 
    128 sed -e "s%$PAT_ADD%   nwritedia    = ${ITERATIONS}%" namelist_lobster_f90 > nam.tmp 
     127PAT_ADD=$( supergrep nwritedia namelist_lobster ) 
     128sed -e "s%$PAT_ADD%   nwritedia    = ${ITERATIONS}%" namelist_lobster > nam.tmp 
    129129mv nam.tmp namelist_lobster 
    130130 
    … …  
    204204#-T- sx8brodie echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
    205205#-T- sx8brodie echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
     206#-T- sx8mercure export F_PROGINF=detail 
     207#-T- sx8mercure echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
     208#-T- sx8mercure echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
    206209#-T- aix6     ;; 
    207210#-T- ax6_mono echo "Stack memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"    >> memory_size.txt  
    … …  
    211214        'mpi' )  
    212215#-T- sx8brodie export MPIPROGINF=detail ;; 
     216#-T- sx8mercure export MPIPROGINF=detail ;; 
    213217#-T- aix6     ;; 
    214218#-T- ax6_mono ;; 
    … …  
    217221#-T- sx8brodie export F_PROGINF=detail 
    218222#-T- sx8brodie export OMP_NUM_THREADS=${NB_PROCS} ;; 
     223#-T- sx8mercure export F_PROGINF=detail 
     224#-T- sx8mercure export OMP_NUM_THREADS=${NB_PROCS} ;; 
    219225#-T- aix6     ;; 
    220226#-T- ax6_mono ;; 
    … …  
    229235              ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    230236        'mpi' )  
    231 #-T- sx8brodie              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     237#-T- sx8brodie         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     238#-T- sx8mercure        ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    232239#-T- aix6              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    233240#-T- osxxlf   mpd& 

  • trunk/NVTK/INSTALL/JOBS/job_ORCA2_LIM.ksh

    r1359 r1365  
    192192#-T- sx8brodie echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
    193193#-T- sx8brodie echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
     194#-T- sx8mercure  export F_PROGINF=detail 
     195#-T- sx8mercure echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
     196#-T- sx8mercure echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
    194197#-T- aix6     ;; 
    195198#-T- ax6_mono echo "Stack memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"    >> memory_size.txt  
    … …  
    199202        'mpi' )  
    200203#-T- sx8brodie export MPIPROGINF=detail ;; 
     204#-T- sx8mercure export MPIPROGINF=detail ;; 
    201205#-T- aix6     ;; 
    202206#-T- ax6_mono ;; 
    … …  
    205209#-T- sx8brodie export F_PROGINF=detail 
    206210#-T- sx8brodie export OMP_NUM_THREADS=${NB_PROCS} ;; 
     211#-T- sx8mercure export F_PROGINF=detail 
     212#-T- sx8mercure export OMP_NUM_THREADS=${NB_PROCS} ;; 
    207213#-T- aix6     ;; 
    208214#-T- ax6_mono ;; 
    … …  
    217223              ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    218224        'mpi' )  
    219 #-T- sx8brodie              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     225#-T- sx8brodie         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     226#-T- sx8mercure        ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    220227#-T- aix6              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    221228#-T- osxxlf   mpd& 

  • trunk/NVTK/INSTALL/JOBS/job_ZAGRIF.ksh

    r1305 r1365  
    222222#-T- sx8brodie echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
    223223#-T- sx8brodie echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
     224#-T- sx8mercure export F_PROGINF=detail 
     225#-T- sx8mercure echo "Stack memory: $( (size opa_${CONF}_${RUN}_${MYO_EXP}) )"    >> memory_size.txt  
     226#-T- sx8mercure echo "Static memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"   >> memory_size.txt  ;; 
    224227#-T- aix6     ;; 
    225228#-T- ax6_mono echo "Stack memory: $( (size opa_${CONF}_memo_${MYO_EXP}) )"    >> memory_size.txt  
    … …  
    227230        'mpi' )  
    228231#-T- sx8brodie export MPIPROGINF=detail ;; 
     232#-T- sx8mercure export MPIPROGINF=detail ;; 
    229233#-T- aix6     ;; 
    230234#-T- ax6_mono ;; 
    … …  
    232236#-T- sx8brodie export F_PROGINF=detail 
    233237#-T- sx8brodie export OMP_NUM_THREADS=${NB_PROCS} ;; 
     238#-T- sx8mercure export F_PROGINF=detail 
     239#-T- sx8mercure export OMP_NUM_THREADS=${NB_PROCS} ;; 
    234240#-T- aix6     ;; 
    235241#-T- ax6_mono ;; 
    … …  
    243249              ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    244250        'mpi' )  
    245 #-T- sx8brodie              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     251#-T- sx8brodie         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
     252#-T- sx8mercure         ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    246253#-T- aix6              ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    247254esac 

  • trunk/NVTK/INSTALL/JOBS/lance_batch.ksh

    r1356 r1365  
    9090    CMDGET=mfget 
    9191    SYMBOL=B_ 
     92elif [ ${TARGET} = 'sx8mercure' ]; then 
     93    W_XX='#-T- sx8mercure' 
     94    LAUN='qsub ' 
     95    LLJOBS=qstat 
     96    LSUB="mpirun -np ${PRC}" 
     97    LPERF= 
     98    LJTIM='01:20:00' 
     99    LJTIMJ='01:40:00' 
     100    CMDGET=cp 
     101    SYMBOL=M_ 
    92102elif [ ${TARGET} = 'aix6' ]; then 
    93103    W_XX='#-T- aix6' 
    … …  
    181191              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
    182192          fi ;; 
     193     'sx8mercure' ) 
     194          CAR_JNAM=$( grep '\#PBS -N ' jhd_${TARGET}_${RUN} ) 
     195          CAR_JNAMO=$( grep '\#PBS -o ' jhd_${TARGET}_${RUN} ) 
     196          CAR_JNAME=$( grep '\#PBS -e ' jhd_${TARGET}_${RUN} ) 
     197          if [ ${RUN} = 'mpi' -o ${RUN} = 'omp' ] ; then 
     198              CAR_JMPI=$( grep '\#PBS -l cpunum_job' jhd_${TARGET}_${RUN} ) 
     199              sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONFS}%" \ 
     200              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
     201              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
     202              -e "s%$CAR_JMPI%\#PBS -l cpunum_job=${PRC}%" \ 
     203              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
     204          else 
     205              sed    -e "s%$CAR_JNAM%\#PBS -N  ${RUN}${CONFS}%" \ 
     206              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
     207              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
     208              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
     209          fi ;; 
    183210esac 
    184211 
    … …  
    273300                     -e "s%$CAR_JTIMJ%\#PBS -l cputim_job=${LJTIMJ}%" \ 
    274301                     job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh > job_${RUN}_${jobnam[$ind]}.ksh_tmp  ;; 
     302                'sx8mercure' ) 
     303                     CAR_JTIMP=$( grep '\#PBS -l cputim_prc' job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh ) 
     304                     CAR_JTIMJ=$( grep '\#PBS -l cputim_job' job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh ) 
     305                     sed    -e "s%$CAR_JTIMP%\#PBS -l cputim_prc=${LJTIM}%" \ 
     306                     -e "s%$CAR_JTIMJ%\#PBS -l cputim_job=${LJTIMJ}%" \ 
     307                     job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh > job_${RUN}_${jobnam[$ind]}.ksh_tmp  ;; 
    275308           esac 
    276309           mv job_${RUN}_${jobnam[$ind]}.ksh_tmp job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh 

  • trunk/NVTK/INSTALL/ins_nvtk.ksh

    r1356 r1365  
    243243# IOIPSL compilation 
    244244../../../util/ins_make -w IOIPSL 
    245 if [ ${LOCTARG} = 'sx8brodie' ] ; then 
     245if [ ${LOCTARG} = 'sx8brodie' -o ${LOCTARG} = 'sx8mercure' ] ; then 
    246246    (cd ../../../modeles/IOIPSL/src ; sxgmake ;) 
    247247else 

  • trunk/NVTK/Makefile

    r1356 r1365  
    6262   @echo  
    6363   @echo "CONFIGURATION :" $@ 
    64    @( MYREP_LIST=`(cd 2TEST ; ls *.[Ffh]90 )` ; \ 
    65           cd ../$@/MY_SRC ; rm -rf *.[Ffh]90 ; if [ -n "$$MYREP_LIST" ] ; \ 
    66         then ln -sf ../../NVTK/2TEST/*.[Ffh]90 . ; fi ; )  
     64   @( cd 2TEST ; MYREP_LIST=`( ls *.[Ffh]90 )` ; cd ../../$@/MY_SRC ; rm -rf *.[Ffh]90 ; \ 
     65        if [ -n "$$MYREP_LIST" ] ; then ln -sf ../../NVTK/2TEST/*.[Ffh]90 . ; fi ; ) 
    6766   @echo "test=" $(NAM_V) > ../$@/specifs.txt 
    6867   @echo "runs=" $(BUILD_MAKE) >> ../$@/specifs.txt 
    … …  
    7271   @echo `svn info ../../modeles/NEMO | grep URL` >> ../$@/specifs.txt 
    7372   @echo `svn info ../../modeles/NEMO | grep Revision ` >> ../$@/specifs.txt 
    74    @( LSFILES=`(cd 2TEST ; ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \ 
    75      then echo $$LSFILES > ../$@/f2test.txt ; else rm -f ../$@/f2test.txt ; \ 
    76           touch ../$@/f2test.txt ; fi ; ) 
     73   @( cd 2TEST ; LSFILES=`( ls *.[Ffh]90 )` ; if [ -n "$$LSFILES" ] ; \ 
     74     then echo $$LSFILES > ../../$@/f2test.txt ; else rm -f ../../$@/f2test.txt ; \ 
     75          touch ../../$@/f2test.txt ; fi ; ) 
    7776   @echo  
    7877   @echo '             ----->>>>>>>>>   Links from NVTK/2TEST to '$@/MY_SRC 'done' 
    … …  
    9493       echo '                          > Build links from 2TEST to '$$conf'/MY_SRC directory :' ; \ 
    9594       echo ; \ 
    96        MYREP_LIST=`(cd 2TEST ; ls *.[Ffh]90 )` ; \ 
    97             cd ../$$conf/MY_SRC ; rm -rf *.[Ffh]90 ; \ 
     95       cd 2TEST ; \ 
     96       MYREP_LIST=`( ls *.[Ffh]90 )` ; \ 
     97            cd ../../$$conf/MY_SRC ; rm -rf *.[Ffh]90 ; \ 
    9898            if [ -n "$$MYREP_LIST" ] ; \ 
    9999            then for F in $$MYREP_LIST; do \ 
    … …  
    160160              [ -f $$i ] && \rm -rf $$i ;\ 
    161161            done ; \ 
    162             myrep_list=`(cd $$myrep ; ls *.[Ffh]90 )` ; \ 
     162            cd $$myrep ; \ 
     163            myrep_list=`( ls *.[Ffh]90 )` ; \ 
    163164            if [ -n "$$myrep_list" ] ; then \ 
    164165                for F in $$myrep_list; do \ 
Note: See TracChangeset for help on using the changeset viewer.