Changeset 2475 for LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F

Timestamp:

Mar 22, 2016, 1:19:13 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Reinstate writehist, writedyn and bilan_dyn in dyn3dmem so that ouputs in the dynamics (dyn_hist* and dynzon files) may be generated when in parallel.
EM

File:

• LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F (modified) (7 diffs)

LMDZ5/trunk/libf/dyn3dmem/inithist_loc.F

@@ -153 +153 @@
 
       ddid=(/ 1,2 /)
-      dsg=(/ iip1,jjp1 /)
+      dsg=(/ iip1,jjm /)
       dsl=(/ iip1,jjn /)
       dpf=(/ 1,jjb /)
@@ -170 +170 @@
      
 ! Grille U
+
+      do jj = 1, jjp1
+        do ii = 1, iip1
+          rlong(ii,jj) = rlonu(ii) * 180. / pi
+          rlat(ii,jj) = rlatu(jj) * 180. / pi
+        enddo
+      enddo
 
       jjb=jj_begin
@@ -210 +217 @@
 C  Vents U
 C
-      call histdef(histuid, 'u', 'vent u moyen ',
-     .             'm/s', iip1, jjp1, uhoriid, llm, 1, llm, zvertiidu,
-     .             32, 'ave(X)', t_ops, t_wrt)
+      jjn=jj_nb
+      call histdef(histuid, 'u', 'vent u',
+     .             'm/s', iip1, jjn, uhoriid, llm, 1, llm, zvertiidu,
+     .             32, 'inst(X)', t_ops, t_wrt)
 
 C
 C  Vents V
 C
-      call histdef(histvid, 'v', 'vent v moyen',
-     .             'm/s', iip1, jjm, vhoriid, llm, 1, llm, zvertiidv,
-     .             32, 'ave(X)', t_ops, t_wrt)
+      if (pole_sud) jjn=jj_nb-1
+      call histdef(histvid, 'v', 'vent v',
+     .             'm/s', iip1, jjn, vhoriid, llm, 1, llm, zvertiidv,
+     .             32, 'inst(X)', t_ops, t_wrt)
 
 C
 C  Temperature
 C
-      call histdef(histid, 'temp', 'temperature moyenne', 'K',
-     .             iip1, jjp1, thoriid, llm, 1, llm, zvertiid,
-     .             32, 'ave(X)', t_ops, t_wrt)
+      jjn=jj_nb
+      call histdef(histid, 'temp', 'temperature', 'K',
+     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
+     .             32, 'inst(X)', t_ops, t_wrt)
 C
 C  Temperature potentielle
 C
       call histdef(histid, 'theta', 'temperature potentielle', 'K',
-     .             iip1, jjp1, thoriid, llm, 1, llm, zvertiid,
-     .             32, 'ave(X)', t_ops, t_wrt)
+     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
+     .             32, 'inst(X)', t_ops, t_wrt)
 
 
@@ -238 +248 @@
 C  Geopotentiel
 C
-      call histdef(histid, 'phi', 'geopotentiel moyen', '-',
-     .             iip1, jjp1, thoriid, llm, 1, llm, zvertiid,
-     .             32, 'ave(X)', t_ops, t_wrt)
+      call histdef(histid, 'phi', 'geopotentiel', '-',
+     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
+     .             32, 'inst(X)', t_ops, t_wrt)
 C
 C  Traceurs
@@ -247 +257 @@
 !          call histdef(histid, ttext(iq), ttext(iq), '-',
 !     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
-!     .             32, 'ave(X)', t_ops, t_wrt)
+!     .             32, 'inst(X)', t_ops, t_wrt)
 !        enddo
 C
@@ -253 +263 @@
 C
       call histdef(histid, 'masse', 'masse', 'kg',
-     .             iip1, jjp1, thoriid, llm, 1, llm, zvertiid,
-     .             32, 'ave(X)', t_ops, t_wrt)
+     .             iip1, jjn, thoriid, llm, 1, llm, zvertiid,
+     .             32, 'inst(X)', t_ops, t_wrt)
 C
 C  Pression au sol
 C
       call histdef(histid, 'ps', 'pression naturelle au sol', 'Pa',
-     .             iip1, jjp1, thoriid, 1, 1, 1, -99,
-     .             32, 'ave(X)', t_ops, t_wrt)
-C
-C  Pression au sol
+     .             iip1, jjn, thoriid, 1, 1, 1, -99,
+     .             32, 'inst(X)', t_ops, t_wrt)
+C
+C  Geopotentiel au sol
 C
 !      call histdef(histid, 'phis', 'geopotentiel au sol', '-',
 !     .             iip1, jjn, thoriid, 1, 1, 1, -99,
-!     .             32, 'ave(X)', t_ops, t_wrt)
+!     .             32, 'inst(X)', t_ops, t_wrt)
 C
 C  Fin
@@ -274 +284 @@
       call histend(histvid)
 #else
-      write(lunout,*)'initdynav_p: Needs IOIPSL to function'
+      write(lunout,*)'inithist_loc: Needs IOIPSL to function'
 #endif
 ! #endif of #ifdef CPP_IOIPSL
-      return
       end