Changeset 3313


Ignore:
Timestamp:
Oct 6, 2018 3:22:48 PM (3 years ago)
Author:
knoop
Message:

Added test mode to palmrun

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmrun

    r3312 r3313  
    230230 remote_username=""
    231231 running_in_batch_mode=false
     232 running_in_test_mode=false
    232233 run_coupled_model=false
    233234 run_id=""
     
    284285    # READ SHELLSCRIPT-OPTIONS AND REBUILD THE PALMRUN-COMMAND STRING (prc),
    285286    # WHICH WILL BE USED TO START RESTART-JOBS
    286  while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:Z option
     287 while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:zZ option
    287288 do
    288289   case  $option  in
     
    317318       (y)   ocean_file_appendix=true; prc="$prc -y";;
    318319       (Y)   run_coupled_model=true; coupled_dist=$OPTARG; prc="$prc -Y'$OPTARG'";;
     320       (z)   running_in_test_mode=true;;
    319321       (Z)   combine_plot_fields=false; prc="$prc -Z";;
    320322       (\?)  printf "\n  +++ unknown option $OPTARG \n"
     
    21412143
    21422144
     2145    # CHECK IF THE PROGRESS BAR NEEDS TO BE DISABLED
     2146    if [[ $running_in_batch_mode = true  ||  $running_in_test_mode = true ]]
     2147    then
     2148       progress_bar_disabled=true
     2149    else
     2150       progress_bar_disabled=false
     2151    fi
     2152
     2153
    21432154       # CREATE THE NAMELIST-FILE WITH VALUES OF ENVIRONMENT-VARIABLES REQUIRED BY PALM
    21442155       # (FILE ENVPAR WILL BE READ BY PALM)
     
    21502161          maximum_cpu_time_allowed = ${cpumax}.,
    21512162          revision = '$global_revision',
    2152           batch_job = .${running_in_batch_mode}. /
     2163          progress_bar_disabled = .${progress_bar_disabled}. /
    21532164
    21542165EOF
  • palm/trunk/SOURCE/parin.f90

    r3298 r3313  
    307307!
    308308! 1402 2014-05-09 14:25:13Z raasch
    309 ! location messages modified, batch_job included in envpar-NAMELIST
     309! location messages modified, progress_bar_disabled included in envpar-NAMELIST
    310310!
    311311! 1384 2014-05-02 14:31:06Z raasch
     
    495495
    496496    USE progress_bar,                                                          &
    497         ONLY :  batch_job
     497        ONLY :  progress_bar_disabled
    498498
    499499    USE radiation_model_mod,                                                   &
     
    722722             termination_time_needed, vnest_start_time
    723723
    724     NAMELIST /envpar/  batch_job, host, local_dvrserver_running,               &
     724    NAMELIST /envpar/  progress_bar_disabled, host, local_dvrserver_running,   &
    725725                       maximum_cpu_time_allowed, maximum_parallel_io_streams,  &
    726726                       read_svf, revision, run_identifier, tasks_per_node,     &
  • palm/trunk/SOURCE/progress_bar_mod.f90

    r3232 r3313  
    8080
    8181    PRIVATE
    82     PUBLIC   batch_job, finish_progress_bar, output_progress_bar
     82    PUBLIC   progress_bar_disabled, finish_progress_bar, output_progress_bar
    8383
    8484    CHARACTER(LEN=60) ::  bar      !< progress bar, initially filled with "_"
     
    8787    INTEGER(iwp) ::  ilength !< length of progress bar filled with "X"
    8888
    89     LOGICAL ::  batch_job = .FALSE.   !< switch to determine the run mode
     89    LOGICAL ::  progress_bar_disabled = .FALSE.   !< envpar-Namelist switch
    9090
    9191    REAL(wp) ::  time_to_be_simulated !< in sec
     
    121121       ENDIF
    122122
    123        IF ( batch_job )  THEN
     123       IF ( progress_bar_disabled )  THEN
    124124
    125125          CALL check_open ( 117 )
     
    183183!
    184184!--    In batch mode, use a file (PROGRESS), otherwise use progress bar
    185        IF ( batch_job )  THEN
     185       IF ( progress_bar_disabled )  THEN
    186186
    187187          BACKSPACE ( 117 )
     
    226226       IMPLICIT NONE
    227227
    228        IF ( batch_job )  THEN
     228       IF ( progress_bar_disabled )  THEN
    229229
    230230          CALL close_file ( 117 )
Note: See TracChangeset for help on using the changeset viewer.