Changeset 2384


Ignore:
Timestamp:
Sep 4, 2017 11:39:54 AM (4 years ago)
Author:
raasch
Message:

small changes and bugfixes for new palm-scripts

Location:
palm/trunk/SCRIPTS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmbuild

    r2380 r2384  
    5454 ssh_key=""
    5555 suf=f90
    56  version="PALMBUILD  0.1  Rev$Rev: 2316 $"
     56 version="palmbuild  0.1  Rev$Rev: 2316 $"
    5757 working_directory=`pwd`
    5858
     
    597597
    598598             # COPY MAKE DEPOSITORY ON REMOTE MACHINE TO SOURCES_FOR_RUN_...
    599           printf "\n  *** copy MAKE_DEPOSITORY on remote host to SOURCES_FOR_RUN_$fname \n"
     599          printf "\n  *** copy MAKE_DEPOSITORY_${host} on remote host to SOURCES_FOR_RUN_$fname \n"
    600600          echo  "rm -rf $tmp_user_catalog/SOURCES_FOR_RUN_$fname; mkdir $tmp_user_catalog/SOURCES_FOR_RUN_$fname; cp ${remote_make_depository}/${program_name}_current_version.tar  $tmp_user_catalog/SOURCES_FOR_RUN_$fname; cd $tmp_user_catalog/SOURCES_FOR_RUN_$fname; tar xf ${program_name}_current_version.tar"  |  ssh  -q  $ssh_key  ${remote_username}@${remote_ip}  2>&1
    601601
     
    754754
    755755             # COPY MAKE DEPOSITORY ON LOCAL MACHINE TO SOURCES_FOR_RUN_...
    756           printf "\n  *** copy MAKE_DEPOSITORY on local host to "
     756          printf "\n  *** copy MAKE_DEPOSITORY_${host} on local host to "
    757757          printf "\n      $tmp_user_catalog/SOURCES_FOR_RUN_$fname \n"
    758758          rm -rf $tmp_user_catalog/SOURCES_FOR_RUN_$fname
  • palm/trunk/SCRIPTS/palmrun

    r2381 r2384  
    5252 activation_string_list=""
    5353 AddFilenames=""
    54  add_source_path=""
    5554 combine_plot_fields=true
    5655 compiler_name=""
     
    112111 tmp_data_catalog=""
    113112 transfer_problems=false
     113 user_source_path=""
    114114 use_openmp=false
    115115 version="palmrun  0.9 Rev$Rev: 2303 $"
     
    225225    printf "\n        -b    batch-job on local machine               ---"
    226226    printf "\n        -B    do not delete temporary directory at end ---"
    227     printf "\n        -c    configuration file                       .mrun.config"
     227    printf "\n        -c    configuration file                       .palm.config.default"
    228228    printf "\n        -d    base name of files attached to program   test"
    229229    printf "\n        -F    create batch job file only               ---"
    230230    printf "\n        -h    execution host                           \"default\" "
    231231    printf "\n        -k    keep data from previous run"
    232     printf "\n        -K    additional conditions for controling"
    233     printf "\n              usage of conditional code and"
    234     printf "\n              env-variables in configuration file      \"\" "
    235232    printf "\n        -m    memory demand in MB (batch-jobs)         0 MB"
    236233    printf "\n        -M    Makefile name                            Makefile"
    237234    printf "\n        -O    threads per openMP task                  ---"
    238235    printf "\n        -q    queue                                    \"$queue\" "
    239     printf "\n        -r    run control list (combines -i -o)        \"\" "
    240236    printf "\n        -s    filenames of routines to be compiled     \"\" "
    241237    printf "\n              must end with .f, .f90, .F, or .c !"
     
    243239    printf "\n              -s LM compiles all locally modified files"
    244240    printf "\n        -t    allowed cpu-time in seconds (batch)      0"
    245     printf "\n        -T    tasks per node                           depending on -h"
     241    printf "\n        -T    tasks per node                           ---"
    246242    printf "\n        -u    username on remote machine               \"\" "
    247243    printf "\n        -v    no prompt for confirmation               ---"
     
    732728
    733729          # COPY FILES FROM OPTIONAL SOURCE PATH GIVEN IN THE CONFIGURATION FILE
    734        if [[ "$add_source_path" != "" ]]
     730       if [[ "$user_source_path" != "" ]]
    735731       then
    736732
    737733             # DOES THE DIRECTORY EXIST?
    738           if [[ ! -d $add_source_path ]]
     734          if [[ ! -d $user_source_path ]]
    739735          then
    740736
    741737             printf "\n\n  *** INFORMATIVE: additional source code directory"
    742              printf "\n      \"$add_source_path\" "
     738             printf "\n      \"$user_source_path\" "
    743739             printf "\n      does not exist or is not a directory."
    744740             printf "\n      No source code will be used from this directory!\n"
    745              add_source_path=""
     741             user_source_path=""
    746742             if [[ $silent == false ]]
    747743             then
     
    751747          else
    752748
    753              cd $add_source_path
     749             cd $user_source_path
    754750             found=false
    755751
     
    769765
    770766                # COPY MAKEFILE IF EXISTING
    771              if [[ -f $add_source_path/Makefile ]]
     767             if [[ -f $user_source_path/Makefile ]]
    772768             then
    773769                printf "\n\n  *** user Makefile from directory"
    774                 printf "\n      \"$add_source_path\" is used \n"
     770                printf "\n      \"$user_source_path\" is used \n"
    775771                if [[ $silent == false ]]
    776772                then
    777773                   sleep 1
    778774                fi
    779                 cp  $add_source_path/Makefile  .
     775                cp  $user_source_path/Makefile  .
    780776             fi
    781777
     
    785781                then
    786782                   printf "\n  +++ source code file \"$filename\" found in additional"
    787                    printf "\n      source code directory \"$add_source_path\" "
     783                   printf "\n      source code directory \"$user_source_path\" "
    788784                   printf "\n      but was also given with option \"-s\" which means that it should be taken"
    789785                   printf "\n      from directory \"$source_path\"."
     
    791787                fi
    792788
    793                 cp  $add_source_path/$filename  .
     789                cp  $user_source_path/$filename  .
    794790                source_list="$source_list $filename"
    795791
     
    848844       # CHECK, IF THE NUMBER OF CORES PER NODE HAS BEEN GIVEN UND IF IT IS AN
    849845       # INTEGRAL DIVISOR OF THE TOTAL NUMBER OF CORES GIVEN BY OPTION -X
    850     if [[ "$tasks_per_node" = ""  &&  $host != lcxt5m ]]
     846    if [[ "$tasks_per_node" = "" ]]
    851847    then
    852848       printf "\n"
     
    11911187       # CHECK IF CPUTIME IS GIVEN FOR JOB
    11921188    done=false
     1189    cputime=$cpumax
    11931190    while [[ $done = false ]]
    11941191    do
    1195        cputime=$cpumax
    1196        if (( $cputime == 0 ))
     1192       if (( cputime == 0 ))
    11971193       then
    11981194          printf "\n  +++ cpu-time is undefined"
    11991195          printf "\n  >>> Please type CPU-time in seconds as INTEGER:"
    12001196          printf "\n  >>> "
    1201           read  cputime  1>/dev/null  2>&1
     1197          read  cputime   1>/dev/null  2>&1
    12021198       else
    12031199          done=true
     
    13111307 then
    13121308    column1="threads per task:"; column2="$threads_per_task"
     1309    printf "| %-25s%-45s | \n" "$column1" "$column2"
     1310 fi
     1311 if [[ $create_batch_job = true  ||  $create_remote_batch_job = true  ||  $running_in_batch_mode = true ]]
     1312 then
     1313    column1="job cpu time (h:m:s):"; column2="$timestring"
    13131314    printf "| %-25s%-45s | \n" "$column1" "$column2"
    13141315 fi
Note: See TracChangeset for help on using the changeset viewer.