Changeset 3455


Ignore:
Timestamp:
Oct 30, 2018 2:12:31 PM (3 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:
7 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.palm.config.crayh

    r3346 r3455  
    88%user_source_path    $base_directory/JOBS/$run_identifier/USER_CODE
    99%fast_io_catalog     /gfs2/work/niksiraa
    10 %local_jobcatalog    /home/raasch/job_queue
    11 %remote_jobcatalog   /home/h/niksiraa/job_queue
     10%local_jobcatalog    /home/raasch/job_logfiles
     11%remote_jobcatalog   /home/h/niksiraa/job_logfiles
    1212#
    1313%local_ip            130.75.105.103
  • palm/trunk/SCRIPTS/.palm.config.default

    r3236 r3455  
    2222
    2323# folder for job protocols
    24 #%local_jobcatalog    $HOME/job_queue
     24#%local_jobcatalog    $HOME/job_logfiles
    2525
    2626# folder for job protocols to be used on the remote host
  • palm/trunk/SCRIPTS/.palm.config.default.in

    r3236 r3455  
    1515%user_source_path    @CMAKE_INSTALL_PREFIX@/JOBS/$run_identifier/USER_CODE
    1616%fast_io_catalog     @CMAKE_INSTALL_PREFIX@/tmp
    17 %local_jobcatalog    @CMAKE_INSTALL_PREFIX@/job_queue
     17%local_jobcatalog    @CMAKE_INSTALL_PREFIX@/job_logfiles
    1818#%remote_jobcatalog   <path/to/directory>
    1919#
  • palm/trunk/SCRIPTS/.palm.config.default_trace

    r3236 r3455  
    2222
    2323# folder for job protocols
    24 #%local_jobcatalog    $HOME/job_queue
     24#%local_jobcatalog    $HOME/job_logfiles
    2525
    2626# folder for job protocols to be used on the remote host
  • palm/trunk/SCRIPTS/.palm.config.idefix

    r3346 r3455  
    99%base_directory     $HOME/palm/current_version
    1010%fast_io_catalog    /work/<replace_by_your_IDEFIX_username>
    11 %local_jobcatalog   $HOME/job_queue
     11%local_jobcatalog   $HOME/job_logfiles
    1212%output_path        /work/<replace_by_your_IDEFIX_username>/JOBS/$run_identifier
    13 %remote_jobcatalog  $HOME/job_queue
     13%remote_jobcatalog  $HOME/job_logfiles
    1414%source_path        $HOME/palm/current_version/trunk/SOURCE
    1515%user_source_path   $base_directory/JOBS/$run_identifier/USER_CODE
  • palm/trunk/SCRIPTS/palmbuild

    r3312 r3455  
    2727# -----------------
    2828# $Id$
     29# options -h and -d renamed -c and -r, respectively
     30#
     31# 3312 2018-10-06 14:15:46Z knoop
    2932# "host identifier" in header output renamed "config. identifier",
    3033# host_configuration renamed configuration_identifier,
     
    127130
    128131    # READ SHELLSCRIPT-OPTIONS
    129  while  getopts  :d:h:uvV  option
     132 while  getopts  :c:r:uvV  option
    130133 do
    131134   case  $option  in
    132        (d)   run_identifier=$OPTARG;;
    133        (h)   configuration_identifier=$OPTARG;;
     135       (c)   configuration_identifier=$OPTARG;;
     136       (r)   run_identifier=$OPTARG;;
    134137       (v)   silent=true;;
    135138       (V)   use_existing_sources_folder=true;;
     
    138141   esac
    139142 done
    140 
    141 
    142     # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
    143  export fname=$run_identifier
    144  export jobname=$run_identifier
    145143
    146144
     
    871869          printf "\n  +++ directory for local make depository:"
    872870          printf "\n           $make_depository"
    873           printf "\n      not found. Please run \"palmbuild -h $configuration_identifier\" "
     871          printf "\n      not found. Please run \"palmbuild -c $configuration_identifier\" "
    874872          locat=make_depository; exit
    875873       fi
  • palm/trunk/SCRIPTS/palmrun

    r3402 r3455  
    2727# -----------------
    2828# $Id$
     29# options -h and -d renamed -c and -r, respectively
     30#
     31# 3402 2018-10-23 11:49:24Z knoop
    2932# job_id is set for compatibility reasons with older versions of config files
    3033#
     
    288291    # READ SHELLSCRIPT-OPTIONS AND REBUILD THE PALMRUN-COMMAND STRING (prc),
    289292    # WHICH WILL BE USED TO START RESTART-JOBS
    290  while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:zZ option
     293 while  getopts  :a:A:bBc:CFG:i:jkm:M:O:q:r:R:s:t:T:u:U:vVw:W:xX:yY:zZ option
    291294 do
    292295   case  $option  in
     
    295298       (b)   create_batch_job=true; prc="$prc -b";;
    296299       (B)   delete_temporary_catalog=false; prc="$prc -B";;
     300       (c)   configuration_identifier=$OPTARG; prc="$prc -c$OPTARG";;
    297301       (C)   restart_run=true; prc="$prc -C";;
    298        (d)   run_identifier=$OPTARG; prc="$prc -d$OPTARG";;
    299302       (F)   create_jobfile_only=true;;
    300303       (G)   global_revision=$OPTARG; prc="$prc -G'$OPTARG'";;
    301        (h)   configuration_identifier=$OPTARG; prc="$prc -h$OPTARG";;
    302304       (i)   run_id_number=$OPTARG;;
    303305       (j)   running_in_batch_mode=true;;
     
    307309       (O)   use_openmp=true; threads_per_task=$OPTARG; prc="$prc -O$OPTARG";;
    308310       (q)   queue=$OPTARG; prc="$prc -q$OPTARG";;
     311       (r)   run_identifier=$OPTARG; prc="$prc -r$OPTARG";;
    309312       (R)   return_address=$OPTARG;;
    310313       (s)   source_list=$OPTARG;;
     
    344347    printf "\n        -b    batch-job on local machine               ---"
    345348    printf "\n        -B    do not delete temporary directory at end ---"
    346     printf "\n        -d    run identifier                           test"
     349    printf "\n        -c    configuration identifier                 \"default\" "
    347350    printf "\n        -F    create batch job file only               ---"
    348     printf "\n        -h    host configuration                       \"default\" "
    349351    printf "\n        -k    keep data from previous run"
    350352    printf "\n        -m    memory demand in MB (batch-jobs)         0 MB"
     
    352354    printf "\n        -O    threads per openMP task                  ---"
    353355    printf "\n        -q    queue                                    \"$queue\" "
     356    printf "\n        -r    run identifier                           test"
    354357    printf "\n        -s    filenames of routines to be compiled     \"\" "
    355358    printf "\n              must end with .f, .f90, .F, or .c !"
     
    387390 printf "\n*** $version "
    388391 printf "\n    will be executed.     Please wait ..."
    389 
    390 
    391     # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
    392  export fname=$run_identifier
    393  export jobname=$run_identifier
    394392
    395393
     
    18691867       if [[ $do_trace = true ]]
    18701868       then
    1871           palmbuild  -h $configuration_identifier
     1869          palmbuild  -c $configuration_identifier
    18721870       else
    1873           palmbuild  -v  -h $configuration_identifier
     1871          palmbuild  -v  -c $configuration_identifier
    18741872       fi
    18751873
     
    18881886
    18891887       # NOW CREATE THE SOURCES_FOR_RUN FOLDER
    1890     palmbuild  -v  $use_existing_sources_folder  -h $configuration_identifier  -d $run_identifier
     1888    palmbuild  -v  $use_existing_sources_folder  -c $configuration_identifier  -r $run_identifier
    18911889
    18921890    if [[ ${PIPESTATUS[0]} != 0 ]]
     
    27782776          printf "\n$dashes\n  +++ creating restart run failed \n"
    27792777          locat=create_restart
     2778          rm  palmrun_restart.log
    27802779          exit
    2781           rm  palmrun_restart.log
    27822780       else
    27832781          printf "\n$dashes\n  *** restart run initiated \n"
     
    28152813
    28162814       # BUILD THE PALMRUN-COMMAND TO BE CALLED IN THE BATCH-JOB
    2817     palmrun_com="$palmrun_script_name -d $run_identifier -h $configuration_identifier -m $memory -t $cpumax -q $queue -i $run_id_number -U $local_username"
     2815    palmrun_com="$palmrun_script_name -r $run_identifier -c $configuration_identifier -m $memory -t $cpumax -q $queue -i $run_id_number -U $local_username"
    28182816    [[ "$activation_string_list" != "" ]]  &&  palmrun_com=${palmrun_com}" -a \"$activation_string_list\""
    28192817    [[ "$global_revision" != "" ]]  &&  palmrun_com=${palmrun_com}" -G \"$global_revision\""
Note: See TracChangeset for help on using the changeset viewer.