- Timestamp:
- Aug 27, 2008 2:34:51 PM (16 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mbuild
r182 r191 1308 1308 1309 1309 # print ". /usr/share/modules/init/bash; module load mvapich/mvapich-0.9.9-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll 1310 print ". /usr/share/modules/init/bash; module load mvapich2 /1.2rc1-intel; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll1310 print ". /usr/share/modules/init/bash; module load mvapich2; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll 1311 1311 1312 1312 elif [[ $remote_host = lctit ]] -
palm/trunk/SCRIPTS/mrun
r188 r191 1114 1114 fi;; 1115 1115 (ibmy) queue=parallel;; 1116 (lcsgib) queue=bigq;; 1117 (lcsgih) queue=bigq;; 1116 1118 (lctit) queue=sla3;; 1117 1119 (nech) queue=none;; … … 1387 1389 1388 1390 1391 # SOURCE-VERZEICHNIS ZUM AUFSAMMELN DER ZU UEBERSETZENDEN PROGRAMMTEILE 1392 # ERZEUGEN. HIERHIN WERDEN SPAETER IM FALL VON BATCH-JOBS AUCH DAS MRUN- 1393 # SCRIPTS SOWIE DIE KONFIGURATIONSDATEI KOPIERT 1394 if [[ $restart_run != true ]] 1395 then 1396 rm -rf SOURCES_FOR_RUN_$fname 1397 mkdir SOURCES_FOR_RUN_$fname 1398 fi 1399 1400 1389 1401 # ALLE ZU UEBERSETZENDEN PROGRAMMTEILE ZUSAMMENSAMMELN 1390 1402 # BEI BATCH-JOBS IST DIES NICHT NOETIG, WEIL DIE PROGRAMMTEILE BEREITS DURCH … … 1396 1408 [[ "$source_list" = LM ]] && source_list=LOCALLY_MODIFIED 1397 1409 [[ "$source_list" = WP ]] && source_list=WRITE_PERMIT 1398 1399 if [[ $restart_run != true ]]1400 then1401 rm -rf SOURCES_FOR_RUN_$fname1402 mkdir SOURCES_FOR_RUN_$fname1403 fi1404 1410 1405 1411 … … 2833 2839 if [[ $host = lcsgih || $host = lcsgib ]] 2834 2840 then 2835 # mpirun -machinefile $PBS_NODEFILE -np $ii a.out $ROPTS 2836 ulimit -s 30000 2837 ulimit -a 2838 # mpirun_rsh -hostfile $PBS_NODEFILE -np $ii OMP_NUM_THREADS=$OMP_NUM_THREADS palm $ROPTS 2841 ulimit -s 30000 # A too large stack size causes problems 2839 2842 export MV2_NUM_PORTS=2 2840 2843 # export MV2_CPU_MAPPING=0:1:2:3 … … 3767 3770 3768 3771 3769 # ABSPEICHERN DER QUELLTEXTE (NUR FALLS UEBERSETZT WERDEN SOLL) 3770 # SOWIE GEGEBENENFALLS DES MAKEFILES 3771 if [[ $do_compile = true ]] 3772 then 3773 3774 source_catalog=SOURCES_FOR_RUN_$fname 3775 3776 # UNTERVERZEICHNIS FUER QUELLTEXTE UND MAKEFILE ANLEGEN 3777 # MRUN WIRD DIESES VRZEICHNIS UEBER ENVIRONMENT VARIABLE 3778 # MITGETEILT (UEBERSTEUERT ANGABE IN KONFIGURATIONSDATEI) 3779 echo "mkdir SOURCES_FOR_RUN_$fname" >> $jobfile 3780 echo "export SOURCES_COMPLETE=true" >> $jobfile 3781 echo "cd SOURCES_FOR_RUN_$fname" >> $jobfile 3782 3783 for filename in $source_list 3784 do 3772 # BEREITSTELLUNG VON QUELLTEXTEN, MRUN-SCRIPTS UND KONFIGURATIONS- 3773 # DATEI FUER DEN JOB 3774 if [[ $( echo $host | cut -c1-5 ) = lcsgi ]] 3775 then 3776 3777 # KONFIGURATIONSDATEI UND MRUN_SCRIPT IN DAS SOURCE-VERZEICHNIS 3778 # KOPIEREN 3779 if [[ $restart_run != true ]] 3780 then 3781 cp $config_file $working_directory/SOURCES_FOR_RUN_$fname 3782 cp ${PALM_BIN}/$mrun_script_name $working_directory/SOURCES_FOR_RUN_$fname 3783 fi 3784 3785 # SOURCE-VERZEICHNIS VOM LOKALEN RECHNER PER SCP TRANSFERIEREN 3786 echo "set -x" >> $jobfile 3787 echo "scp -r $return_username@$return_addres:$working_directory/SOURCES_FOR_RUN_$fname ." >> $jobfile 3788 # MRUN-SCRIPTS UND KONFIGURATIONSDATEI IN DAS AKTUELLE ARBEITS- 3789 # VERZEICHNIS VERSCHIEBEN 3790 echo "mv SOURCES_FOR_RUN_$fname/$config_file . " >> $jobfile 3791 echo "mv SOURCES_FOR_RUN_$fname/$mrun_script_name . " >> $jobfile 3792 echo "execute_mrun=true" >> $jobfile 3793 echo " " >> $jobfile 3794 3795 else 3796 3797 # ABSPEICHERN DER QUELLTEXTE (NUR FALLS UEBERSETZT WERDEN SOLL) 3798 # SOWIE GEGEBENENFALLS DES MAKEFILES 3799 if [[ $do_compile = true ]] 3800 then 3801 3802 source_catalog=SOURCES_FOR_RUN_$fname 3803 3804 # UNTERVERZEICHNIS FUER QUELLTEXTE UND MAKEFILE ANLEGEN 3805 # MRUN WIRD DIESES VRZEICHNIS UEBER ENVIRONMENT VARIABLE 3806 # MITGETEILT (UEBERSTEUERT ANGABE IN KONFIGURATIONSDATEI) 3807 echo "mkdir SOURCES_FOR_RUN_$fname" >> $jobfile 3808 echo "export SOURCES_COMPLETE=true" >> $jobfile 3809 echo "cd SOURCES_FOR_RUN_$fname" >> $jobfile 3810 3811 for filename in $source_list 3812 do 3813 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3814 echo "cat > $filename << \"%END%\"" >> $jobfile 3815 cat $source_catalog/$filename >> $jobfile 3816 echo " " >> $jobfile 3817 echo "%END%" >> $jobfile 3818 echo " " >> $jobfile 3819 done 3820 3785 3821 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3786 echo "cat > $filename << \"%END%\"">> $jobfile3787 cat $source_catalog/ $filename>> $jobfile3822 echo "cat > Makefile << \"%END%\"" >> $jobfile 3823 cat $source_catalog/Makefile >> $jobfile 3788 3824 echo " " >> $jobfile 3789 3825 echo "%END%" >> $jobfile 3790 3826 echo " " >> $jobfile 3791 done 3792 3827 3828 echo "cd - > /dev/null" >> $jobfile 3829 3830 fi 3831 3832 3833 # ABSPEICHERN DER KONFIGURATIONSDATEI 3793 3834 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3794 echo "cat > Makefile << \"%END%\"" >> $jobfile 3795 cat $source_catalog/Makefile >> $jobfile 3796 echo " " >> $jobfile 3797 echo "%END%" >> $jobfile 3798 echo " " >> $jobfile 3799 3800 echo "cd - > /dev/null" >> $jobfile 3801 3802 fi 3803 3804 3805 # ABSPEICHERN DER KONFIGURATIONSDATEI 3806 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3807 echo "cat > $config_file << \"%END%\"" >> $jobfile 3808 cat $config_file >> $jobfile 3809 echo "%END%" >> $jobfile 3810 echo " " >> $jobfile 3811 3812 3813 # ABSPEICHERN DER AKTUELLEN MRUN-VERSION 3814 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3815 echo "cat > $mrun_script_name <<\"%END%\"" >> $jobfile 3816 cat ${PALM_BIN}/$mrun_script_name >> $jobfile 3817 echo "%END%" >> $jobfile 3818 if [[ $host = lctit ]] 3819 then 3820 echo "sed 's/bin\/ksh/home2\/usr5\/mkanda\/pub\/ksh/' < $mrun_script_name > mrun_new" >> $jobfile 3821 echo "mv mrun_new $mrun_script_name" >> $jobfile 3822 fi 3823 echo "chmod u+x $mrun_script_name" >> $jobfile 3824 echo "execute_mrun=true" >> $jobfile 3825 echo " " >> $jobfile 3835 echo "cat > $config_file << \"%END%\"" >> $jobfile 3836 cat $config_file >> $jobfile 3837 echo "%END%" >> $jobfile 3838 echo " " >> $jobfile 3839 3840 3841 # ABSPEICHERN DER AKTUELLEN MRUN-VERSION 3842 # ABDECKZEICHEN VERHINDERN, DASS ERSETZUNGEN ERFOLGEN 3843 echo "cat > $mrun_script_name <<\"%END%\"" >> $jobfile 3844 cat ${PALM_BIN}/$mrun_script_name >> $jobfile 3845 echo "%END%" >> $jobfile 3846 if [[ $host = lctit ]] 3847 then 3848 echo "sed 's/bin\/ksh/home2\/usr5\/mkanda\/pub\/ksh/' < $mrun_script_name > mrun_new" >> $jobfile 3849 echo "mv mrun_new $mrun_script_name" >> $jobfile 3850 fi 3851 echo "chmod u+x $mrun_script_name" >> $jobfile 3852 echo "execute_mrun=true" >> $jobfile 3853 echo " " >> $jobfile 3854 3855 fi 3856 3826 3857 3827 3858 # EVTL. BENOETIGTE INPUT-DATEIEN PER FTP HOLEN ODER DEM JOB DIREKT -
palm/trunk/SCRIPTS/subjob
r186 r191 312 312 (ibmy) queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;; 313 313 (lcfimm) remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;; 314 (lcsgib) remote_addres=130.73.232.102; submcom=/opt/torque/bin/qsub;;315 (lcsgih) remote_addres=130.75.4.102; submcom=/opt/torque/bin/qsub;;314 (lcsgib) queue=smallq; remote_addres=130.73.232.102; submcom=/opt/torque/bin/qsub;; 315 (lcsgih) queue=smallq; remote_addres=130.75.4.102; submcom=/opt/moab/bin/msub;; 316 316 (lctit) queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;; 317 317 (lcxt4) remote_addres=129.177.20.113; submcom=/opt/torque/2.3.0/bin/qsub;; … … 350 350 (ibmy) case $ndq in 351 351 (parallel) error=false;; 352 (*) error=true;; 353 esac;; 354 (lcsgib|lcsgih) case $ndq in 355 (testq|smallq|bigq) error=false;; 352 356 (*) error=true;; 353 357 esac;; … … 672 676 then 673 677 678 if [[ $queue = testq ]] 679 then 680 queue_directive="#PBS -q $queue" 681 else 682 queue_directive="" 683 fi 684 674 685 if [[ $numprocs != 0 ]] 675 686 then … … 683 694 #PBS -o $remote_dayfile 684 695 #PBS -j oe 696 $queue_directive 685 697 686 698 . /usr/share/modules/init/bash 687 699 # module load mvapich/mvapich-0.9.9-intel 688 module load mvapich2 /1.2rc1-intel700 module load mvapich2 689 701 module load netcdf 690 702 export LD_LIBRARY_PATH=/sw/intel/cce/10.1.015/lib:/sw/intel/fce/10.1.015/lib:/sw/dataformats/netcdf/3.6.2/lib:\$LD_LIBRARY_PATH … … 941 953 echo "#PBS -l nodes=1:ppn=1" >> $job_to_send 942 954 echo "#PBS -l feature=xe" >> $job_to_send 943 echo "#PBS -l naccesspolicy=shared" >> $job_to_send944 955 echo "#PBS -o \$HOME/job_queue/last_job_transfer_protocol" >> $job_to_send 945 956 echo "#PBS -j oe" >> $job_to_send … … 1102 1113 if [[ $remote_host != lctit ]] 1103 1114 then 1104 if [[ $remote_host = lcsgih || $remote_host = lcsgib ]] 1105 then 1106 ssh $remote_addres -l $remote_user "cd $job_catalog; $submcom -q workq $job_on_remhost; rm $job_on_remhost" 1107 else 1108 ssh $remote_addres -l $remote_user "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost" 1109 fi 1115 ssh $remote_addres -l $remote_user "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost" 1110 1116 else 1111 1117 # TIT ERLAUBT NUR DIE AUSFÜHRUNG GANZ BESTIMMTER KOMMANDOS -
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r189 r191 87 87 (init_1d_model) 88 88 89 Subdomain data are read into temporary arrays pf_tmp/pf3d_tmp in order to 90 avoid INTEL compiler warnings about (automatic) creation of temporary arrays 91 (combine_plot_fields) 92 89 93 advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, check_parameters, cpu_statistics, data_output_spectra, header, init_1d_model, init_3d_model, modules, netcdf, palm, parin, poisfft, production_e, read_var_list, read_3d_binary, transpose, wall_fluxes, write_var_list, write_3d_binary 90 94 -
palm/trunk/UTIL/combine_plot_fields.f90
r179 r191 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Subdomain data are read into temporary arrays pf_tmp/pf3d_tmp in order to 7 ! avoid INTEL compiler warnings about (automatic) creation of temporary arrays 6 8 ! Bugfix: three misplaced #endif directives 7 9 ! … … 109 111 REAL :: dx, simulated_time 110 112 REAL, DIMENSION(:), ALLOCATABLE :: eta, ho, hu 111 REAL, DIMENSION(:,:), ALLOCATABLE :: pf 112 REAL(spk), DIMENSION(:,:,:), ALLOCATABLE :: pf3d 113 REAL, DIMENSION(:,:), ALLOCATABLE :: pf, pf_tmp 114 REAL(spk), DIMENSION(:,:,:), ALLOCATABLE :: pf3d, pf3d_tmp 113 115 114 116 PRINT*, '' … … 357 359 ! 358 360 !-- Read the subdomain grid-point values 359 READ ( id+110 ) pf(xa:xe,ya:ye) 361 ALLOCATE( pf_tmp(xa:xe,ya:ye) ) 362 READ ( id+110 ) pf_tmp 363 pf(xa:xe,ya:ye) = pf_tmp 364 DEALLOCATE( pf_tmp ) 360 365 ENDIF 361 366 IF ( id == 0 ) fanz(av) = fanz(av) + 1 … … 654 659 !-- Read subdomain indices and grid point values 655 660 READ ( id+110, END=999 ) xa, xe, ya, ye, za, ze 656 READ ( id+110 ) pf3d(xa:xe,ya:ye,za:ze) 661 ALLOCATE( pf3d_tmp(xa:xe,ya:ye,za:ze) ) 662 READ ( id+110 ) pf3d_tmp 663 pf3d(xa:xe,ya:ye,za:ze) = pf3d_tmp 664 DEALLOCATE( pf3d_tmp ) 657 665 IF ( id == 0 ) fanz(av) = fanz(av) + 1 658 666
Note: See TracChangeset
for help on using the changeset viewer.