Changeset 931 for palm/trunk


Ignore:
Timestamp:
Jun 8, 2012 3:09:28 PM (9 years ago)
Author:
maronga
Message:

enabled check of max_pr_user in namelist file check; disabled sleep command in mrun in silent mode (-v)

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r920 r931  
    260260     #                      combine_plot_fields can be switched off by the
    261261     #                      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)
    262264
    263265 
     
    17481750          printf "\n      No source code will be used from this directory!\n"
    17491751          add_source_path=""
    1750           sleep 3
     1752          if [[ $silent == false ]]
     1753          then
     1754             sleep 3
     1755          fi
    17511756       else
    17521757
     
    17731778             printf "\n\n  *** user Makefile from directory"
    17741779             printf "\n      \"$add_source_path\" is used \n"
    1775              sleep 1
     1780             if [[ $silent == false ]]
     1781             then
     1782                sleep 1
     1783             fi
    17761784             cp  $add_source_path/Makefile  .
    17771785          fi
     
    18191827                fi
    18201828                printf "$dateiname  "
    1821                 sleep 0.5
     1829                if [[ $silent == false ]]
     1830                then
     1831                   sleep 0.5
     1832                fi
     1833
    18221834             fi
    18231835          done
     
    26372649#      CHECKING THE P3D FILE
    26382650       printf "\n\n      (1) checking $filename_input" 
    2639        echo "$numprocs 0" > VARIN
     2651       echo "$numprocs 0 0" > VARIN
    26402652       errors=`./check_namelist_files.x < VARIN 2>&1`
    26412653
     
    26892701          fi
    26902702
    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
    26922712          errors=`./check_namelist_files.x < VARIN 2>&1`
    26932713
  • palm/trunk/SOURCE/check_namelist_files.f90

    r846 r931  
    44! Current revisions:
    55! -----------------
    6 !
     6! Check of max_pr_user implemented
    77!
    88! Former revisions:
     
    3333
    3434!
    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
    384010  CONTINUE
    3941
     
    4345    CALL parin
    4446
     47    OPEN( 11, FILE='parin_for_check', FORM='FORMATTED' )
     48    WRITE(11, FMT='(I)'), max_pr_user
     49    CLOSE(11)
    4550!
    46 !-- Determine processor topology and local array indices
     51!-- Determine processor topology and local array indicesy
     52
    4753    CALL init_pegrid
    4854
  • palm/trunk/SOURCE/user_parin.f90

    r842 r931  
    44! Current revisions:
    55! -----------------
    6 !
     6! Re-enabled check for max_pr_user
    77!
    88! Former revisions:
     
    8686!-- restart file (already stored in max_pr_user) has to match the one given
    8787!-- for the current run
    88 #if ! defined ( __check )
    8988    IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
    9089       IF ( max_pr_user /= max_pr_user_tmp )  THEN
     
    9998       max_pr_user = max_pr_user_tmp
    10099    ENDIF
    101 #endif
    102100
    103101100 RETURN
Note: See TracChangeset for help on using the changeset viewer.