Changeset 3313 for palm

Timestamp:

Oct 6, 2018 3:22:48 PM (6 years ago)

Author:

knoop

Message:

Added test mode to palmrun

Location:

palm/trunk

Files:

• SCRIPTS/palmrun (modified) (5 diffs)
• SOURCE/parin.f90 (modified) (3 diffs)
• SOURCE/progress_bar_mod.f90 (modified) (5 diffs)

palm/trunk/SCRIPTS/palmrun

@@ -230 +230 @@
  remote_username=""
  running_in_batch_mode=false
+ running_in_test_mode=false
  run_coupled_model=false
  run_id=""
@@ -284 +285 @@
     # READ SHELLSCRIPT-OPTIONS AND REBUILD THE PALMRUN-COMMAND STRING (prc),
     # WHICH WILL BE USED TO START RESTART-JOBS
- while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:Z option
+ while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:zZ option
  do
    case  $option  in
@@ -317 +318 @@
        (y)   ocean_file_appendix=true; prc="$prc -y";;
        (Y)   run_coupled_model=true; coupled_dist=$OPTARG; prc="$prc -Y'$OPTARG'";;
+       (z)   running_in_test_mode=true;;
        (Z)   combine_plot_fields=false; prc="$prc -Z";;
        (\?)  printf "\n  +++ unknown option $OPTARG \n"
@@ -2141 +2143 @@
 
 
+    # CHECK IF THE PROGRESS BAR NEEDS TO BE DISABLED
+    if [[ $running_in_batch_mode = true  ||  $running_in_test_mode = true ]]
+    then
+       progress_bar_disabled=true
+    else
+       progress_bar_disabled=false
+    fi
+
+
        # CREATE THE NAMELIST-FILE WITH VALUES OF ENVIRONMENT-VARIABLES REQUIRED BY PALM
        # (FILE ENVPAR WILL BE READ BY PALM)
@@ -2150 +2161 @@
           maximum_cpu_time_allowed = ${cpumax}.,
           revision = '$global_revision',
-          batch_job = .${running_in_batch_mode}. /
+          progress_bar_disabled = .${progress_bar_disabled}. /
 
 EOF

palm/trunk/SOURCE/parin.f90

@@ -307 +307 @@
 ! 
 ! 1402 2014-05-09 14:25:13Z raasch
-! location messages modified, batch_job included in envpar-NAMELIST
+! location messages modified, progress_bar_disabled included in envpar-NAMELIST
 ! 
 ! 1384 2014-05-02 14:31:06Z raasch
@@ -495 +495 @@
 
     USE progress_bar,                                                          &
-        ONLY :  batch_job
+        ONLY :  progress_bar_disabled
 
     USE radiation_model_mod,                                                   &
@@ -722 +722 @@
              termination_time_needed, vnest_start_time
 
-    NAMELIST /envpar/  batch_job, host, local_dvrserver_running,               &
+    NAMELIST /envpar/  progress_bar_disabled, host, local_dvrserver_running,   &
                        maximum_cpu_time_allowed, maximum_parallel_io_streams,  &
                        read_svf, revision, run_identifier, tasks_per_node,     &

palm/trunk/SOURCE/progress_bar_mod.f90

@@ -80 +80 @@
 
     PRIVATE
-    PUBLIC   batch_job, finish_progress_bar, output_progress_bar
+    PUBLIC   progress_bar_disabled, finish_progress_bar, output_progress_bar
 
     CHARACTER(LEN=60) ::  bar      !< progress bar, initially filled with "_"
@@ -87 +87 @@
     INTEGER(iwp) ::  ilength !< length of progress bar filled with "X"
 
-    LOGICAL ::  batch_job = .FALSE.   !< switch to determine the run mode
+    LOGICAL ::  progress_bar_disabled = .FALSE.   !< envpar-Namelist switch
 
     REAL(wp) ::  time_to_be_simulated !< in sec
@@ -121 +121 @@
        ENDIF
 
-       IF ( batch_job )  THEN
+       IF ( progress_bar_disabled )  THEN
 
           CALL check_open ( 117 )
@@ -183 +183 @@
 !
 !--    In batch mode, use a file (PROGRESS), otherwise use progress bar
-       IF ( batch_job )  THEN
+       IF ( progress_bar_disabled )  THEN
 
           BACKSPACE ( 117 )
@@ -226 +226 @@
        IMPLICIT NONE
 
-       IF ( batch_job )  THEN
+       IF ( progress_bar_disabled )  THEN
 
           CALL close_file ( 117 )