Changeset 1864 for LMDZ5/branches/testing/libf/dyn3dmem/mod_filtreg_p.F

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/mod_filtreg_p.F (modified) (9 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/mod_filtreg_p.F

@@ -5 +5 @@
       SUBROUTINE filtreg_p ( champ,jjb,jje, ibeg, iend, nlat, nbniv, 
      &     ifiltre, iaire, griscal ,iter)
-      USE Parallel, only : OMP_CHUNK
+      USE parallel_lmdz, only : OMP_CHUNK
       USE mod_filtre_fft_loc
       USE timer_filtre
@@ -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