Changeset 1893 for LMDZ5/tags/proto-testing-20131015/libf/dyn3dmem

Timestamp:

Oct 16, 2013, 2:36:06 PM (11 years ago)

Author:

Laurent Fairhead

Message:

Proto-testing commit

Location:

LMDZ5/tags/proto-testing-20131015

Files:

• . (copied) (copied from LMDZ5/branches/testing) (1 prop)
• libf/dyn3dmem/bilan_dyn_loc.F (modified) (6 diffs)
• libf/dyn3dmem/inigrads.F (modified) (1 diff)

LMDZ5/tags/proto-testing-20131015/libf/dyn3dmem/bilan_dyn_loc.F

@@ -420 +420 @@
           masse_cum(:,jjb:jje,l)=0.
           flux_u_cum(:,jjb:jje,l)=0.
-          Q_cum(:,jjb:jje,:,l)=0.
+          Q_cum(:,jjb:jje,l,:)=0.
           flux_uQ_cum(:,jjb:jje,l,:)=0.
           if (pole_sud) jje=jj_end-1
@@ -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
@@ -494 +494 @@
 c    -------------
       do iQ=1,nQ
-        call Register_Hallo_u(Q(1,1,1,iQ),llm,0,1,1,0,Req)
+        call Register_Hallo_u(Q(1,jjb_u,1,iQ),llm,0,1,1,0,Req) 
       enddo
       call SendRequest(Req)
@@ -660 +660 @@
       call Register_Hallo_u(masse_cum,llm,1,1,1,1,Req)
       do iQ=1,nQ
-        call Register_Hallo_u(Q_cum(1,1,1,iQ),llm,0,1,1,0,Req)
+        call Register_Hallo_u(Q_cum(1,jjb_u,1,iQ),llm,0,1,1,0,Req)
       enddo
 

LMDZ5/tags/proto-testing-20131015/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"