Home


About us
PALM
PALM-4U
Installation
Release notes
Documentation
Getting Help
Gallery
Developers area

Changeset 82 for palm/trunk/SOURCE


Ignore:
Timestamp:
Apr 16, 2007 3:40:52 PM (18 years ago)
Author:
raasch
Message:

vorlaeufige Standalone-Version fuer Linux-Cluster

Location:
palm/trunk/SOURCE
Files:
1 added
21 edited

Legend:

Unmodified
Added
Removed

  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r77 r82  
    55Changed:
    66-------
     7All system relevant compile and link options as well as the host identifier (local_host) are specified in the configuration file.
    78
     9Filetransfer by ftp removed (options -f removed from mrun and mbuild).
     10
     11Call of (system-)FLUSH routine moved to new routine local_flush.
     12
     13return_addres and return_username are read from ENVPAR-NAMELIST-file.
     14
     15Preprocessor strings for different linux clusters changed to "lc", some preprocessor directives renamed (new: __intel_openmp_bug), preprocessor directives for old systems removed
     16
     17advec_particles, check_open, cpu_log, cpu_statistics, data_output_dvrp, flow_statistics, header, init_dvrp, init_particles, init_1d_model, init_dvrp, init_pegrid, local_getenv, local_system, local_tremain, local_tremain_ini, modules, run_control
     18
     19new:
     20local_flush
     21
     22mbuild, mrun
    823
    924Errors:

  • palm/trunk/SOURCE/Makefile

    r77 r82  
    44# Actual revisions:
    55# -----------------
    6 #
     6# +local_flush
    77#
    88# Former revisions:
    … …  
    5151        init_particles.f90 init_pegrid.f90 init_pt_anomaly.f90 \
    5252        init_rankine.f90 init_slope.f90 interaction_droplets_ptq.f90 \
    53         local_getenv.f90 local_stop.f90 local_system.f90 local_tremain.f90 \
     53        local_flush.f90 local_getenv.f90 local_stop.f90 local_system.f90 local_tremain.f90 \
    5454        local_tremain_ini.f90 modules.f90 netcdf.f90 package_parin.f90 \
    5555        palm.f90 parin.f90 particle_boundary_conds.f90 poisfft.f90 \
    … …  
    8181        init_dvrp.o init_grid.o init_particles.o init_pegrid.o \
    8282        init_pt_anomaly.o init_rankine.o init_slope.o \
    83         interaction_droplets_ptq.o local_getenv.o local_stop.o \
     83        interaction_droplets_ptq.o local_flush.o local_getenv.o local_stop.o \
    8484        local_system.o local_tremain.o local_tremain_ini.o modules.o netcdf.o \
    8585        package_parin.o palm.o parin.o particle_boundary_conds.o poisfft.o \

  • palm/trunk/SOURCE/advec_particles.f90

    r77 r82  
    117117!       WRITE (9,*) '--- advec_particles: #1'
    118118!       WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    119 !       CALL FLUSH_( 9 )
     119!       CALL local_flush( 9 )
    120120!    ENDIF
    121121!
    … …  
    165165
    166166!    WRITE ( 9, * ) '*** advec_particles: ##0.3'
    167 !    CALL FLUSH_( 9 )
     167!    CALL local_flush( 9 )
    168168!    nd = 0
    169169!    DO  n = 1, number_of_particles
    … …  
    172172!    IF ( nd /= deleted_particles ) THEN
    173173!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    174 !       CALL FLUSH_( 9 )
     174!       CALL local_flush( 9 )
    175175!       CALL MPI_ABORT( comm2d, 9999, ierr )
    176176!    ENDIF
    … …  
    18721872
    18731873!    WRITE ( 9, * ) '*** advec_particles: ##0.4'
    1874 !    CALL FLUSH_( 9 )
     1874!    CALL local_flush( 9 )
    18751875!    nd = 0
    18761876!    DO  n = 1, number_of_particles
    … …  
    18791879!    IF ( nd /= deleted_particles ) THEN
    18801880!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    1881 !       CALL FLUSH_( 9 )
     1881!       CALL local_flush( 9 )
    18821882!       CALL MPI_ABORT( comm2d, 9999, ierr )
    18831883!    ENDIF
    … …  
    19041904             ELSE
    19051905!    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory dt_prel'
    1906 !    CALL FLUSH_( 9 )
     1906!    CALL local_flush( 9 )
    19071907                CALL allocate_prt_memory( number_of_initial_particles )
    19081908!    WRITE ( 9, * ) '*** advec_particles: after allocate_prt_memory dt_prel'
    1909 !    CALL FLUSH_( 9 )
     1909!    CALL local_flush( 9 )
    19101910             ENDIF
    19111911          ENDIF
    … …  
    19281928                ELSE
    19291929!    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory dt_prel'
    1930 !    CALL FLUSH_( 9 )
     1930!    CALL local_flush( 9 )
    19311931                   CALL allocate_tail_memory( number_of_initial_tails )
    19321932!    WRITE ( 9, * ) '*** advec_particles: after allocate_tail_memory dt_prel'
    1933 !    CALL FLUSH_( 9 )
     1933!    CALL local_flush( 9 )
    19341934                ENDIF
    19351935             ENDIF
    … …  
    20082008             ENDIF
    20092009!    WRITE ( 9, * ) '*** advec_particles: after setting the beginning of new tails'
    2010 !    CALL FLUSH_( 9 )
     2010!    CALL local_flush( 9 )
    20112011
    20122012             number_of_particles = number_of_particles + &
    … …  
    20172017
    20182018!    WRITE ( 9, * ) '*** advec_particles: ##0.5'
    2019 !    CALL FLUSH_( 9 )
     2019!    CALL local_flush( 9 )
    20202020!    nd = 0
    20212021!    DO  n = 1, number_of_particles
    … …  
    20242024!    IF ( nd /= deleted_particles ) THEN
    20252025!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2026 !       CALL FLUSH_( 9 )
     2026!       CALL local_flush( 9 )
    20272027!       CALL MPI_ABORT( comm2d, 9999, ierr )
    20282028!    ENDIF
    … …  
    20312031!       WRITE (9,*) '--- advec_particles: #2'
    20322032!       WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    2033 !       CALL FLUSH_( 9 )
     2033!       CALL local_flush( 9 )
    20342034!    ENDIF
    20352035!    DO  n = 1, number_of_particles
    … …  
    20382038!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    20392039!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2040 !          CALL FLUSH_( 9 )
     2040!          CALL local_flush( 9 )
    20412041!          CALL MPI_ABORT( comm2d, 9999, ierr )
    20422042!       ENDIF
    … …  
    21032103
    21042104!    WRITE ( 9, * ) '*** advec_particles: ##1'
    2105 !    CALL FLUSH_( 9 )
     2105!    CALL local_flush( 9 )
    21062106!    nd = 0
    21072107!    DO  n = 1, number_of_particles
    … …  
    21112111!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    21122112!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2113 !          CALL FLUSH_( 9 )
     2113!          CALL local_flush( 9 )
    21142114!          CALL MPI_ABORT( comm2d, 9999, ierr )
    21152115!       ENDIF
    … …  
    21172117!    IF ( nd /= deleted_particles ) THEN
    21182118!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2119 !       CALL FLUSH_( 9 )
     2119!       CALL local_flush( 9 )
    21202120!       CALL MPI_ABORT( comm2d, 9999, ierr )
    21212121!    ENDIF
    … …  
    22742274
    22752275!    WRITE ( 9, * ) '*** advec_particles: ##2'
    2276 !    CALL FLUSH_( 9 )
     2276!    CALL local_flush( 9 )
    22772277!    nd = 0
    22782278!    DO  n = 1, number_of_particles
    … …  
    22822282!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    22832283!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2284 !          CALL FLUSH_( 9 )
     2284!          CALL local_flush( 9 )
    22852285!          CALL MPI_ABORT( comm2d, 9999, ierr )
    22862286!       ENDIF
    … …  
    22882288!    IF ( nd /= deleted_particles ) THEN
    22892289!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2290 !       CALL FLUSH_( 9 )
     2290!       CALL local_flush( 9 )
    22912291!       CALL MPI_ABORT( comm2d, 9999, ierr )
    22922292!    ENDIF
    … …  
    23132313             ELSE
    23142314!    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trrp'
    2315 !    CALL FLUSH_( 9 )
     2315!    CALL local_flush( 9 )
    23162316                CALL allocate_prt_memory( trrp_count_recv )
    23172317!    WRITE ( 9, * ) '*** advec_particles: after allocate_prt_memory trrp'
    2318 !    CALL FLUSH_( 9 )
     2318!    CALL local_flush( 9 )
    23192319             ENDIF
    23202320          ENDIF
    … …  
    23412341                ELSE
    23422342!    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trrpt'
    2343 !    CALL FLUSH_( 9 )
     2343!    CALL local_flush( 9 )
    23442344                   CALL allocate_tail_memory( trrpt_count_recv )
    23452345!    WRITE ( 9, * ) '*** advec_particles: after allocate_tail_memory trrpt'
    2346 !    CALL FLUSH_( 9 )
     2346!    CALL local_flush( 9 )
    23472347                ENDIF
    23482348             ENDIF
    … …  
    23702370!          WRITE (9,*) '--- advec_particles: #3'
    23712371!          WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    2372 !          CALL FLUSH_( 9 )
     2372!          CALL local_flush( 9 )
    23732373!       ENDIF
    23742374
    … …  
    23902390             ELSE
    23912391!    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trlp'
    2392 !    CALL FLUSH_( 9 )
     2392!    CALL local_flush( 9 )
    23932393                CALL allocate_prt_memory( trlp_count_recv )
    23942394!    WRITE ( 9, * ) '*** advec_particles: after allocate_prt_memory trlp'
    2395 !    CALL FLUSH_( 9 )
     2395!    CALL local_flush( 9 )
    23962396             ENDIF
    23972397          ENDIF
    … …  
    24182418                ELSE
    24192419!    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trlpt'
    2420 !    CALL FLUSH_( 9 )
     2420!    CALL local_flush( 9 )
    24212421                   CALL allocate_tail_memory( trlpt_count_recv )
    24222422!    WRITE ( 9, * ) '*** advec_particles: after allocate_tail_memory trlpt'
    2423 !    CALL FLUSH_( 9 )
     2423!    CALL local_flush( 9 )
    24242424                ENDIF
    24252425             ENDIF
    … …  
    24472447!          WRITE (9,*) '--- advec_particles: #4'
    24482448!          WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    2449 !          CALL FLUSH_( 9 )
     2449!          CALL local_flush( 9 )
    24502450!       ENDIF
    24512451
    … …  
    24602460
    24612461!    WRITE ( 9, * ) '*** advec_particles: ##3'
    2462 !    CALL FLUSH_( 9 )
     2462!    CALL local_flush( 9 )
    24632463!    nd = 0
    24642464!    DO  n = 1, number_of_particles
    … …  
    24682468!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    24692469!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2470 !          CALL FLUSH_( 9 )
     2470!          CALL local_flush( 9 )
    24712471!          CALL MPI_ABORT( comm2d, 9999, ierr )
    24722472!       ENDIF
    … …  
    24742474!    IF ( nd /= deleted_particles ) THEN
    24752475!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2476 !       CALL FLUSH_( 9 )
     2476!       CALL local_flush( 9 )
    24772477!       CALL MPI_ABORT( comm2d, 9999, ierr )
    24782478!    ENDIF
    … …  
    25382538
    25392539!    WRITE ( 9, * ) '*** advec_particles: ##4'
    2540 !    CALL FLUSH_( 9 )
     2540!    CALL local_flush( 9 )
    25412541!    nd = 0
    25422542!    DO  n = 1, number_of_particles
    … …  
    25462546!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    25472547!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2548 !          CALL FLUSH_( 9 )
     2548!          CALL local_flush( 9 )
    25492549!          CALL MPI_ABORT( comm2d, 9999, ierr )
    25502550!       ENDIF
    … …  
    25522552!    IF ( nd /= deleted_particles ) THEN
    25532553!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2554 !       CALL FLUSH_( 9 )
     2554!       CALL local_flush( 9 )
    25552555!       CALL MPI_ABORT( comm2d, 9999, ierr )
    25562556!    ENDIF
    … …  
    27152715
    27162716!    WRITE ( 9, * ) '*** advec_particles: ##5'
    2717 !    CALL FLUSH_( 9 )
     2717!    CALL local_flush( 9 )
    27182718!    nd = 0
    27192719!    DO  n = 1, number_of_particles
    … …  
    27232723!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    27242724!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2725 !          CALL FLUSH_( 9 )
     2725!          CALL local_flush( 9 )
    27262726!          CALL MPI_ABORT( comm2d, 9999, ierr )
    27272727!       ENDIF
    … …  
    27292729!    IF ( nd /= deleted_particles ) THEN
    27302730!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2731 !       CALL FLUSH_( 9 )
     2731!       CALL local_flush( 9 )
    27322732!       CALL MPI_ABORT( comm2d, 9999, ierr )
    27332733!    ENDIF
    … …  
    27542754             ELSE
    27552755!    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trnp'
    2756 !    CALL FLUSH_( 9 )
     2756!    CALL local_flush( 9 )
    27572757                CALL allocate_prt_memory( trnp_count_recv )
    27582758!    WRITE ( 9, * ) '*** advec_particles: after allocate_prt_memory trnp'
    2759 !    CALL FLUSH_( 9 )
     2759!    CALL local_flush( 9 )
    27602760             ENDIF
    27612761          ENDIF
    … …  
    27822782                ELSE
    27832783!    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trnpt'
    2784 !    CALL FLUSH_( 9 )
     2784!    CALL local_flush( 9 )
    27852785                   CALL allocate_tail_memory( trnpt_count_recv )
    27862786!    WRITE ( 9, * ) '*** advec_particles: after allocate_tail_memory trnpt'
    2787 !    CALL FLUSH_( 9 )
     2787!    CALL local_flush( 9 )
    27882788                ENDIF
    27892789             ENDIF
    … …  
    28112811!          WRITE (9,*) '--- advec_particles: #5'
    28122812!          WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    2813 !          CALL FLUSH_( 9 )
     2813!          CALL local_flush( 9 )
    28142814!       ENDIF
    28152815
    … …  
    28312831             ELSE
    28322832!    WRITE ( 9, * ) '*** advec_particles: before allocate_prt_memory trsp'
    2833 !    CALL FLUSH_( 9 )
     2833!    CALL local_flush( 9 )
    28342834                CALL allocate_prt_memory( trsp_count_recv )
    28352835!    WRITE ( 9, * ) '*** advec_particles: after allocate_prt_memory trsp'
    2836 !    CALL FLUSH_( 9 )
     2836!    CALL local_flush( 9 )
    28372837             ENDIF
    28382838          ENDIF
    … …  
    28592859                ELSE
    28602860!    WRITE ( 9, * ) '*** advec_particles: before allocate_tail_memory trspt'
    2861 !    CALL FLUSH_( 9 )
     2861!    CALL local_flush( 9 )
    28622862                   CALL allocate_tail_memory( trspt_count_recv )
    28632863!    WRITE ( 9, * ) '*** advec_particles: after allocate_tail_memory trspt'
    2864 !    CALL FLUSH_( 9 )
     2864!    CALL local_flush( 9 )
    28652865                ENDIF
    28662866             ENDIF
    … …  
    28882888!          WRITE (9,*) '--- advec_particles: #6'
    28892889!          WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    2890 !          CALL FLUSH_( 9 )
     2890!          CALL local_flush( 9 )
    28912891!       ENDIF
    28922892
    … …  
    29012901
    29022902!    WRITE ( 9, * ) '*** advec_particles: ##6'
    2903 !    CALL FLUSH_( 9 )
     2903!    CALL local_flush( 9 )
    29042904!    nd = 0
    29052905!    DO  n = 1, number_of_particles
    … …  
    29092909!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    29102910!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    2911 !          CALL FLUSH_( 9 )
     2911!          CALL local_flush( 9 )
    29122912!          CALL MPI_ABORT( comm2d, 9999, ierr )
    29132913!       ENDIF
    … …  
    29152915!    IF ( nd /= deleted_particles ) THEN
    29162916!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    2917 !       CALL FLUSH_( 9 )
     2917!       CALL local_flush( 9 )
    29182918!       CALL MPI_ABORT( comm2d, 9999, ierr )
    29192919!    ENDIF
    … …  
    31333133
    31343134!    WRITE ( 9, * ) '*** advec_particles: ##7'
    3135 !    CALL FLUSH_( 9 )
     3135!    CALL local_flush( 9 )
    31363136!    nd = 0
    31373137!    DO  n = 1, number_of_particles
    … …  
    31413141!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    31423142!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    3143 !          CALL FLUSH_( 9 )
     3143!          CALL local_flush( 9 )
    31443144!          CALL MPI_ABORT( comm2d, 9999, ierr )
    31453145!       ENDIF
    … …  
    31473147!    IF ( nd /= deleted_particles ) THEN
    31483148!       WRITE (9,*) '*** nd=',nd,' deleted_particles=',deleted_particles
    3149 !       CALL FLUSH_( 9 )
     3149!       CALL local_flush( 9 )
    31503150!       CALL MPI_ABORT( comm2d, 9999, ierr )
    31513151!    ENDIF
    … …  
    31673167!       IF ( nd /= deleted_particles ) THEN
    31683168!          WRITE (9,*) '*** advec_part nd=',nd,' deleted_particles=',deleted_particles
    3169 !          CALL FLUSH_( 9 )
     3169!          CALL local_flush( 9 )
    31703170!          CALL MPI_ABORT( comm2d, 9999, ierr )
    31713171!       ENDIF
    … …  
    31893189!                WRITE (9,*) '+++ n=',n,' (of ',number_of_tails,' #oftails)'
    31903190!                WRITE (9,*) '    id=',new_tail_id(n)
    3191 !                CALL FLUSH_( 9 )
     3191!                CALL local_flush( 9 )
    31923192                ENDIF
    31933193             ENDDO
    … …  
    31963196!       IF ( nd /= deleted_tails  .AND.  use_particle_tails ) THEN
    31973197!          WRITE (9,*) '*** advec_part nd=',nd,' deleted_tails=',deleted_tails
    3198 !          CALL FLUSH_( 9 )
     3198!          CALL local_flush( 9 )
    31993199!          CALL MPI_ABORT( comm2d, 9999, ierr )
    32003200!       ENDIF
    … …  
    32113211!        WRITE (9,*) '    new_tail_id=', new_tail_id(particles(n)%tail_id), &
    32123212!                         ' of (',number_of_tails,')'
    3213 !        CALL FLUSH_( 9 )
     3213!        CALL local_flush( 9 )
    32143214!     ENDIF
    32153215                particles(n)%tail_id = new_tail_id(particles(n)%tail_id)
    … …  
    32193219!     IF ( nn /= number_of_tails  .AND.  use_particle_tails ) THEN
    32203220!        WRITE (9,*) '*** advec_part #of_tails=',number_of_tails,' nn=',nn
    3221 !        CALL FLUSH_( 9 )
     3221!        CALL local_flush( 9 )
    32223222!        DO  n = 1, number_of_particles
    32233223!           WRITE (9,*) 'prt# ',n,' tail_id=',particles(n)%tail_id, &
    … …  
    32333233!       WRITE (9,*) '--- advec_particles: #7'
    32343234!       WRITE (9,*) '    #of p=',number_of_particles,' #of t=',number_of_tails
    3235 !       CALL FLUSH_( 9 )
     3235!       CALL local_flush( 9 )
    32363236!    ENDIF
    32373237!    WRITE ( 9, * ) '*** advec_particles: ##8'
    3238 !    CALL FLUSH_( 9 )
     3238!    CALL local_flush( 9 )
    32393239!    DO  n = 1, number_of_particles
    32403240!       IF ( particles(n)%tail_id<0 .OR. particles(n)%tail_id>number_of_tails ) &
    … …  
    32423242!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    32433243!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    3244 !          CALL FLUSH_( 9 )
     3244!          CALL local_flush( 9 )
    32453245!          CALL MPI_ABORT( comm2d, 9999, ierr )
    32463246!       ENDIF
    … …  
    32523252
    32533253!    WRITE ( 9, * ) '*** advec_particles: ##9'
    3254 !    CALL FLUSH_( 9 )
     3254!    CALL local_flush( 9 )
    32553255!    DO  n = 1, number_of_particles
    32563256!       IF ( particles(n)%tail_id<0 .OR. particles(n)%tail_id>number_of_tails ) &
    … …  
    32583258!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    32593259!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    3260 !          CALL FLUSH_( 9 )
     3260!          CALL local_flush( 9 )
    32613261!          CALL MPI_ABORT( comm2d, 9999, ierr )
    32623262!       ENDIF
    … …  
    33413341    CALL user_particle_attributes
    33423342!    WRITE ( 9, * ) '*** advec_particles: ##10'
    3343 !    CALL FLUSH_( 9 )
     3343!    CALL local_flush( 9 )
    33443344!    DO  n = 1, number_of_particles
    33453345!       IF ( particles(n)%tail_id<0 .OR. particles(n)%tail_id>number_of_tails ) &
    … …  
    33473347!          WRITE (9,*) '+++ n=',n,' (of ',number_of_particles,')'
    33483348!          WRITE (9,*) '    id=',particles(n)%tail_id,' of (',number_of_tails,')'
    3349 !          CALL FLUSH_( 9 )
     3349!          CALL local_flush( 9 )
    33503350!          CALL MPI_ABORT( comm2d, 9999, ierr )
    33513351!       ENDIF
    … …  
    33663366!--          next tailpoint
    33673367!             WRITE ( 9, * ) '*** advec_particles: ##10.1  nn=',nn
    3368 !             CALL FLUSH_( 9 )
     3368!             CALL local_flush( 9 )
    33693369             IF ( minimum_tailpoint_distance /= 0.0 )  THEN
    33703370                distance = ( particle_tail_coordinates(1,1,nn) -      &
    … …  
    33763376             ENDIF
    33773377!             WRITE ( 9, * ) '*** advec_particles: ##10.2'
    3378 !             CALL FLUSH_( 9 )
     3378!             CALL local_flush( 9 )
    33793379!
    33803380!--          First, increase the index of all existings tailpoints by one
    … …  
    33953395             ENDIF
    33963396!             WRITE ( 9, * ) '*** advec_particles: ##10.3'
    3397 !             CALL FLUSH_( 9 )
     3397!             CALL local_flush( 9 )
    33983398!
    33993399!--          In any case, store the new point at the beginning of the tail
    … …  
    34033403             particle_tail_coordinates(1,4,nn) = particles(n)%color
    34043404!             WRITE ( 9, * ) '*** advec_particles: ##10.4'
    3405 !             CALL FLUSH_( 9 )
     3405!             CALL local_flush( 9 )
    34063406!
    34073407!--          Increase the age of the tailpoints
    … …  
    34183418             ENDIF
    34193419!             WRITE ( 9, * ) '*** advec_particles: ##10.5'
    3420 !             CALL FLUSH_( 9 )
     3420!             CALL local_flush( 9 )
    34213421
    34223422          ENDIF
    … …  
    34263426    ENDIF
    34273427!    WRITE ( 9, * ) '*** advec_particles: ##11'
    3428 !    CALL FLUSH_( 9 )
     3428!    CALL local_flush( 9 )
    34293429
    34303430!
    … …  
    35333533    ENDIF
    35343534    WRITE (9,*) '*** Request: ',new_maximum_number,' new_maximum_number(tails)'
    3535 !    CALL FLUSH_( 9 )
     3535!    CALL local_flush( 9 )
    35363536
    35373537    tmp_tail(:,:,1:number_of_tails)  = &

  • palm/trunk/SOURCE/check_open.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Call of local_getenv removed, preprocessor directives for old systems removed
    77!
    88! Former revisions:
    … …  
    4242
    4343    CHARACTER (LEN=2)   ::  suffix
    44     CHARACTER (LEN=20)  ::  return_addres, return_usern, xtext = 'time in s'
     44    CHARACTER (LEN=20)  ::  xtext = 'time in s'
    4545    CHARACTER (LEN=30)  ::  filename
    4646    CHARACTER (LEN=40)  ::  avs_coor_file, avs_coor_file_localname, &
    … …  
    151151                        STATUS='OLD' )
    152152          ELSE
    153 #if defined( __t3eh ) || defined( __t3eb ) || defined( __t3ej5 )
    154 !
    155 !--          Declare a cache layer for faster I/O
    156              CALL ASNUNIT ( 13, '-F cachea:512:1:1', ierr1 )
    157 #endif
    158153             OPEN ( 13, FILE='BININ/'//myid_char, FORM='UNFORMATTED', &
    159154                        STATUS='OLD' )
    … …  
    174169!--          directory created by PE0 can open their file
    175170             CALL MPI_BARRIER( comm2d, ierr )
    176 #endif
    177 #if defined( __t3eh ) || defined( __t3eb ) || defined( __t3ej5 )
    178 !
    179 !--          Declare a cache layer for faster I/O
    180              CALL ASNUNIT ( 14, '-F cachea:512:1:1', ierr1 )
    181171#endif
    182172             OPEN ( 14, FILE='BINOUT/'//myid_char_14, FORM='UNFORMATTED', &
    … …  
    342332       CASE ( 30 )
    343333
    344 
    345 #if defined( __t3eb ) || defined( __t3eh ) || defined( __t3ej5 )
    346 !
    347 !--       In case of active data compression 32Bit integer output
    348           IF ( do3d_compress )  THEN
    349              CALL ASNUNIT( 30, '-F f77 -N ieee_32', ierr1 )
    350           ENDIF
    351 #endif
    352 
    353334          OPEN ( 30, FILE='PLOT3D_DATA'//myid_char, FORM='UNFORMATTED' )
    354335!
    … …  
    369350!--          Therefore path information has to be obtained first.
    370351             IF ( avs_output )  THEN
    371                 CALL local_getenv( 'return_addres', 13, return_addres, iaddres )
    372                 CALL local_getenv( 'return_username', 15, return_usern, iusern )
     352                iaddres = LEN_TRIM( return_addres )
     353                iusern  = LEN_TRIM( return_username )
    373354
    374355                OPEN ( 3, FILE='OUTPUT_FILE_CONNECTIONS', FORM='FORMATTED' )
    … …  
    433414!--                   really transferred.
    434415                      command = TRIM( batch_scp ) // ' -n -u ' // &
    435                          return_usern(1:iusern) // ' ' // &
     416                         return_username(1:iusern) // ' ' // &
    436417                         return_addres(1:iaddres) // ' /etc/passwd "' // &
    437418                         TRIM( avs_coor_file_catalog ) // '" ' // &
    … …  
    445426!--                   Determine the data file name
    446427                      command = TRIM( batch_scp ) // ' -n -u ' // &
    447                          return_usern(1:iusern) // ' ' // &
     428                         return_username(1:iusern) // ' ' // &
    448429                         return_addres(1:iaddres) // ' /etc/passwd "' // &
    449430                         TRIM( avs_data_file_catalog ) // '" ' // &

  • palm/trunk/SOURCE/cpu_log.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! preprocessor directives for old systems removed
    78!
    89! Former revisions:
    … …  
    3435    TYPE(logpoint)              ::  log_event
    3536
    36 #if defined( __lcmuk ) || defined( __lctit ) || defined( __hpmuk ) || defined( __decalpha ) || defined( __nec )
     37#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
    3738    INTEGER                     ::  count, count_rate
    3839#elif defined( __ibm )
    3940    INTEGER(8)                  ::  IRTC
    40 #elif defined( __t3eb )
    41     REAL                        ::  TIMEF
    4241#endif
    4342
    … …  
    5756!
    5857!-- Take current time
    59 #if defined( __lcmuk ) || defined( __lctit ) || defined( __hpmuk ) || defined( __decalpha ) || defined( __nec )
     58#if defined( __lc ) || defined( __decalpha ) || defined( __nec )
    6059    CALL SYSTEM_CLOCK( count, count_rate )
    6160    mtime = REAL( count ) / REAL( count_rate )
    6261#elif defined( __ibm )
    6362    mtime = IRTC( ) * 1E-9
    64 !#elif defined( __vpp )
    65 !    CALL CLOCKV ( mtimevec, mtime, 0, 2 )
    66 #elif defined( __t3eb ) || defined( __t3eh ) || defined( __t3ej2 ) || defined( __t3ej5 )
    67 #if defined( __parallel )
    68     IF ( .NOT. PRESENT( barrierwait ) )  THEN
    69        CALL MPI_BARRIER( comm2d, ierr )
    70        CONTINUE
    71     ENDIF
    72 #endif
    73     mtime = TIMEF( )
    74     mtime = mtime * 0.001
    7563#else
    7664    IF ( myid == 0 )  THEN

  • palm/trunk/SOURCE/cpu_statistics.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor directives for old systems removed
    77!
    88! Former revisions:
    … …  
    3737    REAL, DIMENSION(:,:), ALLOCATABLE ::  pe_log_points
    3838
    39 
    40 !#if defined( __hpmuk )  &&  ! defined( __chinook )
    41 !    norm = clock_ticks_per_second()
    42 !#endif
    4339
    4440!

  • palm/trunk/SOURCE/data_output_dvrp.f90

    r77 r82  
    3232! Actual revisions:
    3333! -----------------
     34! Preprocessor strings for different linux clusters changed to "lc",
     35! routine local_flush is used for buffer flushing
    3436! TEST: write statements
    3537!
    … …  
    8486
    8587    WRITE ( 9, * ) '*** myid=', myid, ' Anfang data_output_dvrp'
    86 #if defined( __ibm )
    87     CALL FLUSH_( 9 )
    88 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    89     CALL FLUSH( 9 )
    90 #endif
     88    CALL local_flush( 9 )
    9189    CALL cpu_log( log_point(27), 'data_output_dvrp', 'start' )
    9290
    … …  
    104102          lock_steering_update = .TRUE.
    105103    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: vor steering_update'
    106 #if defined( __ibm )
    107     CALL FLUSH_( 9 )
    108 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    109     CALL FLUSH( 9 )
    110 #endif
     104    CALL local_flush( 9 )
    111105          CALL DVRP_STEERING_UPDATE( m-1, data_output_dvrp )
    112106    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: nach steering_update'
    113 #if defined( __ibm )
    114     CALL FLUSH_( 9 )
    115 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    116     CALL FLUSH( 9 )
    117 #endif
     107    CALL local_flush( 9 )
    118108          lock_steering_update = .FALSE.
    119109       ENDIF
    … …  
    150140
    151141    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang particles'
    152 #if defined( __ibm )
    153     CALL FLUSH_( 9 )
    154 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    155     CALL FLUSH( 9 )
    156 #endif
     142    CALL local_flush( 9 )
    157143!
    158144!--       DVRP-Calls for plotting particles:
    … …  
    183169             WRITE (9,*) '--- before ALLOCATE  simtime=',simulated_time,' #of_tails=', number_of_tails, &
    184170                           ' max#of_tp=', maximum_number_of_tailpoints
    185 #if defined( __ibm )
    186     CALL FLUSH_( 9 )
    187 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    188     CALL FLUSH( 9 )
    189 #endif
     171    CALL local_flush( 9 )
    190172             ALLOCATE( psize(number_of_tails), p_t(number_of_tails),      &
    191173                       p_c(number_of_tails*maximum_number_of_tailpoints), &
    … …  
    194176                       p_z(number_of_tails*maximum_number_of_tailpoints) )
    195177             WRITE (9,*) '--- after ALLOCATE'
    196 #if defined( __ibm )
    197     CALL FLUSH_( 9 )
    198 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    199     CALL FLUSH( 9 )
    200 #endif
     178    CALL local_flush( 9 )
    201179             psize = 0.0;  p_t = 0;  p_c = 0.0;  p_x = 0.0;  p_y = 0.0
    202180             p_z   = 0.0;
    … …  
    209187                   IF ( simulated_time > 1338.0 )  THEN
    210188                      WRITE (9,*) '--- particle ',n,' tail_id=',nn,' #of_tp=',particles(n)%tailpoints
    211 #if defined( __ibm )
    212     CALL FLUSH_( 9 )
    213 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    214     CALL FLUSH( 9 )
    215 #endif
     189    CALL local_flush( 9 )
    216190                   ENDIF
    217191                   DO  j = 1, particles(n)%tailpoints
    … …  
    227201                         WRITE (9,*) '--- tp= ',i,' x=',p_x(i),' y=',p_y(i), &
    228202                                                 ' z=',p_z(i),' c=',p_c(i)
    229 #if defined( __ibm )
    230     CALL FLUSH_( 9 )
    231 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    232     CALL FLUSH( 9 )
    233 #endif
     203    CALL local_flush( 9 )
    234204                      ENDIF
    235205                   ENDDO
    … …  
    238208                   IF ( simulated_time > 1338.0 )  THEN
    239209                      WRITE (9,*) '--- t= ',k,' psize=',psize(k),' p_t=',p_t(k)
    240 #if defined( __ibm )
    241     CALL FLUSH_( 9 )
    242 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    243     CALL FLUSH( 9 )
    244 #endif
     210    CALL local_flush( 9 )
    245211                   ENDIF
    246212                ENDIF               
    247213             ENDDO
    248214             WRITE (9,*) '--- after locally storing the particle attributes'
    249 #if defined( __ibm )
    250     CALL FLUSH_( 9 )
    251 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    252     CALL FLUSH( 9 )
    253 #endif
     215    CALL local_flush( 9 )
    254216          ENDIF
    255217
    … …  
    275237             ELSE
    276238                WRITE (9,*) '--- before DVRP_PARTICLES'
    277 #if defined( __ibm )
    278     CALL FLUSH_( 9 )
    279 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    280     CALL FLUSH( 9 )
    281 #endif
     239    CALL local_flush( 9 )
    282240                CALL DVRP_PARTICLES( m-1, number_of_tails, p_x, p_y, p_z, 15, &
    283241                                     psize, p_c, p_t )
    … …  
    292250                WRITE (9,*) 'p_t =', p_t
    293251
    294 #if defined( __ibm )
    295     CALL FLUSH_( 9 )
    296 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    297     CALL FLUSH( 9 )
    298 #endif
     252    CALL local_flush( 9 )
    299253             ENDIF
    300254          ENDIF
    … …  
    302256          CALL DVRP_VISUALIZE( m-1, 3, dvrp_filecount )
    303257    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende particles'
    304 #if defined( __ibm )
    305     CALL FLUSH_( 9 )
    306 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    307     CALL FLUSH( 9 )
    308 #endif
     258    CALL local_flush( 9 )
    309259
    310260          DEALLOCATE( psize, p_c, p_t, p_x, p_y, p_z )
    … …  
    456406
    457407    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang isosurface'
    458 #if defined( __ibm )
    459     CALL FLUSH_( 9 )
    460 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    461     CALL FLUSH( 9 )
    462 #endif
     408    CALL local_flush( 9 )
    463409!
    464410!--          DVRP-Calls for plotting isosurfaces:
    … …  
    481427             CALL DVRP_VISUALIZE( m-1, 1, dvrp_filecount )
    482428    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende isosurface'
    483 #if defined( __ibm )
    484     CALL FLUSH_( 9 )
    485 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    486     CALL FLUSH( 9 )
    487 #endif
     429    CALL local_flush( 9 )
    488430
    489431             CALL cpu_log( log_point_s(26), 'dvrp_isosurface', 'stop' )
    … …  
    492434
    493435    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang slicer'
    494 #if defined( __ibm )
    495     CALL FLUSH_( 9 )
    496 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    497     CALL FLUSH( 9 )
    498 #endif
     436    CALL local_flush( 9 )
    499437!
    500438!--          DVRP-Calls for plotting slicers:
    … …  
    526464
    527465    WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende slicer'
    528 #if defined( __ibm )
    529     CALL FLUSH_( 9 )
    530 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    531     CALL FLUSH( 9 )
    532 #endif
     466    CALL local_flush( 9 )
    533467          ENDIF
    534468
    … …  
    545479    CALL cpu_log( log_point(27), 'data_output_dvrp', 'stop' )
    546480    WRITE ( 9, * ) '*** myid=', myid, ' Ende data_output_dvrp'
    547 #if defined( __ibm )
    548     CALL FLUSH_( 9 )
    549 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    550     CALL FLUSH( 9 )
    551 #endif
     481    CALL local_flush( 9 )
    552482
    553483#endif

  • palm/trunk/SOURCE/flow_statistics.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Cpp-directive lcmuk changed to intel_openmp_bug
    77!
    88! Former revisions:
    … …  
    9898       tn = 0
    9999       !$OMP PARALLEL PRIVATE( i, j, k, tn )
    100 #if defined( __lcmuk )
     100#if defined( __intel_openmp_bug )
    101101       tn = omp_get_thread_num()
    102102#else
    … …  
    260260!--          rearranged according to the staggered grid.
    261261       tn = 0
    262 #if defined( __lcmuk )
     262#if defined( __intel_openmp_bug )
    263263       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, &
    264264       !$OMP                    tn, ust, ust2, u2, vst, vst2, v2, w2 )

  • palm/trunk/SOURCE/header.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! routine local_flush is used for buffer flushing
    78!
    89! Former revisions:
    … …  
    11091110    WRITE ( io, 99 )
    11101111
    1111 #if defined( __ibm )
    11121112!
    11131113!-- Write buffer contents to disc immediately
    1114     CALL FLUSH_( io )
    1115 #elif defined( __lcmuk )  ||  defined( __nec )
    1116     CALL FLUSH( io )
    1117 #endif
     1114    CALL local_flush( io )
    11181115
    11191116!

  • palm/trunk/SOURCE/init_1d_model.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! routine local_flush is used for buffer flushing
    78!
    89! Former revisions:
    … …  
    770771       WRITE ( 15, 101 )  current_timestep_number_1d, simulated_time_chr, &
    771772                          dt_1d, umax, vmax, us1d, alpha, energy
    772 #if defined( __ibm )
    773773!
    774774!--    Write buffer contents to disc immediately
    775        CALL FLUSH_( 15 )
    776 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    777        CALL FLUSH( 15 )
    778 #endif
     775       CALL local_flush( 15 )
    779776
    780777    ENDIF
    … …  
    955952       WRITE ( 17, 101 )
    956953
    957 #if defined( __ibm )
    958954!
    959955!--    Write buffer contents to disc immediately
    960        CALL FLUSH_( 17 )
    961 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    962        CALL FLUSH( 17 )
    963 #endif
     956       CALL local_flush( 17 )
    964957
    965958    ENDIF

  • palm/trunk/SOURCE/init_dvrp.f90

    r39 r82  
    33!------------------------------------------------------------------------------!
    44! Actual revisions:
    5 ! -----------------
     5! -----------------
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! routine local_flush is used for buffer flushing
    68! Test output of isosurface on camera file
    79! TEST: print* statements
    … …  
    145147
    146148    WRITE ( 9, * ) '***  vor dvrp_output_rtsp'
    147 #if defined( __ibm )
    148     CALL FLUSH_( 9 )
    149 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    150     CALL FLUSH( 9 )
    151 #endif
     149    CALL local_flush( 9 )
    152150
    153151             dvrp_file   = TRIM( mode_dvrp(m) ) // '/camera.dvr'
    … …  
    157155                                    dvrp_file_c )
    158156    WRITE ( 9, * ) '***  nach dvrp_output_rtsp'
    159 #if defined( __ibm )
    160     CALL FLUSH_( 9 )
    161 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    162     CALL FLUSH( 9 )
    163 #endif
     157    CALL local_flush( 9 )
    164158
    165159          ELSEIF ( dvrp_output == 'ftp' )  THEN
    … …  
    185179          CALL DVRP_CAMERA( m-1, center, distance )
    186180    WRITE ( 9, * ) '***  #1'
    187 #if defined( __ibm )
    188     CALL FLUSH_( 9 )
    189 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    190     CALL FLUSH( 9 )
    191 #endif
     181    CALL local_flush( 9 )
    192182
    193183!
    … …  
    202192          CALL DVRP_EXIT( m-1 )
    203193    WRITE ( 9, * ) '***  #2'
    204 #if defined( __ibm )
    205     CALL FLUSH_( 9 )
    206 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    207     CALL FLUSH( 9 )
    208 #endif
     194    CALL local_flush( 9 )
    209195
    210196
    … …  
    223209                                    dvrp_file_c )
    224210    WRITE ( 9, * ) '***  #3'
    225 #if defined( __ibm )
    226     CALL FLUSH_( 9 )
    227 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    228     CALL FLUSH( 9 )
    229 #endif
     211    CALL local_flush( 9 )
    230212
    231213          ELSEIF ( dvrp_output == 'ftp' )  THEN
    … …  
    274256          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.8, 0.7, 0.6, 0.0 )
    275257    WRITE ( 9, * ) '***  #4'
    276 #if defined( __ibm )
    277     CALL FLUSH_( 9 )
    278 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    279     CALL FLUSH( 9 )
    280 #endif
     258    CALL local_flush( 9 )
    281259
    282260!
    … …  
    292270          ENDDO
    293271    WRITE ( 9, * ) '***  #4.1'
    294 #if defined( __ibm )
    295     CALL FLUSH_( 9 )
    296 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    297     CALL FLUSH( 9 )
    298 #endif
     272    CALL local_flush( 9 )
    299273          CALL DVRP_DATA( m-1, local_pf, 1, nx_dvrp, ny_dvrp, nz_dvrp, &
    300274                          cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
    301275    WRITE ( 9, * ) '***  #4.2'
    302 #if defined( __ibm )
    303     CALL FLUSH_( 9 )
    304 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    305     CALL FLUSH( 9 )
    306 #endif
     276    CALL local_flush( 9 )
    307277          CALL DVRP_THRESHOLD( m-1, 1.0 )
    308278    WRITE ( 9, * ) '***  #4.3'
    309 #if defined( __ibm )
    310     CALL FLUSH_( 9 )
    311 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    312     CALL FLUSH( 9 )
    313 #endif
     279    CALL local_flush( 9 )
    314280          CALL DVRP_VISUALIZE( m-1, 1, 0 )
    315281    WRITE ( 9, * ) '***  #4.4'
    316 #if defined( __ibm )
    317     CALL FLUSH_( 9 )
    318 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    319     CALL FLUSH( 9 )
    320 #endif
     282    CALL local_flush( 9 )
    321283
    322284          DEALLOCATE( local_pf )
    … …  
    324286          CALL DVRP_EXIT( m-1 )
    325287    WRITE ( 9, * ) '***  #5'
    326 #if defined( __ibm )
    327     CALL FLUSH_( 9 )
    328 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    329     CALL FLUSH( 9 )
    330 #endif
     288    CALL local_flush( 9 )
    331289
    332290!
    … …  
    344302                                    dvrp_file_c )
    345303    WRITE ( 9, * ) '***  #6'
    346 #if defined( __ibm )
    347     CALL FLUSH_( 9 )
    348 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    349     CALL FLUSH( 9 )
    350 #endif
     304    CALL local_flush( 9 )
    351305
    352306          ELSEIF ( dvrp_output == 'ftp' )  THEN
    … …  
    395349          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.0, 0.6, 0.0, 0.0 )
    396350    WRITE ( 9, * ) '***  #7'
    397 #if defined( __ibm )
    398     CALL FLUSH_( 9 )
    399 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    400     CALL FLUSH( 9 )
    401 #endif
     351    CALL local_flush( 9 )
    402352
    403353!
    … …  
    416366          CALL DVRP_EXIT( m-1 )
    417367    WRITE ( 9, * ) '***  #8'
    418 #if defined( __ibm )
    419     CALL FLUSH_( 9 )
    420 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    421     CALL FLUSH( 9 )
    422 #endif
     368    CALL local_flush( 9 )
    423369
    424370   
    … …  
    461407                name_c = TRIM( do3d(0,vn) )
    462408    WRITE ( 9, * ) '***  #9'
    463 #if defined( __ibm )
    464     CALL FLUSH_( 9 )
    465 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    466     CALL FLUSH( 9 )
    467 #endif
     409    CALL local_flush( 9 )
    468410                CALL DVRP_STEERING_INIT( m-1, name_c, steering_dvrp(pn)%min, &
    469411                                         steering_dvrp(pn)%max, threshold(tv) )
    470412    WRITE ( 9, * ) '***  #10'
    471 #if defined( __ibm )
    472     CALL FLUSH_( 9 )
    473 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    474     CALL FLUSH( 9 )
    475 #endif
     413    CALL local_flush( 9 )
    476414
    477415             ELSEIF ( mode_dvrp(pn)(1:6) == 'slicer' )  THEN
    … …  
    517455
    518456    WRITE ( 9, * ) '***  #11'
    519 #if defined( __ibm )
    520     CALL FLUSH_( 9 )
    521 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    522     CALL FLUSH( 9 )
    523 #endif
     457    CALL local_flush( 9 )
    524458
    525459          dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr'
    … …  
    529463                                 dvrp_file_c )
    530464    WRITE ( 9, * ) '***  #12'
    531 #if defined( __ibm )
    532     CALL FLUSH_( 9 )
    533 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    534     CALL FLUSH( 9 )
    535 #endif
     465    CALL local_flush( 9 )
    536466
    537467       ELSEIF ( dvrp_output == 'ftp' )  THEN
    … …  
    585515!--    Define the grid used by dvrp
    586516    WRITE ( 9, * ) '***  #13'
    587 #if defined( __ibm )
    588     CALL FLUSH_( 9 )
    589 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    590     CALL FLUSH( 9 )
    591 #endif
     517    CALL local_flush( 9 )
    592518
    593519       CALL DVRP_GRID( m-1, nx_dvrp, ny_dvrp, nz_dvrp, xcoor_dvrp, ycoor_dvrp, &
    594520                       zcoor_dvrp )
    595521    WRITE ( 9, * ) '***  #14'
    596 #if defined( __ibm )
    597     CALL FLUSH_( 9 )
    598 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    599     CALL FLUSH( 9 )
    600 #endif
     522    CALL local_flush( 9 )
    601523
    602524
    … …  
    631553!-- Initialize logging of calls by DVRP graphic software
    632554    WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_LOG_INIT'
    633 #if defined( __ibm )
    634     CALL FLUSH_( 9 )
    635 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    636     CALL FLUSH( 9 )
    637 #endif
     555    CALL local_flush( 9 )
    638556    CALL DVRP_LOG_INIT( 'DVRP_LOG' // CHAR( 0 ), 0 )
    639557    WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_LOG_INIT'
    640 #if defined( __ibm )
    641     CALL FLUSH_( 9 )
    642 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    643     CALL FLUSH( 9 )
    644 #endif
     558    CALL local_flush( 9 )
    645559
    646560!
    647561!-- User-defined logging events: #1 (total time needed by PALM)
    648562    WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_LOG_SYMBOL'
    649 #if defined( __ibm )
    650     CALL FLUSH_( 9 )
    651 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    652     CALL FLUSH( 9 )
    653 #endif
     563    CALL local_flush( 9 )
    654564    CALL DVRP_LOG_SYMBOL( 1, 'PALM_total' // CHAR( 0 ) )
    655565    WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_LOG_SYMBOL'
    656 #if defined( __ibm )
    657     CALL FLUSH_( 9 )
    658 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    659     CALL FLUSH( 9 )
    660 #endif
     566    CALL local_flush( 9 )
    661567    CALL DVRP_LOG_SYMBOL( 2, 'PALM_timestep' // CHAR( 0 ) )
    662568    WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_LOG_EVENT'
    663 #if defined( __ibm )
    664     CALL FLUSH_( 9 )
    665 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    666     CALL FLUSH( 9 )
    667 #endif
     569    CALL local_flush( 9 )
    668570    CALL DVRP_LOG_EVENT( 1, 1 )
    669571    WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_LOG_EVENT'
    670 #if defined( __ibm )
    671     CALL FLUSH_( 9 )
    672 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    673     CALL FLUSH( 9 )
    674 #endif
     572    CALL local_flush( 9 )
    675573
    676574#if defined( __parallel )
    … …  
    681579       use_seperate_pe_for_dvrp_output = .TRUE.
    682580    WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_SPLIT'
    683 #if defined( __ibm )
    684     CALL FLUSH_( 9 )
    685 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    686     CALL FLUSH( 9 )
    687 #endif
     581    CALL local_flush( 9 )
    688582       CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
    689583    WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_SPLIT'
    690 #if defined( __ibm )
    691     CALL FLUSH_( 9 )
    692 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    693     CALL FLUSH( 9 )
    694 #endif
     584    CALL local_flush( 9 )
    695585       CALL MPI_COMM_SIZE( comm_palm, numprocs, ierr )
    696586    ENDIF

  • palm/trunk/SOURCE/init_particles.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor directives for old systems removed
    77!
    88! Former revisions:
    … …  
    5959!
    6060!-- Define MPI derived datatype for FORTRAN datatype particle_type (see module
    61 !-- particle_attributes). Integer length is 4 byte, Real is 8 byte (=> total
    62 !-- length 100, nevertheless, 120 bytes are needed on T3E since integer seems
    63 !-- to be 8 bytes long there)
    64     blocklengths(1)  = 19; blocklengths(2)  = 4; blocklengths(3)  =  1
    65 #if defined( __t3eb )
    66     displacements(1) = 0; displacements(2) = 152; displacements(3) = 184
    67 #else
    68     displacements(1) = 0; displacements(2) = 152; displacements(3) = 168
    69 #endif
     61!-- particle_attributes). Integer length is 4 byte, Real is 8 byte
     62    blocklengths(1)  = 19;  blocklengths(2)  =   4;  blocklengths(3)  =   1
     63    displacements(1) =  0;  displacements(2) = 152;  displacements(3) = 168
     64
    7065    types(1) = MPI_REAL
    7166    types(2) = MPI_INTEGER

  • palm/trunk/SOURCE/init_pegrid.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Cpp-directive lcmuk changed to intel_openmp_bug, setting of host on lcmuk by
     7! cpp-directive removed
    78!
    89! Former revisions:
    … …  
    5657!-- Get the number of OpenMP threads
    5758    !$OMP PARALLEL
    58 #if defined( __lcmuk )
     59#if defined( __intel_openmp_bug )
    5960    threads_per_task = omp_get_num_threads()
    6061#else
    … …  
    7273!--    Automatic determination of the topology
    7374!--    The default on SMP- and cluster-hosts is a 1d-decomposition along x
    74 #if defined( __lcmuk )
    75        host = 'lcmuk'
    76 #endif
    7775       IF ( host(1:3) == 'ibm'  .OR.  host(1:3) == 'nec'  .OR. &
    7876            host(1:2) == 'lc'   .OR.  host(1:3) == 'dec' )  THEN

  • palm/trunk/SOURCE/local_getenv.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor directives for old systems removed
    77!
    88! Former revisions:
    … …  
    2929    CHARACTER (LEN=*) ::  var, value
    3030    INTEGER           ::  ivalue, ivar
    31 #if defined( __t3eb ) || defined( __t3eh ) || defined( __t3ej2 ) || defined( __t3ej5 )
    32     INTEGER           ::  dummy
    33 #endif
    3431#if defined( __lcmuk )
    3532    INTEGER            ::  i, ia(20)
    3633#endif
    3734
    38 #if defined( __t3eb ) || defined( __t3eh ) || defined( __t3ej2 ) || defined( __t3ej5 )
    39     CALL PXFGETENV( var(1:ivar), ivar, value, ivalue, dummy )
    40     IF ( ivalue == 0 )  value = ''
    41 #else
    4235    CALL GETENV( var(1:ivar), value )
    4336    ivalue = LEN_TRIM( value )
    44 #endif
    4537
    4638#if defined( __lcmuk )  &&  defined( __parallel )

  • palm/trunk/SOURCE/local_system.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor directives for old systems removed
    77!
    88! Former revisions:
    … …  
    2525    CHARACTER (LEN=*) ::  command
    2626
    27 #if defined( __t3eb ) || defined( __t3eh ) || defined( __t3ej2 ) || defined( __t3ej5 )
    28     CALL ISHELL( command )
    29 #else
    3027    CALL SYSTEM( command )
    31 #endif
    3228
    3329 END SUBROUTINE local_system   

  • palm/trunk/SOURCE/local_tremain.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! preprocessor directives for old systems removed
    78!
    89! Former revisions:
    … …  
    3031
    3132    REAL ::  remaining_time
    32 !#if defined( __vpp )
    33 !    REAL ::  cpu_time_used, rdum
    34 !#endif
    3533#if defined( __ibm )
    3634    INTEGER(8) ::  IRTC
    3735    REAL       ::  actual_wallclock_time
    38 #elif defined( __lctit )
     36#elif defined( __lc )
    3937    INTEGER    ::  count, count_rate
    4038    REAL       ::  actual_wallclock_time
    4139#endif
    4240
    43 #if defined( __t3eh ) || defined( __t3eb ) || defined( __t3ej2 ) || defined( __t3ej5 )
     41#if defined( __ibm )
    4442
    45     CALL MPP_TREMAIN( remaining_time )
    46 
    47 !#elif defined( __vpp )
    48 !
    49 !    CALL CLOCKV( rdum, cpu_time_used, 0, 2 )
    50 !    remaining_time = maximum_cpu_time_allowed - cpu_time_used
    51 
    52 #elif defined( __ibm )
    53 
    54 !    CALL SYSTEM_CLOCK( count, count_rate )
    55 !    actual_wallclock_time = REAL( count ) / REAL( count_rate )
    5643    actual_wallclock_time = IRTC( ) * 1E-9
    5744    remaining_time = maximum_cpu_time_allowed - &
    5845                     ( actual_wallclock_time - initial_wallclock_time )
    5946
    60 #elif defined( __lctit )
     47#elif defined( __lc )
    6148
    6249    CALL SYSTEM_CLOCK( count, count_rate )

  • palm/trunk/SOURCE/local_tremain_ini.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Cpp-directive lctit renamed lc
    77!
    88! Former revisions:
    … …  
    3333    INTEGER            ::  idum
    3434    INTEGER(8)         ::  IRTC
    35 #elif defined( __lctit )
     35#elif defined( __lc )
    3636    CHARACTER (LEN=10) ::  value_chr
    3737    INTEGER            ::  idum
    … …  
    4646    initial_wallclock_time = IRTC( ) * 1E-9
    4747
    48 #elif defined( __lctit )
     48#elif defined( __lc )
    4949
    5050    CALL SYSTEM_CLOCK( count, count_rate )

  • palm/trunk/SOURCE/modules.f90

    r77 r82  
    55! Actual revisions:
    66! -----------------
    7 !
     7! +return_addres, return_username
     8! Cpp-directive lcmuk renamed lc
    89!
    910! Former revisions:
    … …  
    236237                            mixing_length_1d = 'as_in_3d_model', &
    237238                            random_generator = 'numerical-recipes', &
     239                            return_addres, return_username, &
    238240                            timestep_scheme = 'runge-kutta-3'
    239241    CHARACTER (LEN=40)  ::  avs_data_file, topography = 'flat'
    … …  
    879881
    880882#if defined( __parallel )
    881 #if defined( __lcmuk )
     883#if defined( __lc )
    882884    USE MPI
    883 !    INCLUDE "mpif.h"
    884885#else
    885886    INCLUDE "mpif.h"

  • palm/trunk/SOURCE/parin.f90

    r77 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! +return_addres, return_username, use_seperate_pe_for_dvrp_output in envpar
    77!
    88! Former revisions:
    … …  
    121121
    122122
    123     NAMELIST /envpar/  host, maximum_cpu_time_allowed, revision, &
    124                        run_identifier, tasks_per_node, write_binary
     123    NAMELIST /envpar/  host, maximum_cpu_time_allowed, revision, return_addres, &
     124                       return_username, run_identifier, tasks_per_node, write_binary
    125125
    126126

  • palm/trunk/SOURCE/poisfft.f90

    r77 r82  
    13451345!       tn = omp_get_thread_num()
    13461346!       WRITE( 120+tn, * ) '+++ id=',myid,' nx=',nx,' thread=', omp_get_thread_num()
    1347 !       CALL FLUSH_( 120+tn )
     1347!       CALL local_flush( 120+tn )
    13481348!CDIR NOLOOPCHG
    13491349       DO  k = 0, nz-1
    … …  
    13541354       ENDDO
    13551355!       WRITE( 120+tn, * ) '+++ id=',myid,' end of first tridia loop   thread=', omp_get_thread_num()
    1356 !       CALL FLUSH_( 120+tn )
     1356!       CALL local_flush( 120+tn )
    13571357
    13581358       IF ( j <= nnyh )  THEN

  • palm/trunk/SOURCE/run_control.f90

    r4 r82  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Preprocessor strings for different linux clusters changed to "lc",
     7! routine local_flush is used for buffer flushing
    78!
    89! Former revisions:
    … …  
    8990                          advected_distance_x/1000.0,                          &
    9091                          advected_distance_y/1000.0, mgcycles
    91 #if defined( __ibm )
    9292!
    9393!--    Write buffer contents to disc immediately
    94        CALL FLUSH_( 15 )
    95 #elif defined( __lcmuk )  ||  defined( __lctit )  ||  defined( __nec )
    96        CALL FLUSH( 15 )
    97 #endif
     94       CALL local_flush( 15 )
     95
    9896    ENDIF
    9997!
Note: See TracChangeset for help on using the changeset viewer.
                                                                                                                                                                                                                                                                                                                                                                               
  | Impressum | ©Leibniz Universität Hannover |