Changeset 2501 for palm/trunk

Timestamp:

Sep 26, 2017 11:41:55 AM (7 years ago)

Author:

raasch

Message:

default value for number of cores (option -X) set to 1, bugfix for mechanism which overwrites configuration file settings with values provided by palmrun options

File:

• palm/trunk/SCRIPTS/palmrun (modified) (10 diffs)

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# default value for number of cores (option -X) set to 1
+# bugfix for mechanism which overwrites configuration file settings with values
+# provided by palmrun options
+# 
+# 2499 2017-09-22 16:47:58Z kanani
 # option -h named configuration identifier
 # 
@@ -65 +70 @@
  compiler_name_ser=""
  compiler_options=""
- cores=""
+ cores=1
  cores_atmos=0
  cores_ocean=0
@@ -116 +121 @@
  source_list=""
  source_path=""
- tasks_per_node=""
+ tasks_per_node=0
  threads_per_task=1
  tmpcreate=false
@@ -179 +184 @@
        (j)   running_in_batch_mode=true;;
        (k)   keep_data_from_previous_run=true; prc="$prc -k";;
-       (m)   memory=$OPTARG; prc="$prc -m$OPTARG";;
+       (m)   palmrun_memory=$OPTARG; prc="$prc -m$OPTARG";;
        (M)   makefile=$OPTARG; prc="$prc -M$OPTARG";;
        (O)   use_openmp=true; threads_per_task=$OPTARG; prc="$prc -O$OPTARG";;
@@ -186 +191 @@
        (R)   return_address=$OPTARG;;
        (s)   source_list=$OPTARG;;
-       (t)   cpumax=$OPTARG; prc="$prc -t$OPTARG";;
+       (t)   palmrun_cpumax=$OPTARG; prc="$prc -t$OPTARG";;
        (T)   palmrun_tasks_per_node=$OPTARG; prc="$prc -T$OPTARG";;
        (u)   remote_username=$OPTARG; prc="$prc -u$OPTARG";;
@@ -193 +198 @@
        (w)   max_par_io_str=$OPTARG; prc="$prc -w$OPTARG";;
        (x)   do_trace=true;set -x; prc="$prc -x";;
-       (X)   cores=$OPTARG; prc="$prc -X$OPTARG";;
+       (X)   palmrun_cores=$OPTARG; prc="$prc -X$OPTARG";;
        (y)   ocean_file_appendix=true; prc="$prc -y";;
        (Y)   run_coupled_model=true; coupled_dist=$OPTARG; prc="$prc -Y'$OPTARG'";;
@@ -568 +573 @@
 
 
+    # VALUES OF PALMRUN-OPTIONS OVERWRITE THOSE FROM THE CONFIGURATION-FILE
+ [[ $palmrun_memory     != 0   ]]  &&  memory=$palmrun_memory
+ [[ $palmrun_cpumax     != ""   ]]  &&  cpumax=$palmrun_cpumax
+ [[ "$palmrun_cores" != ""  ]]  &&  cores=$palmrun_cores
+ [[ "$max_par_io_str" != "" ]]  &&  maximum_parallel_io_streams=$max_par_io_str
+ [[ "$palmrun_tasks_per_node" != "" ]]  &&  tasks_per_node=$palmrun_tasks_per_node
+
+
+
       # EVALUATE MODEL COUPLING FEATURES (OPTION -Y)
  if [[ $run_coupled_model = true ]] 
@@ -587 +601 @@
 
  fi
-
-
-    # SAVE VALUES OF PALMRUN-OPTIONS IN ORDER TO OVERWRITE
-    # THOSE VALUES GIVEN IN THE CONFIGURATION-FILE
- palmrun_memory=$memory
- palmrun_cpumax=$cpumax
- palmrun_cores=$cores
-
-
-    # VALUES OF PALMRUN-OPTIONS OVERWRITE THOSE FROM THE CONFIGURATION-FILE
- [[ $palmrun_memory     != 0   ]]  &&  memory=$palmrun_memory
- [[ $palmrun_cpumax     != 0   ]]  &&  cpumax=$palmrun_cpumax
- [[ "$palmrun_cores" != ""  ]]  &&  cores=$palmrun_cores
- [[ "$max_par_io_str" != "" ]]  &&  maximum_parallel_io_streams=$max_par_io_str
- [[ "$palmrun_tasks_per_node" != "" ]]  &&  tasks_per_node=$palmrun_tasks_per_node
-
 
 
@@ -846 +844 @@
        # CHECK, IF THE NUMBER OF CORES PER NODE HAS BEEN GIVEN UND IF IT IS AN
        # INTEGRAL DIVISOR OF THE TOTAL NUMBER OF CORES GIVEN BY OPTION -X
-    if [[ "$tasks_per_node" = "" ]]
+    if [[ $tasks_per_node = 0 ]]
     then
        printf "\n"
@@ -2348 +2346 @@
     [[ "$cores" != "" ]]       &&  palmrun_com=${palmrun_com}" -X $cores"
     [[ $use_openmp = true ]]  &&  palmrun_com=${palmrun_com}" -O $threads_per_task"
-    [[ "$tasks_per_node" != "" ]]  &&  palmrun_com=${palmrun_com}" -T $tasks_per_node"
+    [[ $tasks_per_node != 0 ]]  &&  palmrun_com=${palmrun_com}" -T $tasks_per_node"
     [[ $delete_temporary_catalog = false ]]  &&  palmrun_com=${palmrun_com}" -B"
     [[ "$ocean_file_appendix" = true ]]  &&  palmrun_com=${palmrun_com}" -y"