Changeset 1805 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Jul 19, 2013, 4:16:58 PM (11 years ago)

Author:

yann meurdesoif

Message:

Fix OpenMP problem with classical filtering (not FFT)
=> Using Blas is OK
=> Using matmul is OK

YM

File:

• LMDZ5/trunk/libf/dyn3dmem/mod_filtreg_p.F (modified) (8 diffs)

LMDZ5/trunk/libf/dyn3dmem/mod_filtreg_p.F

@@ -216 +216 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
-     &                    matmul(matrinvn(:,:,j),champ_loc(:iim,j,:))
+                     champ_fft(:,j,1:nbniv_loc)=
+     &                    matmul(matrinvn(:,:,j),
+     &                    champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -229 +230 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
-     &                    matmul(matriceun(:,:,j),champ_loc(:iim,j,:))
+                     champ_fft(:,j,1:nbniv_loc)=
+     &                    matmul(matriceun(:,:,j),
+     &                           champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -242 +244 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
-     &                    matmul(matricevn(:,:,j),champ_loc(:iim,j,:))
+                     champ_fft(:,j,1:nbniv_loc)=
+     &                    matmul(matricevn(:,:,j),           
+     &                           champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -259 +262 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
+                     champ_fft(:,j,1:nbniv_loc)=
      &                    matmul(matrinvs(:,:,j-jfiltsu+1),
-     &                           champ_loc(:iim,j,:))
+     &                           champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -274 +277 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
+                     champ_fft(:,j,1:nbniv_loc)=
      &                    matmul(matriceus(:,:,j-jfiltsu+1),
-     &                           champ_loc(:iim,j,:))
+     &                           champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -289 +292 @@
      &                    champ_fft(1,j,1), iip1*(jje-jjb+1))
 #else
-                     champ_fft(:,j,:)=
+                     champ_fft(:,j,1:nbniv_loc)=
      &                    matmul(matricevs(:,:,j-jfiltsv+1),
-     &                           champ_loc(:iim,j,:))
+     &                           champ_loc(:iim,j,1:nbniv_loc))
 #endif
                   ENDDO
@@ -308 +311 @@
                ll_nb = 0
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
-               DO l = 1, nbniv_loc
+               DO l = 1, nbniv
                   ll_nb = ll_nb + 1
                   DO j = jdfil,jffil
@@ -324 +327 @@
                ll_nb = 0
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
-               DO l = 1, nbniv_loc
+               DO l = 1, nbniv
                   ll_nb = ll_nb + 1
                   DO j = jdfil,jffil