Changeset 1013 for palm/trunk
- Timestamp:
- Sep 21, 2012 7:03:55 AM (12 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/poisfft.f90
r1004 r1013 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! FLOAT type conversion replaced by REAL 7 7 ! 8 8 ! Former revisions: … … 406 406 IF ( i >= 0 .AND. i <= nnxh ) THEN 407 407 ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / & 408 FLOAT( nx+1 ) ) ) / ( dx * dx ) + &408 REAL( nx+1 ) ) ) / ( dx * dx ) + & 409 409 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 410 FLOAT( ny+1 ) ) ) / ( dy * dy )410 REAL( ny+1 ) ) ) / ( dy * dy ) 411 411 ELSE 412 412 ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / & 413 FLOAT( nx+1 ) ) ) / ( dx * dx ) + &413 REAL( nx+1 ) ) ) / ( dx * dx ) + & 414 414 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 415 FLOAT( ny+1 ) ) ) / ( dy * dy )415 REAL( ny+1 ) ) ) / ( dy * dy ) 416 416 ENDIF 417 417 DO k = 0,nz-1 … … 423 423 #else 424 424 DO i = 0, nnxh 425 ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / FLOAT( nx+1 ) ) ) / &425 ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / REAL( nx+1 ) ) ) / & 426 426 ( dx * dx ) + & 427 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / FLOAT( ny+1 ) ) ) / &427 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / REAL( ny+1 ) ) ) / & 428 428 ( dy * dy ) 429 429 DO k = 0, nz-1 … … 1489 1489 IF ( i >= 0 .AND. i <= nnxh ) THEN 1490 1490 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / & 1491 FLOAT( nx+1 ) ) ) * ddx2 + &1491 REAL( nx+1 ) ) ) * ddx2 + & 1492 1492 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 1493 FLOAT( ny+1 ) ) ) * ddy21493 REAL( ny+1 ) ) ) * ddy2 1494 1494 ELSE 1495 1495 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / & 1496 FLOAT( nx+1 ) ) ) * ddx2 + &1496 REAL( nx+1 ) ) ) * ddx2 + & 1497 1497 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 1498 FLOAT( ny+1 ) ) ) * ddy21498 REAL( ny+1 ) ) ) * ddy2 1499 1499 ENDIF 1500 1500 ENDDO -
palm/trunk/SOURCE/poisfft_hybrid.f90
r810 r1013 2 2 3 3 !------------------------------------------------------------------------------ 4 !5 4 ! Current revisions: 6 5 ! ----------------- 7 ! 6 ! FLOAT type conversion replaced by REAL 8 7 ! 9 8 ! Former revisions: … … 914 913 IF ( i >= 0 .AND. i < nnxh ) THEN 915 914 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / & 916 FLOAT( nx+1 ) ) ) / ( dx * dx ) + &915 REAL( nx+1 ) ) ) / ( dx * dx ) + & 917 916 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 918 FLOAT( ny+1 ) ) ) / ( dy * dy )917 REAL( ny+1 ) ) ) / ( dy * dy ) 919 918 ELSEIF ( i == nnxh ) THEN 920 919 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / & 921 FLOAT( nx+1 ) ) ) / ( dx * dx ) + &920 REAL( nx+1 ) ) ) / ( dx * dx ) + & 922 921 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 923 FLOAT(ny+1) ) ) / ( dy * dy )922 REAL(ny+1) ) ) / ( dy * dy ) 924 923 ELSE 925 924 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / & 926 FLOAT( nx+1 ) ) ) / ( dx * dx ) + &925 REAL( nx+1 ) ) ) / ( dx * dx ) + & 927 926 2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / & 928 FLOAT( ny+1 ) ) ) / ( dy * dy )927 REAL( ny+1 ) ) ) / ( dy * dy ) 929 928 ENDIF 930 929 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.