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 1412 for trunk/NVTK – NEMO

Changeset 1412 for trunk/NVTK


Ignore:
Timestamp:
2009-04-22T19:17:00+02:00 (15 years ago)
Author:
smasson
Message:

update NVTK and ioserver interafce, see ticket:420

Location:
trunk/NVTK
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/NVTK/INSTALL/CONFIG_FILES/AA_make

    r1402 r1412  
    99 
    1010$(filter-out mpi omp, $(RUN)): omp 
    11    gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt 
    12    gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt 
     11   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) clean > $(NEMOLIB)_logbook_$@.txt 
     12   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) >> $(NEMOLIB)_logbook_$@.txt 
    1313 
    1414   cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP)  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) 
    … …  
    3434#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    3535#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    36    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
     36   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; ) 
    3737endif 
    3838 
    3939omp: mpi 
    4040ifeq ($(filter omp,$(RUN)),omp) 
    41    gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt 
    42    gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt 
     41   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) clean > $(NEMOLIB)_logbook_$@.txt 
     42   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) >> $(NEMOLIB)_logbook_$@.txt 
    4343 
    4444   cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP)  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) 
    … …  
    5858#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh 
    5959#-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8mercure.ksh 
    60    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
     60   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; ) 
    6161endif 
    6262 
    … …  
    6868ifeq ($(filter mpi,$(RUN)),mpi) 
    6969   cp ./MY_SRC/par_oce.F90_keep ./MY_SRC/par_oce.F90  
    70    gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt 
    71    gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt 
     70   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) clean > $(NEMOLIB)_logbook_$@.txt 
     71   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) >> $(NEMOLIB)_logbook_$@.txt 
    7272   rm -f ./MY_SRC/par_oce.F90 
    7373 
    … …  
    9494#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 
    9595#-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh 
    96    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) ; ) 
     96   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; ) 
    9797endif 
    9898 
    … …  
    106106memo: 
    107107ifeq ($(MKMO),memo) 
    108    gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt 
    109    gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt 
     108   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) clean > $(NEMOLIB)_logbook_$@.txt 
     109   gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) >> $(NEMOLIB)_logbook_$@.txt 
    110110 
    111111   cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP)  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) 

  • trunk/NVTK/INSTALL/CONFIG_FILES/AA_make.ldef

    r1301 r1412  
    1616MKMO= 
    1717REXP= 
     18USE_IOMPUT =  
     19USE_IOSERVER =  
     20NB_PROCS_IOSERVER =  
    1821WWDIR=/workdir/rech/eee/reee534/AUTRE/modipsl/config/ 
    1922#--------------------------------------------------------------------- 

  • trunk/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM

    r1402 r1412  
    2727EXEC_BIN = ../../../bin/opa_$(NEMOLIB)_$(COMP)_$(EXPER) 
    2828NBPRC = 6 
     29USE_IOMPUT =  
    2930 
    3031#- 

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

    r1403 r1412  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16  
     16USE_IOMPUT=xxx 
     17USE_IOSERVER=xxx 
     18NB_PROCS_IOSERVER=xxx 
     19# 
    1720# Variables changed by ins_valid.ksh script 
    1821MAINDIR=/workdir/rech/eee/reee534/AUTRE 
    … …  
    8992 
    9093# iom_put xml file 
    91 get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
     94if [ "${USE_IOMPUT}" = "true" ] 
     95then 
     96    get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
     97    get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
     98    sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
     99    mv tmp$$ xmlio_server.def 
     100fi 
    92101 
    93102# Local function to find namelists parameters 
    … …  
    181190chmod 777 opa_${CONF}_${RUN}_${MYO_EXP} 
    182191chmod 777 opa_${CONF}_memo_${MYO_EXP} 
    183  
     192if [ "${USE_IOSERVER}" = "true" ] 
     193then 
     194    cp ${WORK}/../bin/ioserver ioserver 
     195    chmod 777 ioserver 
     196fi 
    184197# 
    185198# Profiling & Executable memory size 
    … …  
    216229########################## 
    217230 
    218 case ${RUN} in 
     231 
     232if [ "${USE_IOSERVER}" = "true" ] 
     233then 
     234#-T- aix6        rm -f cmdfile 
     235#-T- aix6        cnt=1 
     236#-T- aix6        while [ $cnt -le ${NB_PROCS_IOSERVER} ] 
     237#-T- aix6        do 
     238#-T- aix6          echo "${CPERF#poe} ./ioserver" >> cmdfile 
     239#-T- aix6          cnt=$(( $cnt + 1 )) 
     240#-T- aix6        done 
     241#-T- aix6        cnt=1 
     242#-T- aix6        while [ $cnt -le ${NB_PROCS} ] 
     243#-T- aix6        do 
     244#-T- aix6          echo "${CPERF#poe} ./opa_${CONF}_${RUN}_${MYO_EXP}" >> cmdfile 
     245#-T- aix6          cnt=$(( $cnt + 1 )) 
     246#-T- aix6        done 
     247#-T- aix6        poe -pgmmodel MPMD -cmdfile ./cmdfile 
     248#-T- sx8brodie   echo "-h 0 -p ${NB_PROCS_IOSERVER} ./ioserver" > cmdfile 
     249#-T- sx8brodie   echo "-h 0 -p ${NB_PROCS} ./opa_${CONF}_${RUN}_${MYO_EXP}" >> cmdfile 
     250#-T- sx8brodie   ${CPERF} ${LEXE} -f cmdfile ;; 
     251#-T- sx8mercure  echo "-h 0 -p ${NB_PROCS_IOSERVER} ./ioserver" > cmdfile 
     252#-T- sx8mercure  echo "-h 0 -p ${NB_PROCS} ./opa_${CONF}_${RUN}_${MYO_EXP}" >> cmdfile 
     253#-T- sx8mercure  ${CPERF} ${LEXE} -f cmdfile ;; 
     254else 
     255    case ${RUN} in 
    219256        'mon' | 'omp' )  
    220257              ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; 
    … …  
    227264#-T- osxxlf   ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} 
    228265#-T- osxxlf   mpdallexit ;; 
    229 esac 
     266    esac 
     267     
     268fi 
    230269 
    231270ls -l 
    … …  
    241280case ${RUN} in 
    242281   'mon' | 'omp' ) 
    243                liste_files='*abort* memory* namelist* perfs* solver.stat ocean.output layout* ORCA2* restart* mono*' ;; 
     282               liste_files='*abort* memory* namelist* *xml* perfs* cmdfile solver.stat ocean.output layout* ORCA2* restart* mono*' ;; 
    244283   'mpi' ) 
    245                liste_files='*abort* namelist* solver.stat perfs* ocean.output* layout* ORCA2* restart* mpp*' ;; 
     284               liste_files='*abort* namelist* *xml* solver.stat perfs* cmdfile ocean.output* layout* ORCA2* restart* mpp*' ;; 
    246285esac 
    247286 

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

    r1402 r1412  
    55# Contact  : nemo_st@locean-ipsl.upmc.fr 
    66# 
    7 # INPUT ARGS: 4 + 1 optional 
     7# INPUT ARGS: 8 
    88#     - CONF  : configuration name (ORCA2_LIM, GYRE ..) 
    99#     - MTIME : timing/no timing (timing or notiming) 
    1010#     - JOBTOL: jobs to launch: all, long, 1_short or gtime 
    1111#     - OWNEXP: name of the experience performed 
    12 #     - REFTAG: (optional): reference tag name to which current  
    13 #               version will be compare to 
     12#     - REFTAG: reference tag name to be compare to 
     13#     - USE_IOMPUT: true of false (default false) 
     14#     - USE_IOSERVER: true of false (default false) 
     15#     - NB_PROCS_IOSERVER: (default 0) 
    1416# 
    1517# WORK: This script aims to (for each standard configuration) : 
    … …  
    7173OWNEXP=$4 
    7274REFTAG=$5 
     75USE_IOMPUT=${6:-false} 
     76USE_IOSERVER=${7:-false} 
     77NB_PROCS_IOSERVER=${8:-0} 
     78[ "${USE_IOMPUT}" = "false" ] && USE_IOSERVER=false 
     79[ "${USE_IOSERVER}" = "false" ] && NB_PROCS_IOSERVER=0 
    7380RUN=$(basename `pwd`) 
    74  
     81[ "${RUN}" = "mon" ] && PRC=1 
     82if [[ ( "${TARGET}" = "sx8brodie" ) || ( "${TARGET}" = "sx8mercure" ) ]] 
     83then 
     84    if [ $(( ${PRC} + ${NB_PROCS_IOSERVER} )) -gt 8 ] 
     85    then 
     86   echo NVTK is not made to use more than 1 node on SX8 machines... 
     87   echo please, reduce the number of cpu used by NEMO or/and the ioserver 
     88   exit 1 
     89    fi 
     90fi 
    7591# --------------------------------------------------------------- 
    7692#  I. Take into account target's specificities  
    … …  
    155171          CAR_JMPI=$( grep '\# @ total_tasks' jhd_${TARGET}_${RUN} ) 
    156172          sed    -e "s%$CAR_JNAM%\# @ job_name = ${RUN}${CONFS}%" \ 
    157           -e "s%$CAR_JMPI%\# @ total_tasks = ${PRC}%" \ 
     173          -e "s%$CAR_JMPI%\# @ total_tasks = $(( ${PRC} + ${NB_PROCS_IOSERVER} ))%" \ 
    158174          jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp  ;; 
    159175     'sx8brodie' ) 
    … …  
    166182              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
    167183              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
    168               -e "s%$CAR_JMPI%\#PBS -l cpunum_job=${PRC}%" \ 
     184              -e "s%$CAR_JMPI%\#PBS -l cpunum_job=$(( ${PRC} + ${NB_PROCS_IOSERVER} ))%" \ 
    169185              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
    170186          else 
    … …  
    183199              -e "s%$CAR_JNAMO%\#PBS -o  ${RUN}${CONFS}_std%" \ 
    184200              -e "s%$CAR_JNAME%\#PBS -e  ${RUN}${CONFS}_err%" \ 
    185               -e "s%$CAR_JMPI%\#PBS -l cpunum_job=${PRC}%" \ 
     201              -e "s%$CAR_JMPI%\#PBS -l cpunum_job=$(( ${PRC} + ${NB_PROCS_IOSERVER} ))%" \ 
    186202              jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 
    187203          else 
    … …  
    230246esac 
    231247 
     248chwd () {  
     249    word=$( grep "^ *${1}" job_tmp_${RUN}.ksh | cut -f 1 -d " " ) 
     250    if [ "${word}" != "" ]  
     251    then 
     252   sed -e "s@${word}@${1%=*}=\"${2}\"@" job_tmp_${RUN}.ksh > tmp$$ 
     253   mv tmp$$ job_tmp_${RUN}.ksh 
     254    fi 
     255} 
     256 
    232257while [ $ind -lt ${iloop} ] 
    233258do 
    234        CAR_TYPE_tmp=$( grep 'type=' job_tmp_${RUN}.ksh ) 
    235        CAR_TYPE=`echo $CAR_TYPE_tmp | cut -f 1 -d " " ` 
    236        CAR_RUN_tmp=$( grep 'RUN=xxx' job_tmp_${RUN}.ksh ) 
    237        CAR_RUN=`echo $CAR_RUN_tmp | cut -f 1 -d " " ` 
    238        CAR_MPP_tmp=$( grep 'NB_PROCS=xxx' job_tmp_${RUN}.ksh ) 
    239        CAR_MPP=`echo $CAR_MPP_tmp | cut -f 1 -d " " ` 
    240        CAR_SUB_tmp=$( grep 'LAUNCH=xxx' job_tmp_${RUN}.ksh ) 
    241        CAR_SUB=`echo $CAR_SUB_tmp | cut -f 1 -d " " ` 
    242        CAR_EXE_tmp=$( grep 'LEXE=xxx' job_tmp_${RUN}.ksh ) 
    243        CAR_EXE=`echo $CAR_EXE_tmp | cut -f 1 -d " " ` 
    244        CAR_PER_tmp=$( grep 'CPERF=xxx' job_tmp_${RUN}.ksh ) 
    245        CAR_PER=`echo $CAR_PER_tmp | cut -f 1 -d " " ` 
    246        CAR_MAN_tmp=$( grep 'MAINDIR=xxx' job_tmp_${RUN}.ksh ) 
    247        CAR_MAN=`echo $CAR_MAN_tmp | cut -f 1 -d " " ` 
    248        CAR_INP_tmp=$( grep 'D_INPUT=xxx' job_tmp_${RUN}.ksh ) 
    249        CAR_INP=`echo $CAR_INP_tmp | cut -f 1 -d " " ` 
    250        CAR_GET_tmp=$( grep 'D_GET=xxx' job_tmp_${RUN}.ksh ) 
    251        CAR_GET=`echo $CAR_GET_tmp | cut -f 1 -d " " ` 
    252        CAR_RTG_tmp=$( grep 'REF_TAG=xxx' job_tmp_${RUN}.ksh ) 
    253        CAR_RTG=`echo $CAR_RTG_tmp | cut -f 1 -d " " ` 
    254        CAR_MYO_tmp=$( grep 'MYO_EXP=xxx' job_tmp_${RUN}.ksh ) 
    255        CAR_MYO=`echo $CAR_MYO_tmp | cut -f 1 -d " " ` 
    256        CAR_TSY_tmp=$( grep 'TSYMB=xxx' job_tmp_${RUN}.ksh ) 
    257        CAR_TSY=`echo $CAR_TSY_tmp | cut -f 1 -d " " ` 
    258  
    259        sed    -e "s%$CAR_TYPE%type=${jobnam[$ind]}%" \ 
    260        -e "s%$CAR_RUN%RUN=$RUN%" \ 
    261        -e "s%$CAR_MPP%NB_PROCS=$PRC%" \ 
    262        -e "s%$CAR_SUB%LAUNCH='$LAUN'%" \ 
    263        -e "s%$CAR_EXE%LEXE='$LSUB'%" \ 
    264        -e "s%$CAR_PER%CPERF='$LPERF'%" \ 
    265        -e "s%$CAR_INP%D_INPUT=$IODIR%" \ 
    266        -e "s%$CAR_GET%D_GET=$CMDGET%" \ 
    267        -e "s%$CAR_RTG%REF_TAG=$REFTAG%" \ 
    268        -e "s%$CAR_MYO%MYO_EXP=$OWNEXP%" \ 
    269        -e "s%$CAR_TSY%TSYMB=$SYMBOL%" \ 
    270        job_tmp_${RUN}.ksh > job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh 
     259 
     260       chwd "type="                "${jobnam[$ind]}" 
     261       chwd "RUN=xxx"              "${RUN}" 
     262       chwd "NB_PROCS=xxx"          ${PRC} 
     263       chwd "LAUNCH=xxx"           "${LAUN}" 
     264       chwd "LEXE=xxx"             "${LSUB}" 
     265       chwd "CPERF=xxx"            "${LPERF}" 
     266       chwd "D_INPUT=xxx"          "${IODIR}" 
     267       chwd "D_GET=xxx"            "${CMDGET}" 
     268       chwd "REF_TAG=xxx"          "${REFTAG}"  
     269       chwd "MYO_EXP=xxx"          "${OWNEXP}" 
     270       chwd "TSYMB=xxx"            "${SYMBOL}" 
     271       chwd "USE_IOMPUT=xxx"        ${USE_IOMPUT} 
     272       chwd "USE_IOSERVER=xxx"      ${USE_IOSERVER} 
     273       chwd "NB_PROCS_IOSERVER=xxx" ${NB_PROCS_IOSERVER} 
     274 
     275       mv job_tmp_${RUN}.ksh job_${RUN}_${jobnam[$ind]}_${OWNEXP}.ksh 
    271276 
    272277       if [ ${jobnam[$ind]} = 'gtime' ] ; then 

  • trunk/NVTK/Makefile

    r1365 r1412  
    3737#- 
    3838#- Compilation list type to perform, mon (mono) &/or mpi &/or omp (Open-MP) 
    39 BUILD_MAKE =  mon mpi 
     39BUILD_MAKE = mon mpi 
     40#- 
     41#- Do we use the new io interface (iom_put)? With the io_server? On how many procs? 
     42USE_IOMPUT = false 
     43USE_IOSERVER = false 
     44NB_PROCS_IOSERVER = 1 
    4045#- 
    4146#- Proceed to a timing, use key word 'timing' or 'notiming' 
    … …  
    8186   @echo 
    8287   @echo 
    83    @gmake -C ../$@ RUN='$(BUILD_MAKE)' JOB=$(JOBS_2LAUN) RTG=$(REF_TAGV) MKTE=$(MAK_TIME) MKMO=$(MAK_MEMO) REXP=$(NAM_V) -j 2 > $@_step.txt 
     88   @gmake -C ../$@ RUN='$(BUILD_MAKE)' JOB=$(JOBS_2LAUN) RTG=$(REF_TAGV) MKTE=$(MAK_TIME) MKMO=$(MAK_MEMO) REXP=$(NAM_V) USE_IOMPUT=$(USE_IOMPUT) USE_IOSERVER=$(USE_IOSERVER) NB_PROCS_IOSERVER=$(NB_PROCS_IOSERVER) -j 2 > $@_step.txt 
    8489 
    8590#- Rebuild dependencies when new cpp key and/or new module used 

  • trunk/NVTK/fait_AA_make

    r1402 r1412  
    9393ifeq (\$(IOSERVER),use) 
    9494   (cd ../../../modeles/XMLF90; ./configure -arch \$(FCM_ARCH); fcm build; mkdir -p ../../lib/libxmlio_server  ; cd ../../lib/libxmlio_server ; ln -sf ../../modeles/XMLF90/lib/*.a .; ln -sf ../../modeles/XMLF90/inc/*.mod .) 
    95    (cd ../../../modeles/XMLIO_SERVER; ./configure -arch \$(FCM_ARCH); fcm build ; cd ../../lib/libxmlio_server ; ln -sf ../../modeles/XMLIO_SERVER/lib/*.a . ; ln -sf ../../modeles/XMLIO_SERVER/inc/* . ; cd \$(BINDIR) ; ln -sf ../modeles/XMLIO_SERVER/bin/server.exe ioserver) 
     95   (cd ../../../modeles/XMLIO_SERVER; ./configure -arch \$(FCM_ARCH); fcm build ; cd ../../lib/libxmlio_server ; ln -sf ../../modeles/XMLIO_SERVER/lib/*.a . ; ln -sf ../../modeles/XMLIO_SERVER/inc/* . ; cd ../../bin ; ln -sf ../modeles/XMLIO_SERVER/bin/server.exe ioserver) 
    9696endif 
    9797 
    … …  
    297297echo 'endif' 
    298298echo '' 
     299echo 'ifeq ($(USE_IOMPUT),true)' 
     300echo 'P_P := $(P_P) key_iomput' 
     301echo 'endif' 
     302echo '' 
    299303echo '# add suffix to P_P' 
    300304echo 'P_P := $(P_P:%=$(prefix)%)' 
    … …  
    316320echo '# Some tests to define variables related to xmlioserver compilation' 
    317321echo '# Please do not change ' 
    318 echo 'ifneq (,$(findstring key_ioserver,$(P_P)))' 
     322echo 'ifneq (,$(findstring key_iomput,$(P_P)))' 
    319323echo 'IOSERVER=use' 
    320324echo 'override USER_LIB += -L../../../lib/libxmlio_server -lioserver -lxmlio -lxmlf90' 
Note: See TracChangeset for help on using the changeset viewer.