Changeset 1815 for palm/trunk
- Timestamp:
- Apr 6, 2016 1:49:59 PM (8 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 8 edited
-
advec_s_bc.f90 (modified) (2 diffs)
-
fft_xy.f90 (modified) (6 diffs)
-
flow_statistics.f90 (modified) (5 diffs)
-
init_3d_model.f90 (modified) (2 diffs)
-
init_pegrid.f90 (modified) (2 diffs)
-
modules.f90 (modified) (3 diffs)
-
spectrum.f90 (modified) (4 diffs)
-
tridia_solver.f90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_s_bc.f90
r1692 r1815 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! comment change 22 22 ! 23 23 ! Former revisions: … … 194 194 195 195 #if defined( __nec ) 196 REAL(sp) :: m1n, m1z ! Wichtig: Division !<196 REAL(sp) :: m1n, m1z !< important for optimisation of division 197 197 REAL(sp), DIMENSION(:,:), ALLOCATABLE :: m1, sw !< 198 198 #else -
palm/trunk/SOURCE/fft_xy.f90
r1750 r1815 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! cpp-directives for ibmy removed 22 22 ! 23 23 ! Former revisions: … … 285 285 sqr_dnx = SQRT( dnx ) 286 286 sqr_dny = SQRT( dny ) 287 #if defined( __ibm ) && ! defined( __ibmy_special )287 #if defined( __ibm ) 288 288 ! 289 289 !-- Initialize tables for fft along x … … 626 626 ELSEIF ( fft_method == 'system-specific' ) THEN 627 627 628 #if defined( __ibm ) && ! defined( __ibmy_special )628 #if defined( __ibm ) 629 629 IF ( forward_fft ) THEN 630 630 … … 938 938 ELSEIF ( fft_method == 'system-specific' ) THEN 939 939 940 #if defined( __ibm ) && ! defined( __ibmy_special )940 #if defined( __ibm ) 941 941 IF ( forward_fft ) THEN 942 942 … … 1255 1255 ELSEIF ( fft_method == 'system-specific' ) THEN 1256 1256 1257 #if defined( __ibm ) && ! defined( __ibmy_special )1257 #if defined( __ibm ) 1258 1258 IF ( forward_fft) THEN 1259 1259 … … 1566 1566 ELSEIF ( fft_method == 'system-specific' ) THEN 1567 1567 1568 #if defined( __ibm ) && ! defined( __ibmy_special )1568 #if defined( __ibm ) 1569 1569 IF ( forward_fft ) THEN 1570 1570 -
palm/trunk/SOURCE/flow_statistics.f90
r1784 r1815 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! cpp-directives for intel openmp bug removed 22 22 ! 23 23 ! Former revisions: … … 358 358 359 359 !$OMP PARALLEL PRIVATE( i, j, k, tn ) 360 #if defined( __intel_openmp_bug )361 tn = omp_get_thread_num()362 #else363 360 !$ tn = omp_get_thread_num() 364 #endif365 361 366 362 !$OMP DO … … 561 557 !-- are zero at the walls and inside buildings. 562 558 tn = 0 563 #if defined( __intel_openmp_bug ) 564 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, & 565 !$OMP tn, ust, ust2, u2, vst, vst2, v2, w2 ) 566 tn = omp_get_thread_num() 567 #else 568 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 ) 559 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, & 560 !$OMP sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, & 561 !$OMP w2 ) 569 562 !$ tn = omp_get_thread_num() 570 #endif 563 571 564 !$OMP DO 572 565 DO i = nxl, nxr … … 1841 1834 1842 1835 !$OMP PARALLEL PRIVATE( i, j, k, tn ) 1843 #if defined( __intel_openmp_bug )1844 tn = omp_get_thread_num()1845 #else1846 1836 !$ tn = omp_get_thread_num() 1847 #endif1848 1837 1849 1838 !$acc update device( sums_l ) … … 2117 2106 !-- are zero at the walls and inside buildings. 2118 2107 tn = 0 2119 #if defined( __intel_openmp_bug ) 2120 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, & 2121 !$OMP tn, ust, ust2, u2, vst, vst2, v2, w2 ) 2122 tn = omp_get_thread_num() 2123 #else 2124 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 ) 2108 !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, & 2109 !$OMP sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, & 2110 !$OMP w2 ) 2125 2111 !$ tn = omp_get_thread_num() 2126 #endif 2112 2127 2113 !$OMP DO 2128 2114 !$acc parallel loop gang present( e, hom, kh, km, p, pt, w, rflags_invers, rmask, sums_l ) create( s1, s2, s3, s4, s5, s6, s7 ) -
palm/trunk/SOURCE/init_3d_model.f90
r1789 r1815 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! zero-settings for velocities inside topography re-activated (was deactivated 22 ! in r1762) 22 23 ! 23 24 ! Former revisions: … … 857 858 !-- levels to zero in order to avoid too small time steps caused by the 858 859 !-- diffusion limit in the initial phase of a run (at k=1, dz/2 occurs 859 !-- in the limiting formula!). The original values are stored to be later 860 !-- used for volume flow control. 861 ! TO_DO: Antti will check if this is really required 862 !AH IF ( ibc_uv_b /= 1 ) THEN 863 !AH DO i = nxlg, nxrg 864 !AH DO j = nysg, nyng 865 !AH u(nzb:nzb_u_inner(j,i)+1,j,i) = 0.0_wp 866 !AH v(nzb:nzb_v_inner(j,i)+1,j,i) = 0.0_wp 867 !AH ENDDO 868 !AH ENDDO 869 !AH ENDIF 860 !-- in the limiting formula!). 861 IF ( ibc_uv_b /= 1 ) THEN 862 DO i = nxlg, nxrg 863 DO j = nysg, nyng 864 u(nzb:nzb_u_inner(j,i)+1,j,i) = 0.0_wp 865 v(nzb:nzb_v_inner(j,i)+1,j,i) = 0.0_wp 866 ENDDO 867 ENDDO 868 ENDIF 870 869 871 870 IF ( humidity .OR. passive_scalar ) THEN -
palm/trunk/SOURCE/init_pegrid.f90
r1805 r1815 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! cpp-directives for intel openmp bug removed 22 22 ! 23 23 ! Former revisions: … … 208 208 !-- Get the number of OpenMP threads 209 209 !$OMP PARALLEL 210 #if defined( __intel_openmp_bug )211 threads_per_task = omp_get_num_threads()212 #else213 210 !$ threads_per_task = omp_get_num_threads() 214 #endif215 211 !$OMP END PARALLEL 216 212 -
palm/trunk/SOURCE/modules.f90
r1809 r1815 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! cpp-directive for decalpha removed 22 22 ! 23 23 ! Former revisions: … … 926 926 topography_color = (/ 0.8_wp, 0.7_wp, 0.6_wp /) 927 927 928 #if defined( __decalpha )929 REAL(wp), DIMENSION(2,10) :: slicer_range_limits_dvrp = RESHAPE( (/ &930 -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &931 -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &932 -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp /), (/ 2, 10 /) )933 934 REAL(wp), DIMENSION(3,10) :: isosurface_color = RESHAPE( (/ &935 0.9_wp, 0.9_wp, 0.9_wp, 0.8_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.8_wp, &936 0.1_wp, 0.8_wp, 0.1_wp, 0.6_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.6_wp, &937 0.1_wp, 0.6_wp, 0.1_wp, 0.4_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.1_wp, 0.4_wp, &938 0.1_wp, 0.4_wp, 0.1_wp /), (/ 3, 10 /) )939 940 REAL(sp), DIMENSION(2,100) :: interval_values_dvrp, interval_h_dvrp = &941 RESHAPE( (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp, &942 70.0_sp, 25.0_sp, 25.0_sp, -25.0_sp, &943 ( 0.0_sp, i9 = 1, 192 ) /), &944 (/ 2, 100 /) ), &945 interval_l_dvrp = 0.5_sp, interval_s_dvrp = 1.0_sp,&946 interval_a_dvrp = 0.0_sp, &947 interval_values_dvrp_prt, &948 interval_h_dvrp_prt = RESHAPE( &949 (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp, 70.0_sp, 25.0_sp, &950 25.0_sp, -25.0_sp, ( 0.0_sp, i9 = 1, 192 ) /), &951 (/ 2, 100 /) ), &952 interval_l_dvrp_prt = 0.5_sp, &953 interval_s_dvrp_prt = 1.0_sp, &954 interval_a_dvrp_prt = 0.0_sp955 #else956 928 REAL(wp), DIMENSION(2,10) :: slicer_range_limits_dvrp 957 929 … … 980 952 DATA interval_h_dvrp_prt / 270.0_wp, 225.0_wp, 225.0_wp, 180.0_wp, 70.0_wp, 25.0_wp, & 981 953 25.0_wp, -25.0_wp, 192 * 0.0_wp / 982 #endif983 954 984 955 REAL(sp), DIMENSION(:), ALLOCATABLE :: xcoor_dvrp, ycoor_dvrp, zcoor_dvrp -
palm/trunk/SOURCE/spectrum.f90
r1809 r1815 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! bugfix: preprocessor directives included for the non-parallel case 22 22 ! 23 23 ! Former revisions: … … 294 294 USE kinds 295 295 296 #if defined( __parallel ) 296 297 #if defined( __mpifh ) 297 298 INCLUDE "mpif.h" 298 299 #else 299 300 USE MPI 301 #endif 300 302 #endif 301 303 USE pegrid, & … … 396 398 USE kinds 397 399 400 #if defiend( __parallel ) 398 401 #if defined( __mpifh ) 399 402 INCLUDE "mpif.h" 400 403 #else 401 404 USE MPI 405 #endif 402 406 #endif 403 407 USE pegrid, & … … 537 541 USE kinds 538 542 543 #if defined( __parallel ) 539 544 #if defined( __mpifh ) 540 545 INCLUDE "mpif.h" 541 546 #else 542 547 USE MPI 548 #endif 543 549 #endif 544 550 USE pegrid, & -
palm/trunk/SOURCE/tridia_solver.f90
r1809 r1815 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! cpp-switch intel11 removed 22 22 ! 23 23 ! Former revisions: … … 521 521 522 522 IF ( j <= nnyh ) THEN 523 #if defined( __intel11 )524 CALL maketri_1dd( j, tri_for_1d )525 #else526 523 CALL maketri_1dd( j ) 527 #endif528 524 ELSE 529 #if defined( __intel11 )530 CALL maketri_1dd( ny+1-j, tri_for_1d )531 #else532 525 CALL maketri_1dd( ny+1-j ) 533 #endif534 526 ENDIF 535 #if defined( __intel11 ) 536 CALL split_1dd( tri_for_1d ) 537 #else 527 538 528 CALL split_1dd 539 #endif540 529 CALL substi_1dd( ar, tri_for_1d ) 541 530 … … 548 537 !> computes the i- and j-dependent component of the matrix 549 538 !------------------------------------------------------------------------------! 550 #if defined( __intel11 )551 SUBROUTINE maketri_1dd( j, tri_for_1d )552 #else553 539 SUBROUTINE maketri_1dd( j ) 554 #endif555 540 556 541 USE constants, & … … 570 555 571 556 REAL(wp), DIMENSION(0:nx) :: l !< 572 573 #if defined( __intel11 )574 REAL(wp), DIMENSION(5,0:nx,0:nz-1) :: tri_for_1d !<575 #endif576 557 577 558 … … 623 604 !> Splitting of the tridiagonal matrix (Thomas algorithm) 624 605 !------------------------------------------------------------------------------! 625 #if defined( __intel11 )626 SUBROUTINE split_1dd( tri_for_1d )627 #else628 606 SUBROUTINE split_1dd 629 #endif630 631 607 632 608 IMPLICIT NONE … … 634 610 INTEGER(iwp) :: i !< 635 611 INTEGER(iwp) :: k !< 636 637 #if defined( __intel11 )638 REAL(wp), DIMENSION(5,0:nx,0:nz-1) :: tri_for_1d !<639 #endif640 612 641 613
Note: See TracChangeset
for help on using the changeset viewer.
