Changeset 2626 for trunk/LMDZ.COMMON/libf/dyn3dpar/filtreg_p.F

Timestamp:

Feb 23, 2022, 2:22:42 PM (3 years ago)

Author:

emillour

Message:

Common dynamics:
Some rather harmless OpenMP fixes in the filtering identified by recent versions of ifort.
EM

File:

• trunk/LMDZ.COMMON/libf/dyn3dpar/filtreg_p.F (modified) (13 diffs)

trunk/LMDZ.COMMON/libf/dyn3dpar/filtreg_p.F

@@ -4 +4 @@
      &     ifiltre, iaire, griscal ,iter)
       USE parallel_lmdz, only : OMP_CHUNK
-      USE mod_filtre_fft
-      USE timer_filtre
-      
-      USE filtreg_mod
+      USE mod_filtre_fft, only: use_filtre_fft, filtre_u_fft
+      USE mod_filtre_fft, only: filtre_v_fft, filtre_inv_fft
+      USE timer_filtre, only: init_timer, start_timer, stop_timer
+      USE filtreg_mod, only: matriceun, matricevn, matrinvn, matrinvs
+      USE filtreg_mod, only: matriceus, matricevs
       
       IMPLICIT NONE
@@ -51 +52 @@
 c
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "coefils.h"
-c
-      INTEGER ibeg,iend,nlat,nbniv,ifiltre,iter
+      include "dimensions.h"
+      include "paramet.h"
+      include "coefils.h"
+c
+      REAL,INTENT(INOUT) :: champ( iip1,nlat,nbniv)
+      INTEGER,INTENT(IN) :: ibeg,iend,nlat,nbniv,ifiltre,iter
+      LOGICAL,INTENT(IN) :: griscal
+      INTEGER,INTENT(IN) :: iaire
+
       INTEGER i,j,l,k
       INTEGER iim2,immjm
       INTEGER jdfil1,jdfil2,jffil1,jffil2,jdfil,jffil
       
-      REAL  champ( iip1,nlat,nbniv)
-      
-      LOGICAL    griscal
-      INTEGER    hemisph, iaire
+      INTEGER    hemisph
       
       REAL :: champ_fft(iip1,nlat,nbniv)
@@ -201 +203 @@
             ENDDO
 c$OMP END DO NOWAIT
-
             nbniv_loc = ll_nb
 
@@ -214 +215 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
-     &                    =matmul(matrinvn(:,:,j),champ_loc(:iim,j,:))
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
+     &                    =matmul(matrinvn(:,:,j),
+     &                            champ_loc(:iim,j,:nbniv_loc))
 #endif
                   ENDDO
@@ -227 +229 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
-     &                    =matmul(matriceun(:,:,j),champ_loc(:iim,j,:))
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
+     &                    =matmul(matriceun(:,:,j),
+     &                            champ_loc(:iim,j,:nbniv_loc))
 #endif
                   ENDDO
@@ -240 +243 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
-     &                    =matmul(matricevn(:,:,j),champ_loc(:iim,j,:))
-#endif
-                  ENDDO
-                  
-               ENDIF
-               
-            ELSE
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
+     &                    =matmul(matricevn(:,:,j),
+     &                            champ_loc(:iim,j,:nbniv_loc))
+#endif
+                  ENDDO
+                  
+               ENDIF ! of IF( ifiltre.EQ.-2 ) ... ELSE IF ( griscal ) ... ELSE
+               
+            ELSE ! of IF( hemisph.EQ.1 )
                
                IF( ifiltre.EQ.-2 )   THEN
@@ -257 +261 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
      &                    =matmul(matrinvs(:,:,j-jfiltsu+1),
-     &                            champ_loc(:iim,j,:))
+     &                            champ_loc(:iim,j,:nbniv_loc))
 #endif
                   ENDDO
@@ -272 +276 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
      &                    =matmul(matriceus(:,:,j-jfiltsu+1),
-     &                            champ_loc(:iim,j,:))
+     &                            champ_loc(:iim,j,:nbniv_loc))
 #endif
                   ENDDO
@@ -287 +291 @@
      &                    champ_fft(1,j-jdfil+1,1), iip1*nlat)
 #else
-                     champ_fft(:iim,j-jdfil+1,:)
+                     champ_fft(:iim,j-jdfil+1,:nbniv_loc)
      &                    =matmul(matricevs(:,:,j-jfiltsv+1),
-     &                            champ_loc(:iim,j,:))
-#endif
-                  ENDDO
-                  
-               ENDIF
-               
-            ENDIF
+     &                            champ_loc(:iim,j,:nbniv_loc))
+#endif
+                  ENDDO
+                  
+               ENDIF ! of IF( ifiltre.EQ.-2 ) ... ELSE IF ( griscal ) ... ELSE
+               
+            ENDIF ! of IF( hemisph.EQ.1 ) ... ELSE
 !     c     
             IF( ifiltre.EQ.2 )  THEN
@@ -334 +338 @@
 c$OMP END DO NOWAIT
                
-            ENDIF
+            ENDIF ! of IF( ifiltre.EQ.2 ) ... ELSE
             
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
@@ -348 +352 @@
 ccccccccccccccccccccccccccccccccccccccccccccc
         
-         ELSE
+         ELSE ! of IF (.NOT. use_filtre_fft)
        
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
@@ -405 +409 @@
             ENDDO
 c$OMP END DO NOWAIT             
-         ENDIF 
+         ENDIF ! of IF (.NOT. use_filtre_fft) ... ELSE
 c Fin de la zone de filtrage
 
         
-      ENDDO
+      ENDDO ! of DO hemisph = 1, 2
 
 !      DO j=1,nlat
@@ -430 +434 @@
       CALL stop_timer
 c$OMP END MASTER
-      RETURN
+
       END