Changeset 3455

Timestamp:

Oct 30, 2018 2:12:31 PM (6 years ago)

Author:

raasch

Message:

options -h and -d renamed -c and -r, respectively, job_queue renamed job_logfiles in sveral configuration files

Location:

palm/trunk/SCRIPTS

Files:

• .palm.config.crayh (modified) (1 diff)
• .palm.config.default (modified) (1 diff)
• .palm.config.default.in (modified) (1 diff)
• .palm.config.default_trace (modified) (1 diff)
• .palm.config.idefix (modified) (1 diff)
• palmbuild (modified) (4 diffs)
• palmrun (modified) (11 diffs)

palm/trunk/SCRIPTS/.palm.config.crayh

@@ -8 +8 @@
 %user_source_path    $base_directory/JOBS/$run_identifier/USER_CODE
 %fast_io_catalog     /gfs2/work/niksiraa
-%local_jobcatalog    /home/raasch/job_queue
-%remote_jobcatalog   /home/h/niksiraa/job_queue
+%local_jobcatalog    /home/raasch/job_logfiles
+%remote_jobcatalog   /home/h/niksiraa/job_logfiles
 #
 %local_ip            130.75.105.103

palm/trunk/SCRIPTS/.palm.config.default

@@ -22 +22 @@
 
 # folder for job protocols
-#%local_jobcatalog    $HOME/job_queue
+#%local_jobcatalog    $HOME/job_logfiles
 
 # folder for job protocols to be used on the remote host

palm/trunk/SCRIPTS/.palm.config.default.in

@@ -15 +15 @@
 %user_source_path    @CMAKE_INSTALL_PREFIX@/JOBS/$run_identifier/USER_CODE
 %fast_io_catalog     @CMAKE_INSTALL_PREFIX@/tmp
-%local_jobcatalog    @CMAKE_INSTALL_PREFIX@/job_queue
+%local_jobcatalog    @CMAKE_INSTALL_PREFIX@/job_logfiles
 #%remote_jobcatalog   <path/to/directory>
 #

palm/trunk/SCRIPTS/.palm.config.default_trace

@@ -22 +22 @@
 
 # folder for job protocols
-#%local_jobcatalog    $HOME/job_queue
+#%local_jobcatalog    $HOME/job_logfiles
 
 # folder for job protocols to be used on the remote host

palm/trunk/SCRIPTS/.palm.config.idefix

@@ -9 +9 @@
 %base_directory     $HOME/palm/current_version
 %fast_io_catalog    /work/<replace_by_your_IDEFIX_username>
-%local_jobcatalog   $HOME/job_queue
+%local_jobcatalog   $HOME/job_logfiles
 %output_path        /work/<replace_by_your_IDEFIX_username>/JOBS/$run_identifier
-%remote_jobcatalog  $HOME/job_queue
+%remote_jobcatalog  $HOME/job_logfiles
 %source_path        $HOME/palm/current_version/trunk/SOURCE
 %user_source_path   $base_directory/JOBS/$run_identifier/USER_CODE

palm/trunk/SCRIPTS/palmbuild

@@ -27 +27 @@
 # -----------------
 # $Id$
+# options -h and -d renamed -c and -r, respectively
+# 
+# 3312 2018-10-06 14:15:46Z knoop
 # "host identifier" in header output renamed "config. identifier",
 # host_configuration renamed configuration_identifier,
@@ -127 +130 @@
 
     # READ SHELLSCRIPT-OPTIONS
- while  getopts  :d:h:uvV  option
+ while  getopts  :c:r:uvV  option
  do
    case  $option  in
-       (d)   run_identifier=$OPTARG;;
-       (h)   configuration_identifier=$OPTARG;;
+       (c)   configuration_identifier=$OPTARG;;
+       (r)   run_identifier=$OPTARG;;
        (v)   silent=true;;
        (V)   use_existing_sources_folder=true;;
@@ -138 +141 @@
    esac
  done
-
-
-    # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
- export fname=$run_identifier
- export jobname=$run_identifier
 
 
@@ -871 +869 @@
           printf "\n  +++ directory for local make depository:"
           printf "\n           $make_depository"
-          printf "\n      not found. Please run \"palmbuild -h $configuration_identifier\" "
+          printf "\n      not found. Please run \"palmbuild -c $configuration_identifier\" "
           locat=make_depository; exit
        fi

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# options -h and -d renamed -c and -r, respectively
+# 
+# 3402 2018-10-23 11:49:24Z knoop
 # job_id is set for compatibility reasons with older versions of config files
 # 
@@ -288 +291 @@
     # 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:zZ option
+ while  getopts  :a:A:bBc:CFG:i:jkm:M:O:q:r:R:s:t:T:u:U:vVw:W:xX:yY:zZ option
  do
    case  $option  in
@@ -295 +298 @@
        (b)   create_batch_job=true; prc="$prc -b";;
        (B)   delete_temporary_catalog=false; prc="$prc -B";;
+       (c)   configuration_identifier=$OPTARG; prc="$prc -c$OPTARG";;
        (C)   restart_run=true; prc="$prc -C";;
-       (d)   run_identifier=$OPTARG; prc="$prc -d$OPTARG";;
        (F)   create_jobfile_only=true;;
        (G)   global_revision=$OPTARG; prc="$prc -G'$OPTARG'";;
-       (h)   configuration_identifier=$OPTARG; prc="$prc -h$OPTARG";;
        (i)   run_id_number=$OPTARG;;
        (j)   running_in_batch_mode=true;;
@@ -307 +309 @@
        (O)   use_openmp=true; threads_per_task=$OPTARG; prc="$prc -O$OPTARG";;
        (q)   queue=$OPTARG; prc="$prc -q$OPTARG";;
+       (r)   run_identifier=$OPTARG; prc="$prc -r$OPTARG";;
        (R)   return_address=$OPTARG;;
        (s)   source_list=$OPTARG;;
@@ -344 +347 @@
     printf "\n        -b    batch-job on local machine               ---"
     printf "\n        -B    do not delete temporary directory at end ---"
-    printf "\n        -d    run identifier                           test"
+    printf "\n        -c    configuration identifier                 \"default\" "
     printf "\n        -F    create batch job file only               ---"
-    printf "\n        -h    host configuration                       \"default\" "
     printf "\n        -k    keep data from previous run"
     printf "\n        -m    memory demand in MB (batch-jobs)         0 MB"
@@ -352 +354 @@
     printf "\n        -O    threads per openMP task                  ---"
     printf "\n        -q    queue                                    \"$queue\" "
+    printf "\n        -r    run identifier                           test"
     printf "\n        -s    filenames of routines to be compiled     \"\" "
     printf "\n              must end with .f, .f90, .F, or .c !"
@@ -387 +390 @@
  printf "\n*** $version "
  printf "\n    will be executed.     Please wait ..."
-
-
-    # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
- export fname=$run_identifier
- export jobname=$run_identifier
 
 
@@ -1869 +1867 @@
        if [[ $do_trace = true ]]
        then
-          palmbuild  -h $configuration_identifier
+          palmbuild  -c $configuration_identifier
        else
-          palmbuild  -v  -h $configuration_identifier
+          palmbuild  -v  -c $configuration_identifier
        fi
 
@@ -1888 +1886 @@
 
        # NOW CREATE THE SOURCES_FOR_RUN FOLDER
-    palmbuild  -v  $use_existing_sources_folder  -h $configuration_identifier  -d $run_identifier
+    palmbuild  -v  $use_existing_sources_folder  -c $configuration_identifier  -r $run_identifier
 
     if [[ ${PIPESTATUS[0]} != 0 ]]
@@ -2778 +2776 @@
           printf "\n$dashes\n  +++ creating restart run failed \n"
           locat=create_restart
+          rm  palmrun_restart.log
           exit
-          rm  palmrun_restart.log
        else
           printf "\n$dashes\n  *** restart run initiated \n"
@@ -2815 +2813 @@
 
        # BUILD THE PALMRUN-COMMAND TO BE CALLED IN THE BATCH-JOB
-    palmrun_com="$palmrun_script_name -d $run_identifier -h $configuration_identifier -m $memory -t $cpumax -q $queue -i $run_id_number -U $local_username"
+    palmrun_com="$palmrun_script_name -r $run_identifier -c $configuration_identifier -m $memory -t $cpumax -q $queue -i $run_id_number -U $local_username"
     [[ "$activation_string_list" != "" ]]  &&  palmrun_com=${palmrun_com}" -a \"$activation_string_list\""
     [[ "$global_revision" != "" ]]  &&  palmrun_com=${palmrun_com}" -G \"$global_revision\""