Changeset 1412 for trunk/NVTK
- Timestamp:
- 2009-04-22T19:17:00+02:00 (15 years ago)
- Location:
- trunk/NVTK
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NVTK/INSTALL/CONFIG_FILES/AA_make
r1402 r1412 9 9 10 10 $(filter-out mpi omp, $(RUN)): omp 11 gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt12 gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt11 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 13 13 14 14 cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP) $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) … … 34 34 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 35 35 #-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) ; ) 37 37 endif 38 38 39 39 omp: mpi 40 40 ifeq ($(filter omp,$(RUN)),omp) 41 gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt42 gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt41 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 43 43 44 44 cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP) $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) … … 58 58 #-Q- sx8mercure cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh 59 59 #-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) ; ) 61 61 endif 62 62 … … 68 68 ifeq ($(filter mpi,$(RUN)),mpi) 69 69 cp ./MY_SRC/par_oce.F90_keep ./MY_SRC/par_oce.F90 70 gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt71 gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt70 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 72 72 rm -f ./MY_SRC/par_oce.F90 73 73 … … 94 94 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh 95 95 #-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) ; ) 97 97 endif 98 98 … … 106 106 memo: 107 107 ifeq ($(MKMO),memo) 108 gmake -C WORK COMP=$@ EXPER=$(REXP) clean > $(NEMOLIB)_logbook_$@.txt109 gmake -C WORK COMP=$@ EXPER=$(REXP) >> $(NEMOLIB)_logbook_$@.txt108 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 110 110 111 111 cp ../../bin/opa_$(NEMOLIB)_$@_$(REXP) $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@_$(REXP) -
trunk/NVTK/INSTALL/CONFIG_FILES/AA_make.ldef
r1301 r1412 16 16 MKMO= 17 17 REXP= 18 USE_IOMPUT = 19 USE_IOSERVER = 20 NB_PROCS_IOSERVER = 18 21 WWDIR=/workdir/rech/eee/reee534/AUTRE/modipsl/config/ 19 22 #--------------------------------------------------------------------- -
trunk/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM
r1402 r1412 27 27 EXEC_BIN = ../../../bin/opa_$(NEMOLIB)_$(COMP)_$(EXPER) 28 28 NBPRC = 6 29 USE_IOMPUT = 29 30 30 31 #- -
trunk/NVTK/INSTALL/JOBS/job_ORCA2_LIM.ksh
r1403 r1412 14 14 MYO_EXP=xxx 15 15 TSYMB=xxx 16 16 USE_IOMPUT=xxx 17 USE_IOSERVER=xxx 18 NB_PROCS_IOSERVER=xxx 19 # 17 20 # Variables changed by ins_valid.ksh script 18 21 MAINDIR=/workdir/rech/eee/reee534/AUTRE … … 89 92 90 93 # iom_put xml file 91 get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 94 if [ "${USE_IOMPUT}" = "true" ] 95 then 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 100 fi 92 101 93 102 # Local function to find namelists parameters … … 181 190 chmod 777 opa_${CONF}_${RUN}_${MYO_EXP} 182 191 chmod 777 opa_${CONF}_memo_${MYO_EXP} 183 192 if [ "${USE_IOSERVER}" = "true" ] 193 then 194 cp ${WORK}/../bin/ioserver ioserver 195 chmod 777 ioserver 196 fi 184 197 # 185 198 # Profiling & Executable memory size … … 216 229 ########################## 217 230 218 case ${RUN} in 231 232 if [ "${USE_IOSERVER}" = "true" ] 233 then 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 ;; 254 else 255 case ${RUN} in 219 256 'mon' | 'omp' ) 220 257 ${CPERF} ./opa_${CONF}_${RUN}_${MYO_EXP} ;; … … 227 264 #-T- osxxlf ${CPERF} ${LEXE} ./opa_${CONF}_${RUN}_${MYO_EXP} 228 265 #-T- osxxlf mpdallexit ;; 229 esac 266 esac 267 268 fi 230 269 231 270 ls -l … … 241 280 case ${RUN} in 242 281 '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*' ;; 244 283 '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*' ;; 246 285 esac 247 286 -
trunk/NVTK/INSTALL/JOBS/lance_batch.ksh
r1402 r1412 5 5 # Contact : nemo_st@locean-ipsl.upmc.fr 6 6 # 7 # INPUT ARGS: 4 + 1 optional7 # INPUT ARGS: 8 8 8 # - CONF : configuration name (ORCA2_LIM, GYRE ..) 9 9 # - MTIME : timing/no timing (timing or notiming) 10 10 # - JOBTOL: jobs to launch: all, long, 1_short or gtime 11 11 # - 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) 14 16 # 15 17 # WORK: This script aims to (for each standard configuration) : … … 71 73 OWNEXP=$4 72 74 REFTAG=$5 75 USE_IOMPUT=${6:-false} 76 USE_IOSERVER=${7:-false} 77 NB_PROCS_IOSERVER=${8:-0} 78 [ "${USE_IOMPUT}" = "false" ] && USE_IOSERVER=false 79 [ "${USE_IOSERVER}" = "false" ] && NB_PROCS_IOSERVER=0 73 80 RUN=$(basename `pwd`) 74 81 [ "${RUN}" = "mon" ] && PRC=1 82 if [[ ( "${TARGET}" = "sx8brodie" ) || ( "${TARGET}" = "sx8mercure" ) ]] 83 then 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 90 fi 75 91 # --------------------------------------------------------------- 76 92 # I. Take into account target's specificities … … 155 171 CAR_JMPI=$( grep '\# @ total_tasks' jhd_${TARGET}_${RUN} ) 156 172 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} ))%" \ 158 174 jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp ;; 159 175 'sx8brodie' ) … … 166 182 -e "s%$CAR_JNAMO%\#PBS -o ${RUN}${CONFS}_std%" \ 167 183 -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} ))%" \ 169 185 jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 170 186 else … … 183 199 -e "s%$CAR_JNAMO%\#PBS -o ${RUN}${CONFS}_std%" \ 184 200 -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} ))%" \ 186 202 jhd_${TARGET}_${RUN} > jhd_${TARGET}_${RUN}_tmp 187 203 else … … 230 246 esac 231 247 248 chwd () { 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 232 257 while [ $ind -lt ${iloop} ] 233 258 do 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 271 276 272 277 if [ ${jobnam[$ind]} = 'gtime' ] ; then -
trunk/NVTK/Makefile
r1365 r1412 37 37 #- 38 38 #- Compilation list type to perform, mon (mono) &/or mpi &/or omp (Open-MP) 39 BUILD_MAKE = mon mpi 39 BUILD_MAKE = mon mpi 40 #- 41 #- Do we use the new io interface (iom_put)? With the io_server? On how many procs? 42 USE_IOMPUT = false 43 USE_IOSERVER = false 44 NB_PROCS_IOSERVER = 1 40 45 #- 41 46 #- Proceed to a timing, use key word 'timing' or 'notiming' … … 81 86 @echo 82 87 @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.txt88 @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 84 89 85 90 #- Rebuild dependencies when new cpp key and/or new module used -
trunk/NVTK/fait_AA_make
r1402 r1412 93 93 ifeq (\$(IOSERVER),use) 94 94 (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) 96 96 endif 97 97 … … 297 297 echo 'endif' 298 298 echo '' 299 echo 'ifeq ($(USE_IOMPUT),true)' 300 echo 'P_P := $(P_P) key_iomput' 301 echo 'endif' 302 echo '' 299 303 echo '# add suffix to P_P' 300 304 echo 'P_P := $(P_P:%=$(prefix)%)' … … 316 320 echo '# Some tests to define variables related to xmlioserver compilation' 317 321 echo '# Please do not change ' 318 echo 'ifneq (,$(findstring key_io server,$(P_P)))'322 echo 'ifneq (,$(findstring key_iomput,$(P_P)))' 319 323 echo 'IOSERVER=use' 320 324 echo 'override USER_LIB += -L../../../lib/libxmlio_server -lioserver -lxmlio -lxmlf90'
Note: See TracChangeset
for help on using the changeset viewer.