Changeset 1279 for LMDZ4/trunk/libf/filtrez/mod_filtre_fft.F90

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/filtrez/mod_filtre_fft.F90 (modified) (5 diffs)

LMDZ4/trunk/libf/filtrez/mod_filtre_fft.F90

@@ -118 +118 @@
 
     REAL               :: vect(iim+inc,jj_end-jj_begin+1,nbniv)
-    COMPLEX            :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
+!    REAL               :: vect_test(iim+inc,jj_end-jj_begin+1,nbniv)
+    COMPLEX*16         :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
+!    COMPLEX*16         :: TF_vect_test(iim/2+1,jj_end-jj_begin+1,nbniv)
     INTEGER            :: nb_vect
     INTEGER :: i,j,l
@@ -142 +144 @@
     CALL FFT_forward(vect,TF_vect,nb_vect)
 
+!    CALL FFT_forward(vect,TF_vect_test,nb_vect)
+!      PRINT *,"XXXXXXXXXXXXX Filtre_u_FFT xxxxxxxxxxxx"
+!      DO j=1,jj_end-jj_begin+1
+!      DO i=1,iim/2+1
+!         PRINT *,"====",i,j,"----->",TF_vect_test(i,j,1)
+!       ENDDO
+!      ENDDO
+
     DO l=1,ll_nb
       DO j=1,jj_end-jj_begin+1
@@ -149 +159 @@
       ENDDO
     ENDDO
-  
+       
     CALL FFT_backward(TF_vect,vect,nb_vect)
-      
+!    CALL FFT_backward(TF_vect_test,vect_test,nb_vect)
+          
 !      PRINT *,"XXXXXXXXXXXXX Filtre_u_FFT xxxxxxxxxxxx"
 !      DO j=1,jj_end-jj_begin+1
-!          DO i=1,iim
-!          PRINT *,"====",j,"----->",(vect_tmp(i,j,1)-vect(i,j,1))/ &
-!                                    ((vect_tmp(i,j,1)+vect(i,j,1))*0.5+1e-30)
-!          ENDDO
+!         DO i=1,iim
+!           PRINT *,"====",i,j,"----->",vect_test(i,j,1)
+!         ENDDO
 !      ENDDO
-      
+
     ll_nb=0
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
@@ -189 +199 @@
 
     REAL               :: vect(iim+inc,jj_end-jj_begin+1,nbniv)
-    COMPLEX            :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
+    COMPLEX*16         :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
     INTEGER            :: nb_vect
     INTEGER :: i,j,l
@@ -250 +260 @@
     REAL,INTENT(INOUT) :: vect_inout(iim+1,nlat,nbniv)
 
-     REAL               :: vect(iim+inc,jj_end-jj_begin+1,nbniv)
-    COMPLEX            :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
+    REAL               :: vect(iim+inc,jj_end-jj_begin+1,nbniv)
+    COMPLEX*16         :: TF_vect(iim/2+1,jj_end-jj_begin+1,nbniv)
     INTEGER            :: nb_vect
     INTEGER :: i,j,l