Changeset 2488 for LMDZ5/branches/testing/libf/dyn3dmem/writehist_loc.F

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/writehist_loc.F (modified) (8 diffs)

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

@@ -89 +89 @@
 !$OMP MASTER
         ALLOCATE(unat(ijb_u:ije_u,llm))
-        ALLOCATE(vnat(ijb_u:ije_u,llm)) 
+        ALLOCATE(vnat(ijb_v:ije_v,llm)) 
         ALLOCATE(tm(ijb_u:ije_u,llm))
         ALLOCATE(ndex2d(ijnb_u*llm))
@@ -127 +127 @@
 C  Vents V
 C
-
+      ije=ij_end
+      if (pole_sud) jjn=jj_nb-1
+      if (pole_sud) ije=ij_end-iip1
 !$OMP BARRIER
 !$OMP MASTER      
@@ -136 +138 @@
 
 C
-C  Temperature potentielle moyennee
-C
+C  Temperature potentielle
+C
+      ijb=ij_begin
+      ije=ij_end
+      jjn=jj_nb
 !$OMP MASTER      
       call histwrite(histid, 'theta', itau_w, teta(ijb:ije,:), 
@@ -144 +149 @@
 
 C
-C  Temperature moyennee
+C  Temperature
 C
 
@@ -186 +191 @@
 !$OMP MASTER      
        call histwrite(histid, 'masse', itau_w, masse(ijb:ije,:),
-     .                iip1*jjn, ndexu)
+     .                iip1*jjn*llm, ndexu)
 !$OMP END MASTER
 
@@ -194 +199 @@
 C
 !$OMP MASTER      
-
        call histwrite(histid, 'ps', itau_w, ps(ijb:ije), 
      .                 iip1*jjn, ndex2d)
@@ -203 +207 @@
 C
 !$OMP MASTER      
-       call histwrite(histid, 'phis', itau_w, phis(ijb:ije),
-     .                 iip1*jjn, ndexu)
+!       call histwrite(histid, 'phis', itau_w, phis(ijb:ije),
+!     .                 iip1*jjn, ndex2d)
 !$OMP END MASTER
 
@@ -218 +222 @@
 !$OMP END MASTER
 #else
-      write(lunout,*)'writedynav_p: Needs IOIPSL to function'
+      write(lunout,*)'writehist_loc: Needs IOIPSL to function'
 #endif
 ! #endif of #ifdef CPP_IOIPSL
-      return
       end