Changeset 1609


Ignore:
Timestamp:
Jul 3, 2015 3:37:58 PM (9 years ago)
Author:
maronga
Message:

minor changes in mrun and bugfix in poismg_fast

Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r1605 r1609  
    2222# Current revisions:
    2323# ------------------
    24 #
     24# Modified the random number of the temporary working directory to match the
     25# queuing system number on HLRN-III (lccray*).
    2526#
    2627# Former revisions:
     
    600601    # VALUE OF do_remote IS IMPORTANT FOR THE FILE CONNECTIONS.
    601602    # IN CASE OF EXECUTION ON A REMOTE-MACHINE, A BATCH-JOB HAS
    602     # TO BE SUBMITTED (I.E. do_bacth=true)
     603    # TO BE SUBMITTED (I.E. do_batch=true)
    603604 if [[ -n $host  &&  "$host" != $localhost ]]
    604605 then
     
    18321833
    18331834    # DETERMINE THE NAME OF MRUN'S TEMPORARY WORKING DIRECTORY
    1834  kennung=$RANDOM
     1835
     1836    # ON HLRN-III, USE THE QUEUING NAME. OTHERWISE USE USERNAME AND RANDOM NUMBER
     1837 if [[ $do_batch = false && $(echo $host | cut -c1-6) = lccray ]]
     1838 then
     1839    kennung=$(checkjob $PBS_JOBID | grep Reservation | cut -d" " -s -f2 | cut -d"." -s -f2 | sed "s/['\"]//g")
     1840 else
     1841    kennung=$RANDOM
     1842 fi
     1843
    18351844 if [[ "$tmp_user_catalog" = "" ]]
    18361845 then
  • palm/trunk/SOURCE/poismg_fast.f90

    r1576 r1609  
    2323! Current revisions:
    2424! -----------------
    25 !
     25! Bugfix: allow compilation without __parallel.
    2626!
    2727! Former revisions:
     
    5555    USE cpulog,                                                                &
    5656        ONLY:  cpu_log, log_point_s
     57
    5758    USE kinds
    58     USE MPI
     59
    5960    USE pegrid
    6061
     
    16851686!++          ATTENTION: Check reason for this error. Remove it or replace WRITE
    16861687!++                     by PALM message
     1688#if defined ( __parallel )
    16871689             IF ( ind /= ind_even_odd )  THEN
    16881690                WRITE (0,*) 'ERROR ==> illegal ind_even_odd ',ind,ind_even_odd,l
    16891691                CALL MPI_ABORT(MPI_COMM_WORLD,i,j)
    16901692             ENDIF
     1693#endif
    16911694!
    16921695!--          Sort the data with odd k index
     
    23542357                  nyn_mg, nzb, nzt, nzt_mg
    23552358
    2356        USE pegrid,                                                             &
    2357            ONLY:  ngp_xz, ngp_yz
    2358 
    23592359       IMPLICIT NONE
    23602360
     
    23812381                           nxl_mg(grid_level-1)-1:nxr_mg(grid_level-1)+1) ::  temp  !:
    23822382
    2383 
     2383#if defined ( __parallel )
    23842384       sendrecv_in_background_save = sendrecv_in_background
    23852385       sendrecv_in_background      = .FALSE.
     
    28652865
    28662866       ELSE
     2867
    28672868!
    28682869!--       Standard horizontal ghost boundary exchange for small coarse grid
     
    28772878       synchronous_exchange   = synchronous_exchange_save
    28782879       send_receive = 'al'
     2880#else
     2881
     2882!
     2883!--    Standard horizontal ghost boundary exchange for small coarse grid
     2884!--    levels, where the transfer time is latency bound
     2885       CALL exchange_horiz( p_mg, 1 )
     2886#endif
     2887
     2888
    28792889
    28802890    END SUBROUTINE special_exchange_horiz
Note: See TracChangeset for help on using the changeset viewer.