Changeset 1707 for LMDZ5/branches/testing/libf/filtrez

Timestamp:

Jan 11, 2013, 10:19:19 AM (12 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1706

---

Testing release based on r1706

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/filtrez/filtreg.F (modified) (6 diffs)
• libf/filtrez/filtreg_mod.F90 (modified) (3 diffs)
• libf/filtrez/mod_fft.F90 (modified) (1 diff)
• libf/filtrez/mod_filtre_fft_loc.F90 (copied) (copied from LMDZ5/trunk/libf/filtrez/mod_filtre_fft_loc.F90)

LMDZ5/branches/testing/libf/filtrez/filtreg.F

@@ -185 +185 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matrinvn(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -199 +199 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matriceun(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -213 +213 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matricevn(1,1,j),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -231 +231 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matrinvs(1,1,j-jfiltsu+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -247 +247 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matriceus(1,1,j-jfiltsu+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,
@@ -262 +262 @@
                DO j = jdfil,jffil
 #ifdef BLAS
-                  CALL DGEMM("N", "N", iim, nbniv, iim, 1.0, 
+                  CALL SGEMM("N", "N", iim, nbniv, iim, 1.0, 
      &                 matricevs(1,1,j-jfiltsv+1),
      &                 iim, champ(1,j,1), iip1*nlat, 0.0,

LMDZ5/branches/testing/libf/filtrez/filtreg_mod.F90

@@ -1 +1 @@
 !
-! $Id $
+! $Id$
 !
 MODULE filtreg_mod
@@ -10 +10 @@
 
   SUBROUTINE inifilr
-  USE mod_filtre_fft
-    !
+  USE mod_filtre_fft, ONLY : use_filtre_fft,Init_filtre_fft
+  USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
     !    ... H. Upadhyaya, O.Sharma   ...
     !
@@ -541 +541 @@
        CALL Init_filtre_fft(coefilu,modfrstu,jfiltnu,jfiltsu,  &
                            coefilv,modfrstv,jfiltnv,jfiltsv)
+       CALL Init_filtre_fft_loc(coefilu,modfrstu,jfiltnu,jfiltsu,  &
+                           coefilv,modfrstv,jfiltnv,jfiltsv)
     ENDIF
 

LMDZ5/branches/testing/libf/filtrez/mod_fft.F90

@@ -3 +3 @@
 #ifdef FFT_MATHKEISAN
   USE mod_fft_mathkeisan
-#elif FFT_FFTW
+#else
+#ifdef FFT_FFTW
   USE mod_fft_fftw
-#elif FFT_MKL
+#else
+#ifdef FFT_MKL
   USE mod_fft_mkl
 #else
   USE mod_fft_wrapper
 #endif
+#endif
+#endif
 
 END MODULE mod_fft