Changeset 3236 for palm/trunk/SCRIPTS


Ignore:
Timestamp:
Sep 10, 2018 9:07:06 AM (3 years ago)
Author:
raasch
Message:

host identifier in header output renamed config. identifier, host_configuration renamed configuration_identifier, jobname renamed run_identifier, palmbuild: header output of PALM code revision, options -m, -s, and -S removed, palmrun: run_id renamed run_id_number, job_id renamed run_id, option -r renamed -i

Location:
palm/trunk/SCRIPTS
Files:
11 edited

Legend:

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

    r3199 r3236  
    66%base_directory      $HOME/palm/current_version
    77%source_path         $HOME/palm/current_version/trunk/SOURCE
    8 %user_source_path    $base_directory/JOBS/$jobname/USER_CODE
     8%user_source_path    $base_directory/JOBS/$run_identifier/USER_CODE
    99%fast_io_catalog     /gfs2/work/niksiraa
    1010%local_jobcatalog    /home/raasch/job_queue
  • palm/trunk/SCRIPTS/.palm.config.default

    r3205 r3236  
    1313
    1414# path to user interface routines
    15 %user_source_path  $base_directory/JOBS/$jobname/USER_CODE
     15%user_source_path  $base_directory/JOBS/$run_identifier/USER_CODE
    1616
    1717# path to file system with fast discs (if available). This folder
  • palm/trunk/SCRIPTS/.palm.config.default.in

    r3199 r3236  
    1313%base_data           @CMAKE_INSTALL_PREFIX@/JOBS
    1414%source_path         @CMAKE_INSTALL_PREFIX@/trunk/SOURCE
    15 %user_source_path    @CMAKE_INSTALL_PREFIX@/JOBS/$jobname/USER_CODE
     15%user_source_path    @CMAKE_INSTALL_PREFIX@/JOBS/$run_identifier/USER_CODE
    1616%fast_io_catalog     @CMAKE_INSTALL_PREFIX@/tmp
    1717%local_jobcatalog    @CMAKE_INSTALL_PREFIX@/job_queue
  • palm/trunk/SCRIPTS/.palm.config.default_trace

    r3206 r3236  
    1313
    1414# path to user interface routines
    15 %user_source_path  $base_directory/JOBS/$jobname/USER_CODE
     15%user_source_path  $base_directory/JOBS/$run_identifier/USER_CODE
    1616
    1717# path to file system with fast discs (if available). This folder
  • palm/trunk/SCRIPTS/.palm.config.eddy_gfort

    r3199 r3236  
    77%base_directory      $HOME/palm/current_version
    88%source_path         $HOME/palm/current_version/trunk/SOURCE
    9 %user_source_path    $base_directory/JOBS/$jobname/USER_CODE
     9%user_source_path    $base_directory/JOBS/$run_identifier/USER_CODE
    1010%fast_io_catalog     $WORK/palm_restart_tmp
    1111%local_jobcatalog    $HOME/job_queue
  • palm/trunk/SCRIPTS/.palm.config.eddy_ifort

    r3199 r3236  
    77%base_directory      $HOME/palm/current_version
    88%source_path         $HOME/palm/current_version/trunk/SOURCE
    9 %user_source_path    $base_directory/JOBS/$jobname/USER_CODE
     9%user_source_path    $base_directory/JOBS/$run_identifier/USER_CODE
    1010%fast_io_catalog     $WORK/palm_restart_tmp
    1111%local_jobcatalog    $HOME/job_queue
  • palm/trunk/SCRIPTS/.palm.config.idefix

    r3205 r3236  
    1010%fast_io_catalog    /work/<replace_by_your_IDEFIX_username>
    1111%local_jobcatalog   $HOME/job_queue
    12 %output_path        /work/<replace_by_your_IDEFIX_username>/JOBS/$jobname
     12%output_path        /work/<replace_by_your_IDEFIX_username>/JOBS/$run_identifier
    1313%remote_jobcatalog  $HOME/job_queue
    1414%source_path        $HOME/palm/current_version/trunk/SOURCE
    15 %user_source_path   $base_directory/JOBS/$jobname/USER_CODE
     15%user_source_path   $base_directory/JOBS/$run_identifier/USER_CODE
    1616#
    1717%local_ip            130.75.105.239
  • palm/trunk/SCRIPTS/.palm.config.imuk

    r3205 r3236  
    77%fast_io_catalog   /localdata/raasch
    88%source_path       $HOME/palm/current_version/trunk/SOURCE
    9 %user_source_path  $base_directory/JOBS/$jobname/USER_CODE
     9%user_source_path  $base_directory/JOBS/$run_identifier/USER_CODE
    1010#
    1111%local_ip            130.75.105.103
     
    1515%cpp_options         -cpp -D__parallel -DMPI_REAL=MPI_DOUBLE_PRECISION -DMPI_2REAL=MPI_2DOUBLE_PRECISION -D__fftw -D__netcdf
    1616%make_options        -j 4
    17 %compiler_options    -openmp -fpe0 -O3 -xHost -fp-model source -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -I /muksoft/packages/fftw/3.3.4/include -L/muksoft/packages/fftw/3.3.4/lib64 -lfftw3 -I /muksoft/packages/netcdf/4_intel/include -L/muksoft/packages/netcdf/4_intel/lib -lnetcdf -lnetcdff
    18 %linker_options      -openmp -fpe0 -O3 -xHost -fp-model source -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -I /muksoft/packages/fftw/3.3.4/include -L/muksoft/packages/fftw/3.3.4/lib64 -lfftw3 -I /muksoft/packages/netcdf/4_intel/include -L/muksoft/packages/netcdf/4_intel/lib -lnetcdf -lnetcdff
     17%compiler_options    -fpe0 -O3 -xHost -fp-model source -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -I /muksoft/packages/fftw/3.3.4/include -L/muksoft/packages/fftw/3.3.4/lib64 -lfftw3 -I /muksoft/packages/netcdf/4_intel/include -L/muksoft/packages/netcdf/4_intel/lib -lnetcdf -lnetcdff
     18%linker_options      -fpe0 -O3 -xHost -fp-model source -ftz -fno-alias -no-prec-div -no-prec-sqrt -ip -I /muksoft/packages/fftw/3.3.4/include -L/muksoft/packages/fftw/3.3.4/lib64 -lfftw3 -I /muksoft/packages/netcdf/4_intel/include -L/muksoft/packages/netcdf/4_intel/lib -lnetcdf -lnetcdff
    1919%hostfile            auto
    2020%execute_command     mpiexec  -machinefile hostfile  -n {{mpi_tasks}}  palm
  • palm/trunk/SCRIPTS/.palm.iofiles

    r3159 r3236  
     1#$Id$
    12#
    23#---------------------------------------------------------------------------------------------
    34# List of input-files
    45#---------------------------------------------------------------------------------------------
    5 PARIN                    in:tr      d3#      $base_data/$jobname/INPUT          _p3d*
    6 PARIN                    in:tr      d3r      $base_data/$jobname/INPUT          _p3dr*
    7 PARIN                    in:tr      pcr      $base_data/$jobname/INPUT          _pcr*
    8 NAVIGATION_DATA          inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _nav*
    9 TOPOGRAPHY_DATA          inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _topo*
    10 PIDS_STATIC              inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _static*
    11 PIDS_DYNAMIC             inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _dynamic*
    12 rrtmg_lw.nc              inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _rlw
    13 rrtmg_sw.nc              inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _rsw
    14 WTM_DATA                 inopt:tr   d3#:d3r  $base_data/$jobname/INPUT          _wtm
    15 BININ                    in:lnpe    d3r:rec  $fast_io_catalog/$jobname/RESTART  _d3d*
    16 PARTICLE_RESTART_DATA_IN in:lnpe    prtr     $fast_io_catalog/$jobname/RESTART  _rprt
    17 SVFIN                    in:lnpe    svfin    $fast_io_catalog/$jobname/SVF      _svf*
    18 DATA_1D_PR_NETCDF        inopt      prr      $base_data/$jobname/OUTPUT         _pr*       nc
    19 DATA_1D_SP_NETCDF        inopt      spr      $base_data/$jobname/OUTPUT         _sp*       nc
    20 DATA_1D_TS_NETCDF        inopt      tsr      $base_data/$jobname/OUTPUT         _ts*       nc
    21 DATA_1D_PTS_NETCDF       inopt      ptsr     $base_data/$jobname/OUTPUT         _pts*      nc
    22 DATA_2D_XY_NETCDF        inopt      xyr      $base_data/$jobname/OUTPUT         _xy*       nc
    23 DATA_2D_XY_AV_NETCDF     inopt      xyr      $base_data/$jobname/OUTPUT         _av_xy*    nc
    24 DATA_2D_XZ_NETCDF        inopt      xzr      $base_data/$jobname/OUTPUT         _xz*       nc
    25 DATA_2D_XZ_AV_NETCDF     inopt      xzr      $base_data/$jobname/OUTPUT         _av_xz*    nc
    26 DATA_2D_YZ_NETCDF        inopt      yzr      $base_data/$jobname/OUTPUT         _yz*       nc
    27 DATA_2D_YZ_AV_NETCDF     inopt      yzr      $base_data/$jobname/OUTPUT         _av_yz*    nc
    28 DATA_3D_NETCDF           inopt      3dr      $base_data/$jobname/OUTPUT         _3d*       nc
    29 DATA_3D_AV_NETCDF        inopt      3dr      $base_data/$jobname/OUTPUT         _av_3d*    nc
    30 DATA_MASK_NETCDF         inopt      mar      $base_data/$jobname/OUTPUT         _masked    nc
    31 DATA_MASK_AV_NETCDF      inopt      mar      $base_data/$jobname/OUTPUT         _av_masked nc
    32 DATA_PRT_NETCDF          inopt:pe   prtr     $base_data/$jobname/OUTPUT         _prt*
     6PARIN                    in:tr      d3#      $base_data/$run_identifier/INPUT          _p3d*
     7PARIN                    in:tr      d3r      $base_data/$run_identifier/INPUT          _p3dr*
     8PARIN                    in:tr      pcr      $base_data/$run_identifier/INPUT          _pcr*
     9NAVIGATION_DATA          inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _nav*
     10TOPOGRAPHY_DATA          inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _topo*
     11PIDS_STATIC              inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _static*
     12PIDS_DYNAMIC             inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _dynamic*
     13rrtmg_lw.nc              inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _rlw
     14rrtmg_sw.nc              inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _rsw
     15WTM_DATA                 inopt:tr   d3#:d3r  $base_data/$run_identifier/INPUT          _wtm
     16BININ                    in:lnpe    d3r:rec  $fast_io_catalog/$run_identifier/RESTART  _d3d*
     17PARTICLE_RESTART_DATA_IN in:lnpe    prtr     $fast_io_catalog/$run_identifier/RESTART  _rprt
     18SVFIN                    in:lnpe    svfin    $fast_io_catalog/$run_identifier/SVF      _svf*
     19DATA_1D_PR_NETCDF        inopt      prr      $base_data/$run_identifier/OUTPUT         _pr*       nc
     20DATA_1D_SP_NETCDF        inopt      spr      $base_data/$run_identifier/OUTPUT         _sp*       nc
     21DATA_1D_TS_NETCDF        inopt      tsr      $base_data/$run_identifier/OUTPUT         _ts*       nc
     22DATA_1D_PTS_NETCDF       inopt      ptsr     $base_data/$run_identifier/OUTPUT         _pts*      nc
     23DATA_2D_XY_NETCDF        inopt      xyr      $base_data/$run_identifier/OUTPUT         _xy*       nc
     24DATA_2D_XY_AV_NETCDF     inopt      xyr      $base_data/$run_identifier/OUTPUT         _av_xy*    nc
     25DATA_2D_XZ_NETCDF        inopt      xzr      $base_data/$run_identifier/OUTPUT         _xz*       nc
     26DATA_2D_XZ_AV_NETCDF     inopt      xzr      $base_data/$run_identifier/OUTPUT         _av_xz*    nc
     27DATA_2D_YZ_NETCDF        inopt      yzr      $base_data/$run_identifier/OUTPUT         _yz*       nc
     28DATA_2D_YZ_AV_NETCDF     inopt      yzr      $base_data/$run_identifier/OUTPUT         _av_yz*    nc
     29DATA_3D_NETCDF           inopt      3dr      $base_data/$run_identifier/OUTPUT         _3d*       nc
     30DATA_3D_AV_NETCDF        inopt      3dr      $base_data/$run_identifier/OUTPUT         _av_3d*    nc
     31DATA_MASK_NETCDF         inopt      mar      $base_data/$run_identifier/OUTPUT         _masked    nc
     32DATA_MASK_AV_NETCDF      inopt      mar      $base_data/$run_identifier/OUTPUT         _av_masked nc
     33DATA_PRT_NETCDF          inopt:pe   prtr     $base_data/$run_identifier/OUTPUT         _prt*
    3334#
    3435#---------------------------------------------------------------------------------------------
    3536# List of output-files
    3637#---------------------------------------------------------------------------------------------
    37 BINOUT*                    out:lnpe restart   $fast_io_catalog/$jobname/RESTART  _d3d
    38 PARTICLE_RESTART_DATA_OUT* out:lnpe prt#:prtr $fast_io_catalog/$jobname/RESTART  _rprt
    39 SVFOUT*                    out:lnpe svfout    $fast_io_catalog/$jobname/SVF      _svf
     38BINOUT*                    out:lnpe restart   $fast_io_catalog/$run_identifier/RESTART  _d3d
     39PARTICLE_RESTART_DATA_OUT* out:lnpe prt#:prtr $fast_io_catalog/$run_identifier/RESTART  _rprt
     40SVFOUT*                    out:lnpe svfout    $fast_io_catalog/$run_identifier/SVF      _svf
    4041#
    41 RUN_CONTROL*               out:tr   d3#:pcr   $base_data/$jobname/MONITORING     _rc
    42 RUN_CONTROL*               out:tra  d3r       $base_data/$jobname/MONITORING     _rc
    43 HEADER*                    out:tr   d3#:pcr   $base_data/$jobname/MONITORING     _header
    44 HEADER*                    out:tra  d3r       $base_data/$jobname/MONITORING     _header
    45 CPU_MEASURES*              out:tr   d3#:pcr   $base_data/$jobname/MONITORING     _cpu
    46 CPU_MEASURES*              out:tra  d3r       $base_data/$jobname/MONITORING     _cpu
    47 PARTICLE_INFO*             out:tr   pt#       $base_data/$jobname/MONITORING     _prt_info
    48 PARTICLE_INFO*             out:tra  ptr       $base_data/$jobname/MONITORING     _prt_info
    49 LIST_PROFIL*               out:tr   *         $base_data/$jobname/MONITORING     _list_pr
     42RUN_CONTROL*               out:tr   d3#:pcr   $base_data/$run_identifier/MONITORING     _rc
     43RUN_CONTROL*               out:tra  d3r       $base_data/$run_identifier/MONITORING     _rc
     44HEADER*                    out:tr   d3#:pcr   $base_data/$run_identifier/MONITORING     _header
     45HEADER*                    out:tra  d3r       $base_data/$run_identifier/MONITORING     _header
     46CPU_MEASURES*              out:tr   d3#:pcr   $base_data/$run_identifier/MONITORING     _cpu
     47CPU_MEASURES*              out:tra  d3r       $base_data/$run_identifier/MONITORING     _cpu
     48PARTICLE_INFO*             out:tr   pt#       $base_data/$run_identifier/MONITORING     _prt_info
     49PARTICLE_INFO*             out:tra  ptr       $base_data/$run_identifier/MONITORING     _prt_info
     50LIST_PROFIL*               out:tr   *         $base_data/$run_identifier/MONITORING     _list_pr
    5051#
    51 DATA_1D_PR_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _pr        nc
    52 DATA_1D_SP_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _sp        nc
    53 DATA_1D_TS_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _ts        nc
    54 DATA_1D_PTS_NETCDF         out:tr   *         $base_data/$jobname/OUTPUT         _pts       nc
    55 DATA_2D_XY_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _xy        nc
    56 DATA_2D_XY_AV_NETCDF*      out:tr   *         $base_data/$jobname/OUTPUT         _av_xy     nc
    57 DATA_2D_XZ_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _xz        nc
    58 DATA_2D_XZ_AV_NETCDF*      out:tr   *         $base_data/$jobname/OUTPUT         _av_xz     nc
    59 DATA_2D_YZ_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _yz        nc
    60 DATA_2D_YZ_AV_NETCDF*      out:tr   *         $base_data/$jobname/OUTPUT         _av_yz     nc
    61 DATA_3D_NETCDF*            out:tr   *         $base_data/$jobname/OUTPUT         _3d        nc
    62 DATA_3D_AV_NETCDF*         out:tr   *         $base_data/$jobname/OUTPUT         _av_3d     nc
    63 DATA_MASK_NETCDF*          out:tr   *         $base_data/$jobname/OUTPUT         _masked    nc
    64 DATA_MASK_AV_NETCDF*       out:tr   *         $base_data/$jobname/OUTPUT         _av_masked nc
    65 DATA_AGT_NETCDF            out:tr   *         $base_data/$jobname/OUTPUT         _agt       nc
     52DATA_1D_PR_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _pr        nc
     53DATA_1D_SP_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _sp        nc
     54DATA_1D_TS_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _ts        nc
     55DATA_1D_PTS_NETCDF         out:tr   *         $base_data/$run_identifier/OUTPUT         _pts       nc
     56DATA_2D_XY_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _xy        nc
     57DATA_2D_XY_AV_NETCDF*      out:tr   *         $base_data/$run_identifier/OUTPUT         _av_xy     nc
     58DATA_2D_XZ_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _xz        nc
     59DATA_2D_XZ_AV_NETCDF*      out:tr   *         $base_data/$run_identifier/OUTPUT         _av_xz     nc
     60DATA_2D_YZ_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _yz        nc
     61DATA_2D_YZ_AV_NETCDF*      out:tr   *         $base_data/$run_identifier/OUTPUT         _av_yz     nc
     62DATA_3D_NETCDF*            out:tr   *         $base_data/$run_identifier/OUTPUT         _3d        nc
     63DATA_3D_AV_NETCDF*         out:tr   *         $base_data/$run_identifier/OUTPUT         _av_3d     nc
     64DATA_MASK_NETCDF*          out:tr   *         $base_data/$run_identifier/OUTPUT         _masked    nc
     65DATA_MASK_AV_NETCDF*       out:tr   *         $base_data/$run_identifier/OUTPUT         _av_masked nc
     66DATA_AGT_NETCDF            out:tr   *         $base_data/$run_identifier/OUTPUT         _agt       nc
    6667#
    67 DATA_PRT_NETCDF*           out:pe   *         $base_data/$jobname/OUTPUT         _prt
    68 DATA_PRT_NETCDF*           out:trpe *         $base_data/$jobname/OUTPUT         _prt
    69 PARTICLE_DATA*             out:lnpe *         $base_data/$jobname/OUTPUT         _prt_dat
     68DATA_PRT_NETCDF*           out:pe   *         $base_data/$run_identifier/OUTPUT         _prt
     69DATA_PRT_NETCDF*           out:trpe *         $base_data/$run_identifier/OUTPUT         _prt
     70PARTICLE_DATA*             out:lnpe *         $base_data/$run_identifier/OUTPUT         _prt_dat
    7071#
    71 WTM_OUTPUT_DATA*           out:tr   *         $base_data/$jobname/MONITORING     _wtm
     72WTM_OUTPUT_DATA*           out:tr   *         $base_data/$run_identifier/MONITORING     _wtm
  • palm/trunk/SCRIPTS/palmbuild

    r3210 r3236  
    2727# -----------------
    2828# $Id$
     29# "host identifier" in header output renamed "config. identifier",
     30# host_configuration renamed configuration_identifier,
     31# jobname renamed run_identifier
     32# header output of PALM code revision,
     33# options -m, -s, and -S removed
     34#
     35# 3210 2018-08-28 07:31:13Z sward
    2936# Bugfix: agent_preprocessing stays in MAKE_DEPOSITORY after compilation
    3037#
     
    7784 column1=""
    7885 column2=""
    79  host_configuration=default
     86 configuration_identifier=default
     87 global_revision=""
    8088 locat=normal
    8189 makefile=""
     
    95103    # ERROR HANDLING
    96104    # IN CASE OF EXIT:
    97  trap 'rm -rf  ${source_path}/${host_configuration}_last_make_protocol
     105 trap 'rm -rf  ${source_path}/${configuration_identifier}_last_make_protocol
    98106       if [[ $locat != normal ]]
    99107       then
     
    112120    # IN CASE OF TERMINAL-BREAK:
    113121 trap 'printf "\n\n +++ palmbuild killed by \"^C\" \n\n"
    114        rm  ${source_path}/${host_configuration}_last_make_protocol
     122       rm  ${source_path}/${configuration_identifier}_last_make_protocol
    115123       exit
    116124      ' 2
     
    119127
    120128    # READ SHELLSCRIPT-OPTIONS
    121  while  getopts  :d:h:m:s:S:uvV  option
     129 while  getopts  :d:h:uvV  option
    122130 do
    123131   case  $option  in
    124        (d)   jobname=$OPTARG;;
    125        (h)   host_configuration=$OPTARG;;
    126        (m)   makefile=$OPTARG;;
    127        (s)   suf=$OPTARG;;
    128        (S)   source_list="$OPTARG";;
     132       (d)   run_identifier=$OPTARG;;
     133       (h)   configuration_identifier=$OPTARG;;
    129134       (v)   silent=true;;
    130135       (V)   use_existing_sources_folder=true;;
     
    135140
    136141
    137     # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLE
    138  export fname=$jobname
     142    # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
     143 export fname=$run_identifier
     144 export jobname=$run_identifier
    139145
    140146
    141147    # BUILD THE CONFIGURATION-FILE NAME AND THE SOURCES_FOR_RUN-FOLDER NAME
    142  config_file=.palm.config.$host_configuration
    143  sources_for_run_catalog=SOURCES_FOR_RUN_${host_configuration}_$jobname
     148 config_file=.palm.config.$configuration_identifier
     149 sources_for_run_catalog=SOURCES_FOR_RUN_${configuration_identifier}_$run_identifier
    144150
    145151
     
    249255
    250256    # CHECK MAKEFILE
    251  [[ "$makefile" = "" ]]  &&  makefile=$source_path/Makefile
     257 makefile=$source_path/Makefile
    252258 if [[ ! -f $makefile ]]
    253259 then
     
    312318
    313319    line=`grep %base_directory $config_file`
    314     make_depository=`echo $line | cut -d" " -s -f2`/MAKE_DEPOSITORY_${host_configuration}
     320    make_depository=`echo $line | cut -d" " -s -f2`/MAKE_DEPOSITORY_${configuration_identifier}
    315321
    316322 else
    317323
    318     make_depository=${base_directory}/MAKE_DEPOSITORY_${host_configuration}
    319 
    320  fi
     324    make_depository=${base_directory}/MAKE_DEPOSITORY_${configuration_identifier}
     325
     326 fi
     327
     328
     329    # GET THE GLOBAL REVISION-NUMBER OF THE SVN-REPOSITORY
     330 global_revision=`svnversion $source_path  2>/dev/null`
     331 global_revision="Rev: $global_revision"
     332
    321333
    322334    # HEADER-OUTPUT (PART1: MESSAGES CONCERNING THE LOCAL HOST)
     
    327339    printf "#------------------------------------------------------------------------# \n"
    328340    printf "| %-40s%30s | \n" "$version" "$calltime"
     341    printf "| %-40s%30s | \n" "PALM code       $global_revision" " "
    329342    printf "|                                                                        | \n"
    330343    printf "| %-13s%-57s | \n" "called on:" "$(hostname) (IP:$local_ip)"
     
    363376    if [[ "$remote_ip" != "" ]]
    364377    then
    365        column2="$host_configuration"
    366        printf "| %-20s%-50s | \n" "host configuration:" "$column2"
     378       column2="$configuration_identifier"
     379       printf "| %-20s%-50s | \n" "config. identifier:" "$column2"
    367380       column2=$(echo "$make_depository" | cut -c1-50 )
    368381       printf "| %-20s%-50s | \n" "remote depository:" "$column2"
    369382    else
    370        column2="$host_configuration"
    371        printf "| %-20s%-50s | \n" "host identifier:" "$column2"
     383       column2="$configuration_identifier"
     384       printf "| %-20s%-50s | \n" "config. identifier:" "$column2"
    372385       column2=$(echo "$make_depository" | cut -c1-50 )
    373386       printf "| %-20s%-50s | \n" "local depository:" "$column2"
     
    496509
    497510       # NEXT IS THE BRANCH FOR CREATING THE MAKE_DEPOSITORY_...
    498     if [[ "$jobname" = "" ]]
     511    if [[ "$run_identifier" = "" ]]
    499512    then
    500513
     
    543556       fi
    544557       make_call_string="make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$linker_options\" "
    545        echo "$login_init_cmd $module_commands cd ${make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${host_configuration}_last_make_protocol
    546 
    547        if [[ $(grep -c MAKE_ERROR ${host_configuration}_last_make_protocol) != 0 ]]
     558       echo "$login_init_cmd $module_commands cd ${make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${configuration_identifier}_last_make_protocol
     559
     560       if [[ $(grep -c MAKE_ERROR ${configuration_identifier}_last_make_protocol) != 0 ]]
    548561       then
    549562          printf "\a\n  +++ error(s) occurred during compiling or linking of utilities"
    550           printf "\n      for host configuration \"$host_configuration\" "
     563          printf "\n      for host configuration \"$configuration_identifier\" "
    551564          if [[ $silent = false ]]
    552565          then
     
    559572                if [[ "$answer" = l ]]
    560573                then
    561                    more ${host_configuration}_last_make_protocol
     574                   more ${configuration_identifier}_last_make_protocol
    562575                fi
    563576             done
     
    582595       fi
    583596       make_call_string="make  $make_options  PROG=$program_name  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$compiler_options\"  LDFLAGS=\"$linker_options\" "
    584        echo "$login_init_cmd $module_commands cd ${make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${host_configuration}_last_make_protocol
    585 
    586        if [[ $(grep -c MAKE_ERROR ${host_configuration}_last_make_protocol) != 0 ]]
    587        then
    588           printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$host_configuration\" "
     597       echo "$login_init_cmd $module_commands cd ${make_depository}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${configuration_identifier}_last_make_protocol
     598
     599       if [[ $(grep -c MAKE_ERROR ${configuration_identifier}_last_make_protocol) != 0 ]]
     600       then
     601          printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$configuration_identifier\" "
    589602          if [[ $silent = false ]]
    590603          then
     
    597610                if [[ "$answer" = l ]]
    598611                then
    599                    more ${host_configuration}_last_make_protocol
     612                   more ${configuration_identifier}_last_make_protocol
    600613                fi
    601614             done
     
    621634       # INCLUDING E.G. USER-INTERFACE ROUTINES. ALSO ADD OTHER UTILITY EXECUTABLES. EVERYTHING IS
    622635       # COLLECTED IN DIRECTORY SOURCES_FOR_RUN_...
    623     elif [[ "$jobname" != "" ]]
     636    elif [[ "$run_identifier" != "" ]]
    624637    then
    625638
    626639          # FIRST CHECK, IF COMPILED SOURCES FOR THIS RUN IDENTIFIER EXISTS
    627640          # AND ASK, IF THEY SHALL BE USED
    628        echo  "[[ -d ${fast_io_catalog}/${sources_for_run_catalog} ]]  &&  echo sources for run found" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1  >  ${host_configuration}_last_make_protocol
    629        if [[ $(grep -c "sources for run found" ${host_configuration}_last_make_protocol) != 0  &&  $use_existing_sources_folder = true ]]
    630        then
    631           printf "\a\n  *** compiled sources for run \"$jobname\" found on remote host in folder"
     641       echo  "[[ -d ${fast_io_catalog}/${sources_for_run_catalog} ]]  &&  echo sources for run found" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1  >  ${configuration_identifier}_last_make_protocol
     642       if [[ $(grep -c "sources for run found" ${configuration_identifier}_last_make_protocol) != 0  &&  $use_existing_sources_folder = true ]]
     643       then
     644          printf "\a\n  *** compiled sources for run \"$run_identifier\" found on remote host in folder"
    632645          printf "\n      ${fast_io_catalog}/${sources_for_run_catalog}"
    633646          printf "\n      will be used!"
     
    638651       if [[ $silent = false ]]
    639652       then
    640           printf "\n  *** copy MAKE_DEPOSITORY_${host_configuration} on remote host to $sources_for_run_catalog \n"
     653          printf "\n  *** copy MAKE_DEPOSITORY_${configuration_identifier} on remote host to $sources_for_run_catalog \n"
    641654       fi
    642655       echo  "rm -rf ${fast_io_catalog}/${sources_for_run_catalog}; mkdir -p ${fast_io_catalog}/${sources_for_run_catalog}; cp ${make_depository}/${program_name}_current_version.tar  ${fast_io_catalog}/${sources_for_run_catalog}; cd ${fast_io_catalog}/${sources_for_run_catalog}; tar xf ${program_name}_current_version.tar"  |  ssh  -q  $ssh_key  ${remote_username}@${remote_ip}  2>&1
     
    663676             echo "  *** execute \"make\" on remote host"
    664677          fi
    665           echo "$login_init_cmd $module_commands cd ${fast_io_catalog}/${sources_for_run_catalog}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${host_configuration}_last_make_protocol
    666 
    667           if [[ $(grep -c MAKE_ERROR ${host_configuration}_last_make_protocol) != 0 ]]
     678          echo "$login_init_cmd $module_commands cd ${fast_io_catalog}/${sources_for_run_catalog}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1 | tee ${configuration_identifier}_last_make_protocol
     679
     680          if [[ $(grep -c MAKE_ERROR ${configuration_identifier}_last_make_protocol) != 0 ]]
    668681          then
    669              printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$host_configuration\" "
     682             printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$configuration_identifier\" "
    670683             if [[ $silent = false ]]
    671684             then
     
    678691                   if [[ "$answer" = l ]]
    679692                   then
    680                       more ${host_configuration}_last_make_protocol
     693                      more ${configuration_identifier}_last_make_protocol
    681694                   fi
    682695                done
     
    701714    fi
    702715
    703     rm -rf  ${source_path}/${host_configuration}_last_make_protocol
     716    rm -rf  ${source_path}/${configuration_identifier}_last_make_protocol
    704717
    705718
     
    710723       # NEXT IS THE BRANCH FOR CREATING THE MAKE_DEPOSITORY_... ON THE
    711724       # LOCAL HOST
    712     if [[ "$jobname" = "" ]]
     725    if [[ "$run_identifier" = "" ]]
    713726    then
    714727
     
    774787       fi
    775788
    776        make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"  2>&1 | tee ${host_configuration}_last_make_protocol
     789       make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"  2>&1 | tee ${configuration_identifier}_last_make_protocol
    777790
    778791       if [[ $? != 0 ]]
    779792       then
    780           printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$host_configuration\" "
     793          printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$configuration_identifier\" "
    781794          if [[ $silent = false ]]
    782795          then
     
    789802                if [[ "$answer" = l ]]
    790803                then
    791                    more ${host_configuration}_last_make_protocol
     804                   more ${configuration_identifier}_last_make_protocol
    792805                fi
    793806             done
     
    820833       if [[ -d ${fast_io_catalog}/${sources_for_run_catalog}  &&  $use_existing_sources_folder = true ]]
    821834       then
    822           printf "\a\n  *** compiled sources for run \"$jobname\" found on local host in folder"
     835          printf "\a\n  *** compiled sources for run \"$run_identifier\" found on local host in folder"
    823836          printf "\n      ${fast_io_catalog}/${sources_for_run_catalog}"
    824837          printf "\n      will be used!"
     
    831844          printf "\n  +++ directory for local make depository:"
    832845          printf "\n           $make_depository"
    833           printf "\n      not found. Please run \"palmbuild -h $host_configuration\" "
     846          printf "\n      not found. Please run \"palmbuild -h $configuration_identifier\" "
    834847          locat=make_depository; exit
    835848       fi
     
    839852       if [[ $silent = false ]]
    840853       then
    841           printf "\n  *** copy MAKE_DEPOSITORY_${host_configuration} on local host to "
     854          printf "\n  *** copy MAKE_DEPOSITORY_${configuration_identifier} on local host to "
    842855          printf "\n      ${fast_io_catalog}/${sources_for_run_catalog} \n"
    843856       fi
     
    875888          then
    876889
    877              printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$host_configuration\" "
     890             printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$configuration_identifier\" "
    878891             if [[ $silent = false ]]
    879892             then
  • palm/trunk/SCRIPTS/palmrun

    r3151 r3236  
    2727# -----------------
    2828# $Id$
     29# warning issued in case of file connection file version mismatch,
     30# host_configuration renamed configuration_identifier,
     31# "host identifier" in header output renamed "config. identifier",
     32# jobname renamed run_identifier,
     33# run_id renamed run_id_number
     34# job_id renamed run_id
     35# option -r renamed -i
     36#
     37# 3151 2018-07-19 08:45:38Z raasch
    2938# removed additional listing of files to be compiled, print PALM code revision
    3039# in header
     
    170179 compiler_name_ser=""
    171180 compiler_options=""
     181 configuration_identifier="default"
    172182 cores=1
    173183 cores_atmos=0
     
    188198 execution_error=false
    189199 fileconnection_file=trunk/SCRIPTS/.palm.iofiles
    190  jobname=test
    191200 global_revision=""
    192  host_configuration="default"
    193201 hostfile=""
    194202 hp=""
     
    221229 run_coupled_model=false
    222230 run_id=""
     231 run_id_number=""
     232 run_identifier=test
    223233 silent=false
    224234 source_list=""
     
    267277    # READ SHELLSCRIPT-OPTIONS AND REBUILD THE PALMRUN-COMMAND STRING (prc),
    268278    # WHICH WILL BE USED TO START RESTART-JOBS
    269  while  getopts  :a:A:bBCd:FG:h:jkm:M:O:q:r:R:s:t:T:u:U:vVw:W:xX:yY:Z option
     279 while  getopts  :a:A:bBCd:FG:h:i:jkm:M:O:q:R:s:t:T:u:U:vVw:W:xX:yY:Z option
    270280 do
    271281   case  $option  in
     
    275285       (B)   delete_temporary_catalog=false; prc="$prc -B";;
    276286       (C)   restart_run=true; prc="$prc -C";;
    277        (d)   jobname=$OPTARG; prc="$prc -d$OPTARG";;
     287       (d)   run_identifier=$OPTARG; prc="$prc -d$OPTARG";;
    278288       (F)   create_jobfile_only=true;;
    279289       (G)   global_revision=$OPTARG; prc="$prc -G'$OPTARG'";;
    280        (h)   host_configuration=$OPTARG; prc="$prc -h$OPTARG";;
     290       (h)   configuration_identifier=$OPTARG; prc="$prc -h$OPTARG";;
     291       (i)   run_id_number=$OPTARG;;
    281292       (j)   running_in_batch_mode=true;;
    282293       (k)   keep_data_from_previous_run=true; prc="$prc -k";;
     
    285296       (O)   use_openmp=true; threads_per_task=$OPTARG; prc="$prc -O$OPTARG";;
    286297       (q)   queue=$OPTARG; prc="$prc -q$OPTARG";;
    287        (r)   run_id=$OPTARG;;
    288298       (R)   return_address=$OPTARG;;
    289299       (s)   source_list=$OPTARG;;
     
    367377
    368378
    369     # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLE
    370  export fname=$jobname
     379    # FOR COMPATIBILITY REASONS SET OLD ENVIRONMENT VARIABLES
     380 export fname=$run_identifier
     381 export jobname=$run_identifier
    371382
    372383
    373384    # BUILD THE CONFIGURATION-FILE NAME AND THE SOURCES_FOR_RUN-FOLDER NAME
    374  config_file=.palm.config.$host_configuration
    375  sources_for_run_catalog=SOURCES_FOR_RUN_${host_configuration}_$jobname
     385 config_file=.palm.config.$configuration_identifier
     386 sources_for_run_catalog=SOURCES_FOR_RUN_${configuration_identifier}_$run_identifier
    376387
    377388
     
    389400 if [[ -f .palm.iofiles ]]
    390401 then
     402
     403       # CHECK VERSION MISMATCH
     404    if [[ $running_in_batch_mode != true ]]
     405    then
     406       if [[ $(head -n1 $fileconnection_file) != $(head -n1 .palm.iofiles) ]]
     407       then
     408          printf "\n\n  +++ WARNING: A file connection file has been found in your"
     409          printf "\n               working directory, but its revision does not match"
     410          printf "\n               the revision of the default (trunk) version."
     411          printf "\n               You may need to update your connection file!"
     412       fi
     413    fi
     414
    391415    fileconnection_file=.palm.iofiles
     416
    392417 fi
    393418
     
    11241149       eval filename=${pathin_pre[$i]}/${endin_pre[$i]}
    11251150    else
    1126        eval filename=${pathin_pre[$i]}/${jobname}${endin_pre[$i]}
     1151       eval filename=${pathin_pre[$i]}/${run_identifier}${endin_pre[$i]}
    11271152    fi
    11281153
     
    11561181    else
    11571182
    1158           # FIRST CHECK FOR MULTIPLE NAMES WITH THE SAME BASENAME ($jobname) AND
    1159           # CREATE A LIST FOR THE DETECTED BASENAME ENDINGS
     1183          # FIRST CHECK FOR MULTIPLE NAMES WITH THE SAME BASENAME
     1184          # ($run_identifier) AND CREATE A LIST FOR THE DETECTED BASENAME
     1185          # ENDINGS
    11601186       if [[ "${multin[$i]}" = true ]]
    11611187       then
     
    11851211              fi
    11861212
    1187                  # remove the jobname from the beginning
    1188               length_jobname=${#jobname}
    1189               ending=${basefilename:${length_jobname}}
     1213                 # remove the run_identifier from the beginning
     1214              length_run_identifier=${#run_identifier}
     1215              ending=${basefilename:${length_run_identifier}}
    11901216
    11911217                 # remove the ending given in the .iofiles from the beginning
     
    12491275             eval filename=${pathin[$nr_of_input_files]}/${endin[$nr_of_input_files]}
    12501276          else
    1251              eval filename=${pathin[$nr_of_input_files]}/${jobname}${endin[$nr_of_input_files]}
     1277             eval filename=${pathin[$nr_of_input_files]}/${run_identifier}${endin[$nr_of_input_files]}
    12521278          fi
    12531279
     
    13291355                frelin[$nr_of_input_files]=${endin[$nr_of_input_files]}.$cyclestring
    13301356             else
    1331                 frelin[$nr_of_input_files]=${jobname}${endin[$nr_of_input_files]}.$cyclestring
     1357                frelin[$nr_of_input_files]=${run_identifier}${endin[$nr_of_input_files]}.$cyclestring
    13321358             fi
    13331359          else
     
    13361362                frelin[$nr_of_input_files]=${endin[$nr_of_input_files]}
    13371363             else
    1338                 frelin[$nr_of_input_files]=${jobname}${endin[$nr_of_input_files]}
     1364                frelin[$nr_of_input_files]=${run_identifier}${endin[$nr_of_input_files]}
    13391365             fi
    13401366          fi
     
    13701396       fi
    13711397       (( maxcycle = 0 ))
    1372        eval filename=${pathout_pre[$i]}/${jobname}${endout_pre[$i]}
     1398       eval filename=${pathout_pre[$i]}/${run_identifier}${endout_pre[$i]}
    13731399       eval catalogname=${pathout_pre[$i]}
    13741400       if ! ls $filename* 1>/dev/null 2>&1
     
    14161442 if [[ $running_in_batch_mode = false ]]
    14171443 then
    1418     run_id=$RANDOM
    1419     job_id=${jobname}.$run_id
    1420 
    1421     tempdir=$fast_io_catalog/$job_id
     1444    run_id_number=$RANDOM
     1445    run_id=${run_identifier}.$run_id_number
     1446
     1447    tempdir=$fast_io_catalog/$run_id
    14221448 fi
    14231449
     
    15111537 if [[ $create_remote_batch_job = true ]]
    15121538 then
    1513     column1="execution on:"; column2="$host_configuration (username: $remote_username)"
     1539    column1="execution on:"; column2="$configuration_identifier (username: $remote_username)"
    15141540 else
    15151541    if [[ $running_on_remote = true ]]
    15161542    then
    1517        column1="host identifier:"; column2="$host_configuration (execute on IP: $remote_ip)"
     1543       column1="config. identifier:"; column2="$configuration_identifier (execute on IP: $remote_ip)"
    15181544    else
    1519        column1="host identifier:"; column2="$host_configuration (execute on IP: $local_ip)"
     1545       column1="config. identifier:"; column2="$configuration_identifier (execute on IP: $local_ip)"
    15201546    fi
    15211547 fi
     
    16621688 fi
    16631689 printf "|                                                                        | \n"
    1664  column1="run identifier:"; column2=$jobname
     1690 column1="run identifier:"; column2=$run_identifier
    16651691 printf "| %-25s%-45s | \n" "$column1" "$column2"
    16661692 column1="activation string list:"; column2=$(echo $activation_string_list)
     
    17801806
    17811807       line=`grep %base_directory $config_file`
    1782        make_depository=`echo $line | cut -d" " -s -f2`/MAKE_DEPOSITORY_${host_configuration}
    1783        echo  "[[ ! -d ${make_depository} ]]  &&  echo depository not found" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1  | tee ${host_configuration}_last_make_protokoll
    1784 
    1785        if [[ $(grep -c "depository not found" ${host_configuration}_last_make_protokoll) != 0 ]]
     1808       make_depository=`echo $line | cut -d" " -s -f2`/MAKE_DEPOSITORY_${configuration_identifier}
     1809       echo  "[[ ! -d ${make_depository} ]]  &&  echo depository not found" | ssh  -q  $ssh_key  ${remote_username}@${remote_ip} 2>&1  | tee ${configuration_identifier}_last_make_protokoll
     1810
     1811       if [[ $(grep -c "depository not found" ${configuration_identifier}_last_make_protokoll) != 0 ]]
    17861812       then
    17871813          printf "\n\n  +++ make depository \"${make_depository}\""
     
    17891815          ask_for_make_depository=true
    17901816       fi
    1791        rm ${host_configuration}_last_make_protokoll
     1817       rm ${configuration_identifier}_last_make_protokoll
    17921818
    17931819    else
    17941820
    17951821          # CHECK FOR MAKE_DEPOSITORY ON THE LOCAL HOST
    1796        make_depository=${base_directory}/MAKE_DEPOSITORY_${host_configuration}
     1822       make_depository=${base_directory}/MAKE_DEPOSITORY_${configuration_identifier}
    17971823       if [[ ! -d ${make_depository} ]]
    17981824       then
     
    18261852       if [[ $do_trace = true ]]
    18271853       then
    1828           palmbuild  -h $host_configuration
     1854          palmbuild  -h $configuration_identifier
    18291855       else
    1830           palmbuild  -v  -h $host_configuration
     1856          palmbuild  -v  -h $configuration_identifier
    18311857       fi
    18321858
     
    18451871
    18461872       # NOW CREATE THE SOURCES_FOR_RUN FOLDER
    1847     palmbuild  -v  $use_existing_sources_folder  -h $host_configuration  -d $jobname
     1873    palmbuild  -v  $use_existing_sources_folder  -h $configuration_identifier  -d $run_identifier
    18481874
    18491875    if [[ $? != 0 ]]
     
    21102136       # (FILE ENVPAR WILL BE READ BY PALM)
    21112137    cat  >  ENVPAR  <<  EOF
    2112  &envpar  run_identifier = '$jobname', host = '$host_configuration',
     2138 &envpar  run_identifier = '$run_identifier', host = '$configuration_identifier',
    21132139          write_svf = .${write_svf}., write_binary = .${write_binary}.,
    21142140          read_svf = .${read_svf}., tasks_per_node = $tasks_per_node,
     
    23612387       then
    23622388
    2363           eval filename=${pathout[$i]}/${jobname}${endout[$i]}
     2389          eval filename=${pathout[$i]}/${run_identifier}${endout[$i]}
    23642390
    23652391             # DETERMINE THE CYCLE NUMBER
     
    25032529                transfer_failed=false
    25042530                printf "\n  >>> OUTPUT: ${localout[$i]}$catalog_string  $append_string by SCP to"
    2505                 printf "\n              ${pathout[$i]}/${host_configuration}_${jobname}${endout[$i]}$catalog_string\n"
     2531                printf "\n              ${pathout[$i]}/${configuration_identifier}_${run_identifier}${endout[$i]}$catalog_string\n"
    25062532
    25072533                   # TRANSFER VIA SCP
    25082534                if [[ "$remote_loginnode" != "" ]]
    25092535                then
    2510                    echo "cd $tempdir; ${fast_io_catalog}/${sources_for_run_catalog}/batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} \"${pathout[$i]}\" ${host_configuration}_${jobname}${endout[$i]}  ${extout[$i]}"  |  ssh -q $remote_username@$remote_loginnode
     2536                   echo "cd $tempdir; ${fast_io_catalog}/${sources_for_run_catalog}/batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} \"${pathout[$i]}\" ${configuration_identifier}_${run_identifier}${endout[$i]}  ${extout[$i]}"  |  ssh -q $remote_username@$remote_loginnode
    25112537                else
    2512                    batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} "${pathout[$i]}" ${host_configuration}_${jobname}${endout[$i]}  ${extout[$i]}
     2538                   batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} "${pathout[$i]}" ${configuration_identifier}_${run_identifier}${endout[$i]}  ${extout[$i]}
    25132539                fi
    25142540                [[ $? != 0 ]]  &&  transfer_failed=true
     
    25192545                then
    25202546                   printf "  +++ transfer failed. Trying to save a copy on this host under:\n"
    2521                    printf "      ${pathout[$i]}/${host_configuration}_${jobname}${endout[$i]}_$run_id\n"
     2547                   printf "      ${pathout[$i]}/${configuration_identifier}_${run_identifier}${endout[$i]}_$run_id_number\n"
    25222548
    25232549                      # FIRST CHECK, IF DIRECTORY EXISTS, AND CREATE IT, IF NECESSARY
     
    25292555                      mkdir -p  $local_catalog
    25302556                   fi
    2531                    eval  cp  ${localout[$i]}  ${pathout[$i]}/${host_configuration}_${jobname}${endout[$i]}_$run_id
     2557                   eval  cp  ${localout[$i]}  ${pathout[$i]}/${configuration_identifier}_${run_identifier}${endout[$i]}_$run_id_number
    25322558                   transfer_problems=true
    25332559                fi
     
    27552781
    27562782       # BUILD THE PALMRUN-COMMAND TO BE CALLED IN THE BATCH-JOB
    2757     palmrun_com="$palmrun_script_name -d $jobname -h $host_configuration -m $memory -t $cpumax -q $queue -r $run_id -U $local_username"
     2783    palmrun_com="$palmrun_script_name -d $run_identifier -h $configuration_identifier -m $memory -t $cpumax -q $queue -i $run_id_number -U $local_username"
    27582784    [[ "$activation_string_list" != "" ]]  &&  palmrun_com=${palmrun_com}" -a \"$activation_string_list\""
    27592785    [[ "$global_revision" != "" ]]  &&  palmrun_com=${palmrun_com}" -G \"$global_revision\""
     
    27882814       # DETERMINE THE FULL PATHS FOR THE JOB PROTOCOL FILES ON THE LOCAL AND
    27892815       # REMOTE HOST
    2790     job_protocol_file_local=${local_jobcatalog}/${host_configuration}_${job_id}
     2816    job_protocol_file_local=${local_jobcatalog}/${configuration_identifier}_${run_id}
    27912817    job_protocol_file=$job_protocol_file_local
    27922818    if [[ $create_remote_batch_job = true ]]
    27932819    then
    2794        job_protocol_file_remote=${remote_jobcatalog}/${host_configuration}_${job_id}
     2820       job_protocol_file_remote=${remote_jobcatalog}/${configuration_identifier}_${run_id}
    27952821       job_protocol_file=$job_protocol_file_remote
    27962822       job_transfer_protocol_file=${remote_jobcatalog}/last_job_transfer_protocol
    2797        scpjob_file=${remote_jobcatalog}/scpjob.$run_id
     2823       scpjob_file=${remote_jobcatalog}/scpjob.$run_id_number
    27982824    fi
    27992825
    28002826
    28012827       # BUILD THE JOB-SCRIPTS ON FILE jobfile
    2802     jobfile=jobfile.$run_id
     2828    jobfile=jobfile.$run_id_number
    28032829
    28042830
     
    28192845    if [[ $create_remote_batch_job = true ]]
    28202846    then
    2821        echo "set +vx"                              >>  $jobfile
    2822        echo "trap '"                               >>  $jobfile
    2823        echo "set +vx"                              >>  $jobfile
    2824        echo "cd ${remote_jobcatalog}"              >>  $jobfile
    2825        echo "cat >  scpjob.$run_id << %%END%%"     >>  $jobfile
     2847       echo "set +vx"                                   >>  $jobfile
     2848       echo "trap '"                                    >>  $jobfile
     2849       echo "set +vx"                                   >>  $jobfile
     2850       echo "cd ${remote_jobcatalog}"                   >>  $jobfile
     2851       echo "cat >  scpjob.$run_id_number << %%END%%"   >>  $jobfile
    28262852
    28272853          # ADD THE BATCH DIRECTIVES
     
    28372863
    28382864       echo "set -x"                               >>  $jobfile
    2839        echo "${fast_io_catalog}/${sources_for_run_catalog}/batch_scp  $PORTOPT  -d  -w 10  -u $local_username $local_ip  $job_protocol_file_remote  \"$local_jobcatalog\"  ${host_configuration}_${jobname}"  >>  $jobfile
     2865       echo "${fast_io_catalog}/${sources_for_run_catalog}/batch_scp  $PORTOPT  -d  -w 10  -u $local_username $local_ip  $job_protocol_file_remote  \"$local_jobcatalog\"  ${configuration_identifier}_${run_identifier}"  >>  $jobfile
    28402866       echo "%%END%%"                              >>  $jobfile
    28412867       echo "echo \" *** submitting job for transfering the job protocol file to $local_ip\" "  >>  $jobfile
     
    29162942          if [[ $do_trace = true ]]
    29172943          then
    2918              echo "     scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${host_configuration}_${job_id}"
    2919           fi
    2920           scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${host_configuration}_${job_id}  >  /dev/null
     2944             echo "     scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${configuration_identifier}_${run_id}"
     2945          fi
     2946          scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${configuration_identifier}_${run_id}  >  /dev/null
    29212947
    29222948          printf " *** submit the job (output of submit command, e.g. the job-id, may follow)"
    29232949          if [[ $do_trace = true ]]
    29242950          then
    2925              echo "     cd $remote_jobcatalog; $submit_command ${host_configuration}_${job_id}; rm ${host_configuration}_${job_id}  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1"
    2926           fi
    2927           echo "cd $remote_jobcatalog; $submit_command ${host_configuration}_${job_id}; rm ${host_configuration}_${job_id}"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1
     2951             echo "     cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1"
     2952          fi
     2953          echo "cd $remote_jobcatalog; $submit_command ${configuration_identifier}_${run_id}; rm ${configuration_identifier}_${run_id}"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1
    29282954
    29292955       elif [[ $create_batch_job = true ]]
     
    29312957
    29322958          eval  local_jobcatalog=$local_jobcatalog
    2933           cp  $jobfile  ${local_jobcatalog}/${host_configuration}_${job_id}
     2959          cp  $jobfile  ${local_jobcatalog}/${configuration_identifier}_${run_id}
    29342960          cd $local_jobcatalog
    29352961          echo " "
     
    29372963          if [[ $do_trace = true ]]
    29382964          then
    2939              echo "$submit_command ${host_configuration}_${job_id}"
    2940           fi
    2941           $submit_command ${host_configuration}_${job_id}
    2942           rm ${host_configuration}_${job_id}
     2965             echo "$submit_command ${configuration_identifier}_${run_id}"
     2966          fi
     2967          $submit_command ${configuration_identifier}_${run_id}
     2968          rm ${configuration_identifier}_${run_id}
    29432969          cd -  > /dev/null
    29442970
Note: See TracChangeset for help on using the changeset viewer.