Changeset 3025 for palm/trunk/SCRIPTS


Ignore:
Timestamp:
May 22, 2018 10:20:58 AM (3 years ago)
Author:
raasch
Message:

-T option not required for interactive runs (tasks per node = total number of cores is assumed as default, if option is not given), reformatting of a few messages, bugfix: destination output directory is created if attribute pe is set in .palm.iofiles

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.palm.iofiles

    r3010 r3025  
    4646PARTICLE_INFO*             out:tr   pt#       $base_data/$jobname/MONITORING     _prt_info
    4747PARTICLE_INFO*             out:tra  ptr       $base_data/$jobname/MONITORING     _prt_info
    48 LIST_PROFIL*               out:tr   d3#       $base_data/$jobname/MONITORING     _list_pr
     48LIST_PROFIL*               out:tr          $base_data/$jobname/MONITORING     _list_pr
    4949#
    5050DATA_1D_PR_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _pr        nc
  • palm/trunk/SCRIPTS/palmrun

    r2993 r3025  
    2727# -----------------
    2828# $Id: palmrun 2718 2018-01-02 08:49:38Z maronga $
     29# -T option not required for interactive runs (tasks per node =
     30# total number of cores is assumed as default, if option is not given),
     31# reformatting of a few messages,
     32# bugfix: destination output directory is created if attribute "pe" is set in
     33# .palm.iofiles
     34#
     35# 2718 2018-01-02 08:49:38Z maronga
    2936# bugfix of r2990
    3037#
     
    216223 write_binary=""
    217224 write_svf=""
    218  TOPT=""
    219225
    220226
     
    305311    printf "\n        -b    batch-job on local machine               ---"
    306312    printf "\n        -B    do not delete temporary directory at end ---"
    307     printf "\n        -d    base name of files attached to program   test"
     313    printf "\n        -d    run identifier                           test"
    308314    printf "\n        -F    create batch job file only               ---"
    309315    printf "\n        -h    host configuration                       \"default\" "
     
    741747
    742748    # VALUES OF PALMRUN-OPTIONS OVERWRITE THOSE FROM THE CONFIGURATION-FILE
    743  [[ $palmrun_memory     != ""  ]]  &&  memory=$palmrun_memory
    744  [[ $palmrun_cpumax     != ""  ]]  &&  cpumax=$palmrun_cpumax
    745  [[ "$palmrun_cores" != "" ]]  &&  cores=$palmrun_cores
     749 [[ "$palmrun_memory" != "" ]]  &&  memory=$palmrun_memory
     750 [[ "$palmrun_cpumax" != "" ]]  &&  cpumax=$palmrun_cpumax
     751 [[ "$palmrun_cores"  != "" ]]  &&  cores=$palmrun_cores
    746752 [[ "$max_par_io_str" != "" ]]  &&  maximum_parallel_io_streams=$max_par_io_str
    747753 [[ "$palmrun_tasks_per_node" != "" ]]  &&  tasks_per_node=$palmrun_tasks_per_node
     
    10141020    if [[ $tasks_per_node = 0 ]]
    10151021    then
    1016        printf "\n"
    1017        printf "\n  +++ option \"-T\" (tasks per node) is missing"
    1018        printf "\n      set -T option or define tasks_per_node in the config file"
    1019        locat=tasks_per_node; (( iec = 0 )); exit
     1022       if [[ $create_batch_job = true  ||  $create_remote_batch_job = true ]]
     1023       then
     1024          printf "\n"
     1025          printf "\n  +++ option \"-T\" (tasks per node) is missing"
     1026          printf "\n      set -T option or define tasks_per_node in the config file"
     1027          locat=tasks_per_node; (( iec = 0 )); exit
     1028       else
     1029             # DEFAULT FOR INTERACTIVE RUN
     1030          tasks_per_node=$cores
     1031       fi
    10201032    fi
    10211033
     
    10411053       printf "\n      One of the nodes is filled with $remaining_cores instead of $tasks_per_node tasks"
    10421054       (( nodes = nodes + 1 ))
    1043     fi
    1044 
    1045        # SET THE TOTAL NUMBER OF NODES, REQUIRED FOR THE SUBJOB-COMMAND (SEE FURTHER BELOW)
    1046     if [[ "$tasks_per_node" != "" ]]
    1047     then
    1048        TOPT="-T $tasks_per_node"
    10491055    fi
    10501056
     
    14981504    if [[ $running_on_remote = true ]]
    14991505    then
    1500        column1="execution on:"; column2="$host_configuration (IP:$remote_ip)"
     1506       column1="host identifier:"; column2="$host_configuration (execute on IP: $remote_ip)"
    15011507    else
    1502        column1="execution on:"; column2="$host_configuration (IP:$local_ip)"
     1508       column1="host identifier:"; column2="$host_configuration (execute on IP: $local_ip)"
    15031509    fi
    15041510 fi
     
    16451651 fi
    16461652 printf "|                                                                        | \n"
    1647  column1="base name of files:"; column2=$jobname
     1653 column1="run identifier:"; column2=$jobname
    16481654 printf "| %-25s%-45s | \n" "$column1" "$column2"
    16491655 column1="activation string list:"; column2=$(echo $activation_string_list)
     
    18651871    if (( i > 0 ))
    18661872    then
    1867        printf "  *** input files have been copied to the remote host\n"
     1873       printf "\n\n  *** input files have been copied to the remote host\n"
    18681874    fi
    18691875 fi
     
    26192625                   printf "  --- WARNING: ln failed, using cp instead (might be time consuming...)\n"
    26202626                              fi
     2627                              [[ ! -d "${pathout[$i]}" ]]  &&  mkdir  ${pathout[$i]}
    26212628                              cp -r  ${localout[$i]}/*  ${pathout[$i]}
    26222629             fi
Note: See TracChangeset for help on using the changeset viewer.