Changeset 5098 for LMDZ6/branches/Amaury_dev/libf/filtrez

Timestamp:

Jul 22, 2024, 6:53:44 PM (2 months ago)

Author:

abarral

Message:

Remove CRAY key (obsolete calls to functions that don't exist anymore, bugs in some implementations, irrelevant now)
Replace usage of CPP_XIOS key by using_xios logical
Remove always unused testcpu bits
Replace most uses of CPP_StratAer by the corresponding logical defined in lmdz_cppkeys_wrapper.F90 [this breaks iso compilation because phyiso doesn't define all aerosols - to be fixed later]
Replaces uses of include "yomcst.h" by the lmdz_yomcst.f90 module in .[fF]90 files

Location:

LMDZ6/branches/Amaury_dev/libf/filtrez

Files:

• filtreg_mod.F90 (modified) (16 diffs)
• inifgn.F (modified) (2 diffs)

LMDZ6/branches/Amaury_dev/libf/filtrez/filtreg_mod.F90

@@ -43 +43 @@
     LOGICAL, SAVE :: first_call_inifilr = .TRUE.
 
-#ifdef CRAY
     INTEGER   ISMIN
     EXTERNAL  ISMIN
     INTEGER iymin 
     INTEGER ixmineq
-#endif
     !
     ! ------------------------------------------------------------
@@ -104 +102 @@
     ENDDO
     !
-#ifdef CRAY
-    iymin   = ISMIN( jjm, dlatu, 1 )
-    ixmineq = ISMIN( iim, dlonu, 1 )
-    dymin   = dlatu( iymin )
-    dxmin   = dlonu( ixmineq )
-#else
+
     dxmin   =  dlonu(1)
     DO  i  = 2, iim
@@ -118 +111 @@
        dymin = MIN( dymin,dlatu(j) )
     ENDDO
-#endif
     !
     ! For a regular grid, we want the filter to start at latitudes
@@ -372 +364 @@
           ENDDO
        ENDDO ! of DO i=1,iim
-#ifdef CRAY
-       CALL MXM( eignfnv,iim,eignft,iim,matriceun(1,1,j),iim )
-#else
+
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -389 +379 @@
        ENDDO ! of DO k = 1, iim
 #endif
-#endif
 
     ENDDO ! of DO j = 2, jfiltnu
@@ -402 +391 @@
           ENDDO
        ENDDO ! of DO i=1,iim
-#ifdef CRAY
-       CALL MXM(eignfnv,iim,eignft,iim,matriceus(1,1,j-jfiltsu+1),iim)
-#else
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -420 +406 @@
        ENDDO ! of DO k = 1, iim
 #endif
-#endif
 
     ENDDO ! of DO j = jfiltsu, jjm
@@ -439 +424 @@
           ENDDO
        ENDDO
-#ifdef CRAY
-       CALL MXM( eignfnu,iim,eignft,iim,matricevn(1,1,j),iim )
-#else
+
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -456 +439 @@
        ENDDO
 #endif
-#endif
 
     ENDDO ! of DO j = 1, jfiltnv
@@ -469 +451 @@
           ENDDO
        ENDDO
-#ifdef CRAY
-       CALL MXM(eignfnu,iim,eignft,iim,matricevs(1,1,j-jfiltsv+1),iim)
-#else
+
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -487 +467 @@
        ENDDO
 #endif
-#endif
 
     ENDDO ! of DO j = jfiltsv, jjm
@@ -506 +485 @@
           ENDDO
        ENDDO
-#ifdef CRAY
-       CALL MXM( eignfnv,iim,eignft,iim,matrinvn(1,1,j),iim )
-#else
+
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -523 +500 @@
        ENDDO
 #endif
-#endif
 
     ENDDO ! of DO j = 2, jfiltnu
@@ -536 +512 @@
           ENDDO
        ENDDO
-#ifdef CRAY
-       CALL MXM(eignfnv,iim,eignft,iim,matrinvs(1,1,j-jfiltsu+1),iim)
-#else
 #ifdef BLAS
        CALL SGEMM ('N', 'N', iim, iim, iim, 1.0, &
@@ -553 +526 @@
        ENDDO
 #endif
-#endif
 
     ENDDO ! of DO j = jfiltsu, jjm
@@ -569 +541 @@
     !
 334 FORMAT(1x,24i3)
-755 FORMAT(1x,6f10.3,i3)
-
-    RETURN
+
   END SUBROUTINE inifilr
 

LMDZ6/branches/Amaury_dev/libf/filtrez/inifgn.F

@@ -67 +67 @@
       END DO
 c
-#ifdef CRAY
-      CALL MXM(eignfnu,iim,eignfnv,iim,vec ,iim)
-      CALL MXM(eignfnv,iim,eignfnu,iim,vec1,iim)
-#else
       DO j = 1, iim
       DO i = 1, iim
@@ -81 +77 @@
       ENDDO
       ENDDO
-#endif
 
 c