Changeset 931
- Timestamp:
- Jun 8, 2012 3:09:28 PM (12 years ago)
- Location:
- palm/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mrun
r920 r931 260 260 # combine_plot_fields can be switched off by the 261 261 # new mrun option -Z 262 # 08/06/12 - Bjoern - max_pr_user enabled for the namelist file check, 263 # sleep commands are now disabled in silent mode (-v) 262 264 263 265 … … 1748 1750 printf "\n No source code will be used from this directory!\n" 1749 1751 add_source_path="" 1750 sleep 3 1752 if [[ $silent == false ]] 1753 then 1754 sleep 3 1755 fi 1751 1756 else 1752 1757 … … 1773 1778 printf "\n\n *** user Makefile from directory" 1774 1779 printf "\n \"$add_source_path\" is used \n" 1775 sleep 1 1780 if [[ $silent == false ]] 1781 then 1782 sleep 1 1783 fi 1776 1784 cp $add_source_path/Makefile . 1777 1785 fi … … 1819 1827 fi 1820 1828 printf "$dateiname " 1821 sleep 0.5 1829 if [[ $silent == false ]] 1830 then 1831 sleep 0.5 1832 fi 1833 1822 1834 fi 1823 1835 done … … 2637 2649 # CHECKING THE P3D FILE 2638 2650 printf "\n\n (1) checking $filename_input" 2639 echo "$numprocs 0 " > VARIN2651 echo "$numprocs 0 0" > VARIN 2640 2652 errors=`./check_namelist_files.x < VARIN 2>&1` 2641 2653 … … 2689 2701 fi 2690 2702 2691 echo "$numprocs 1" > VARIN 2703 # READ max_user_pr FROM FILES 2704 if [[ -f parin_for_check ]] 2705 then 2706 read max_pr_user < parin_for_check 2707 else 2708 max_user_pr=0 2709 fi 2710 2711 echo "$numprocs 1 $max_pr_user" > VARIN 2692 2712 errors=`./check_namelist_files.x < VARIN 2>&1` 2693 2713 -
palm/trunk/SOURCE/check_namelist_files.f90
r846 r931 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Check of max_pr_user implemented 7 7 ! 8 8 ! Former revisions: … … 33 33 34 34 ! 35 !-- Read number of processors and variable check_restart, which gives 36 !-- information whether the p3d or the pd3f file shall be checked 37 READ (*,*,ERR=10,END=10) numprocs, check_restart 35 !-- Read number of processors, the variable check_restart and max_user_pr. 36 !-- check_restart gives information whether the initalor the restart parameter 37 !-- file must be checked. max_user_pr is usually set by read_var_list 38 !-- (excluded in the namelist file check). 39 READ (*,*,ERR=10,END=10) numprocs, check_restart, max_pr_user 38 40 10 CONTINUE 39 41 … … 43 45 CALL parin 44 46 47 OPEN( 11, FILE='parin_for_check', FORM='FORMATTED' ) 48 WRITE(11, FMT='(I)'), max_pr_user 49 CLOSE(11) 45 50 ! 46 !-- Determine processor topology and local array indices 51 !-- Determine processor topology and local array indicesy 52 47 53 CALL init_pegrid 48 54 -
palm/trunk/SOURCE/user_parin.f90
r842 r931 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Re-enabled check for max_pr_user 7 7 ! 8 8 ! Former revisions: … … 86 86 !-- restart file (already stored in max_pr_user) has to match the one given 87 87 !-- for the current run 88 #if ! defined ( __check )89 88 IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN 90 89 IF ( max_pr_user /= max_pr_user_tmp ) THEN … … 99 98 max_pr_user = max_pr_user_tmp 100 99 ENDIF 101 #endif102 100 103 101 100 RETURN
Note: See TracChangeset
for help on using the changeset viewer.