Changeset 1885 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Oct 4, 2013, 3:35:36 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Make dyn3dpar/bilan_dyn_p.F work in MPI and OpenMP.
EM

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• bilan_dyn_loc.F (modified) (3 diffs)
• inigrads.F (modified) (1 diff)

LMDZ5/trunk/libf/dyn3dmem/bilan_dyn_loc.F

@@ -444 +444 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-        masse_cum(:,jjb:jje,:)=masse_cum(:,jjb:jje,:)+masse(:,jjb:jje,:)
-        flux_u_cum(:,jjb:jje,:)=flux_u_cum(:,jjb:jje,:)
-     .                         +flux_u(:,jjb:jje,:)
+        masse_cum(:,jjb:jje,l)=masse_cum(:,jjb:jje,l)+masse(:,jjb:jje,l)
+        flux_u_cum(:,jjb:jje,l)=flux_u_cum(:,jjb:jje,l)
+     .                         +flux_u(:,jjb:jje,l)
       ENDDO
 !$OMP END DO NOWAIT
@@ -454 +454 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-       flux_v_cum(:,jjb:jje,:)=flux_v_cum(:,jjb:jje,:)
-     .                          +flux_v(:,jjb:jje,:)
+       flux_v_cum(:,jjb:jje,l)=flux_v_cum(:,jjb:jje,l)
+     .                          +flux_v(:,jjb:jje,l)
       ENDDO
 !$OMP END DO NOWAIT
@@ -465 +465 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         DO l=1,llm
-          Q_cum(:,jjb:jje,:,iQ)=Q_cum(:,jjb:jje,:,iQ)
-     .                       +Q(:,jjb:jje,:,iQ)*masse(:,jjb:jje,:)
+          Q_cum(:,jjb:jje,l,iQ)=Q_cum(:,jjb:jje,l,iQ)
+     .                       +Q(:,jjb:jje,l,iQ)*masse(:,jjb:jje,l)
         ENDDO
 !$OMP END DO NOWAIT

LMDZ5/trunk/libf/dyn3dmem/inigrads.F

@@ -13 +13 @@
       real xmin,xmax,ymin,ymax
 
-      character file*10,titlel*40
+      character(len=*),intent(in) :: file
+      character(len=*),intent(in) :: titlel
 
 #include "gradsdef.h"