Changeset 1357 for LMDZ4/branches/LMDZ4V5.0-dev/libf/bibio/writehist.F

Timestamp:

Apr 14, 2010, 4:03:19 PM (14 years ago)

Author:

Ehouarn Millour

Message:

Some cleanup and fixing the possibility to output fields in the dynamics, on the dynamical grids.

CLEANUPS:

• arch-PW6_VARGAS.fcm : add potentially benefic compiling options
• removed obsolete "control.h" in dyn3d/dyn3dpar (module control_mod.F90 is used instead)

OUTPUTS in the dynamics (3 sets of files, one for each grid: scalar, u, v):

• removed "com_io_dyn.h" common; use module "com_io_dyn_mod.F90" instead
• updated "initdynav.F","inithist.F","writehist.F" and "writedynav.F" in bibio: which field will be written is hard coded there.
• flags "ok_dyn_ins" and "ok_dyn_ave" (loaded via conf_gcm.F) trigger output of fields in the dynamics: if ok_dyn_ins is true, then files "dyn_hist.nc", "dyn_histu.nc" and "dyn_histv.nc" are written (the frequency of the outputs is given by 'iecri' in run.def; values are written every 'iecri' dynamical step). if ok_dyn_ave is true then files "dyn_hist_ave.nc", "dyn_histu_ave.nc" and "dyn_histv_ave.nc" are written (the rate at which averages and made/written, in days, is given by 'periodav' in run.def).

EM

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/bibio/writehist.F (modified) (11 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/bibio/writehist.F

@@ -2 +2 @@
 ! $Id$
 !
-      subroutine writehist( histid, histvid, time, vcov, 
-     ,                          ucov,teta,phi,q,masse,ps,phis)
+      subroutine writehist(time,vcov,ucov,teta,phi,q,masse,ps,phis)
 
 #ifdef CPP_IOIPSL
@@ -9 +8 @@
 #endif
       USE infotrac, ONLY : nqtot, ttext
+      use com_io_dyn_mod, only : histid,histvid,histuid
       implicit none
 
@@ -17 +17 @@
 C
 C   Entree:
-C      histid: ID du fichier histoire
-C      histvid:ID du fichier histoire pour les vents V (appele a disparaitre)
 C      time: temps de l'ecriture
 C      vcov: vents v covariants
@@ -29 +27 @@
 C      phis : geopotentiel au sol
 C      
-C
-C   Sortie:
-C      fileid: ID du fichier netcdf cree
 C
 C   L. Fairhead, LMD, 03/99
@@ -54 +49 @@
 C
 
-      INTEGER histid, histvid
       REAL vcov(ip1jm,llm),ucov(ip1jmp1,llm) 
       REAL teta(ip1jmp1,llm),phi(ip1jmp1,llm)                   
@@ -71 +65 @@
       logical ok_sync
       integer itau_w
+      REAL vnat(ip1jm,llm),unat(ip1jmp1,llm)
+
 C
 C  Initialisations
@@ -79 +75 @@
       ok_sync =.TRUE.
       itau_w = itau_dyn + time
+!  Passage aux composantes naturelles du vent
+      call covnat(llm, ucov, vcov, unat, vnat)
 C
 C  Appels a histwrite pour l'ecriture des variables a sauvegarder
@@ -84 +82 @@
 C  Vents U
 C
-      call histwrite(histid, 'ucov', itau_w, ucov, 
+      call histwrite(histuid, 'u', itau_w, unat, 
      .               iip1*jjp1*llm, ndexu)
-
 C
 C  Vents V
 C
-      call histwrite(histvid, 'vcov', itau_w, vcov, 
+      call histwrite(histvid, 'v', itau_w, vnat, 
      .               iip1*jjm*llm, ndexv)
 
@@ -106 +103 @@
 C  Traceurs
 C
-        DO iq=1,nqtot
-          call histwrite(histid, ttext(iq), itau_w, q(:,:,iq), 
-     .                   iip1*jjp1*llm, ndexu)
-        enddo
-C
+!        DO iq=1,nqtot
+!          call histwrite(histid, ttext(iq), itau_w, q(:,:,iq), 
+!     .                   iip1*jjp1*llm, ndexu)
+!        enddo
+!C
 C  Masse
 C
-      call histwrite(histid, 'masse', itau_w, masse, iip1*jjp1, ndex2d)
+      call histwrite(histid,'masse',itau_w, masse,iip1*jjp1*llm,ndexu)
 C
 C  Pression au sol
@@ -121 +118 @@
 C  Geopotentiel au sol
 C
-      call histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d)
+!      call histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d)
 C
 C  Fin
@@ -128 +125 @@
         call histsync(histid)
         call histsync(histvid)
+        call histsync(histuid)
       endif
 #else