Changeset 2626 for trunk/LMDZ.COMMON/libf/filtrez

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/filtrez/filtreg.F (modified) (9 diffs)

trunk/LMDZ.COMMON/libf/filtrez/filtreg.F

@@ -5 +5 @@
      &     griscal ,iter)
       
-      USE filtreg_mod
+      USE filtreg_mod, only: matriceun, matricevn, matrinvn, matrinvs
+      USE filtreg_mod, only: matriceus, matricevs
       
       IMPLICIT NONE
@@ -46 +47 @@
 c
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "coefils.h"
-
-      INTEGER    nlat,nbniv,ifiltre,iter
+      include "dimensions.h"
+      include "paramet.h"
+      include "coefils.h"
+
+      REAL,INTENT(INOUT) :: champ( iip1,nlat,nbniv)
+      INTEGER,INTENT(IN) :: nlat,nbniv,ifiltre,iter
+      INTEGER,INTENT(IN) :: iaire
+
       INTEGER    i,j,l,k
       INTEGER    iim2,immjm
       INTEGER    jdfil1,jdfil2,jffil1,jffil2,jdfil,jffil
 
-      REAL       champ( iip1,nlat,nbniv)
 
       REAL       eignq(iim,nlat,nbniv), sdd1(iim),sdd2(iim)
-      LOGICAL    griscal
-      INTEGER    hemisph, iaire
+      LOGICAL,INTENT(IN) :: griscal
+      INTEGER    hemisph
 
       LOGICAL,SAVE     :: first=.TRUE.
@@ -132 +135 @@
             jffil2 = jjm
          END IF
-      ELSE
+      ELSE ! of IF( griscal )
          IF( nlat.NE.jjm )  THEN
             PRINT  2222
@@ -159 +162 @@
             jffil2 = jjm
          END IF
-      END IF
+      END IF ! of IF( griscal )
       
       DO hemisph = 1, 2
@@ -223 +226 @@
                END DO
                
-            ENDIF
-            
-         ELSE
+            ENDIF ! of IF( ifiltre.EQ.-2 ) ... ELSE IF ( griscal ) ... ELSE
+            
+         ELSE ! of IF( hemisph. EQ. 1 )
             
             IF( ifiltre. EQ. -2 )   THEN
@@ -273 +276 @@
                END DO
                               
-            ENDIF
-            
-         ENDIF
+            ENDIF ! of IF( ifiltre.EQ.-2 ) ... ELSE IF ( griscal ) ... ELSE
+            
+         ENDIF ! of IF( hemisph. EQ. 1 )
          
          IF( ifiltre.EQ. 2 )  THEN
@@ -301 +304 @@
             END DO
 
-         ENDIF
+         ENDIF ! of IF( ifiltre.EQ. 2 )
 
          DO l = 1, nbniv
@@ -310 +313 @@
 
      
-      ENDDO
+      ENDDO ! of DO hemisph = 1, 2
 
 1111  FORMAT(//20x,'ERREUR dans le dimensionnement du tableau  CHAMP a 
@@ -316 +319 @@
 2222  FORMAT(//20x,'ERREUR dans le dimensionnement du tableau CHAMP a fi
      &     ltrer, sur la grille de V ou de Z'/)
-      RETURN
+
       END