Changeset 1036 for LMDZ4/trunk/libf

Timestamp:

Oct 28, 2008, 3:49:05 PM (16 years ago)

Author:

lmdzadmin

Message:

Correction AI: aire et contfracATM : ecriture une fois (once)
Correction IM: ecriture meantaucld a la frequence d'appel du simulateur ISCCP
AI/IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (3 diffs)
• phys_output_write.h (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -441 +441 @@
 !!! Champs 1D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  CALL histdef2d(iff,flag_phis,"phis","Surface geop.height","m2/s2") 
+   type_ecri(1) = 'once'
+   type_ecri(2) = 'once'
+   type_ecri(3) = 'once'
+   type_ecri(4) = 'once'
  CALL histdef2d(iff,flag_aire,"aire","Grid area","-")
  CALL histdef2d(iff,flag_contfracATM,"contfracATM","% sfce ter+lic","-")
+   type_ecri(1) = 'ave(X)'
+   type_ecri(2) = 'ave(X)'
+   type_ecri(3) = 'ave(X)'
+   type_ecri(4) = 'inst(X)'
+
+!!! Champs 2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  CALL histdef2d(iff,flag_contfracOR,"contfracOR","% sfce terre OR","-" )
  CALL histdef2d(iff,flag_aireTER,"aireTER","Grid area CONT","-" )
-
-!!! Champs 2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  CALL histdef2d(iff,flag_flat,"flat","Latent heat flux","W/m2")
  CALL histdef2d(iff,flag_slp,"slp","Sea Level Pressure", "Pa" )
@@ -680 +688 @@
  CALL histdef3d(iff,flag_ratqs,"ratqs", "RATQS"," ")
  CALL histdef3d(iff,flag_dtthe,"dtthe","Dry adjust. dT", "K/s")
+
+if(iflag_thermals.gt.1) THEN
  CALL histdef3d(iff,flag_f_th,"f_th","Thermal plume mass flux", "K/s")
  CALL histdef3d(iff,flag_e_th,"e_th","Thermal plume entrainment", "K/s")
@@ -687 +697 @@
  CALL histdef3d(iff,flag_a_th,"a_th","Thermal plume fraction", "")
  CALL histdef3d(iff,flag_d_th,"d_th","Thermal plume detrainment", "K/s")
+endif !iflag_thermals.gt.1
  CALL histdef2d(iff,flag_f0_th,"f0_th","Thermal closure mass flux", "K/s")
  CALL histdef2d(iff,flag_zmax_th,"zmax_th","Thermal plume height", "K/s")

LMDZ4/trunk/libf/phylmd/phys_output_write.h

@@ -665 +665 @@
 #ifdef histISCCP
       IF(ok_isccp) THEN
-       IF (flag_meantaucld(iff)<=lev_files(iff)) THEN
+       IF (MOD(itap,NINT(freq_ISCCP/dtime)).EQ.0) THEN
+        IF (flag_meantaucld(iff)<=lev_files(iff)) THEN
        CALL histwrite_phy(nid_files(iff),"meantaucld",itau_w,meantaucld)
+        ENDIF
        ENDIF
       ENDIF !(ok_isccp)
@@ -994 +996 @@
        ENDIF
 
-       IF (iflag_thermals.ge.1) THEN
+       IF (iflag_thermals.gt.1) THEN
         IF (flag_f_th(iff)<=lev_files(iff)) THEN
         CALL histwrite_phy(nid_files(iff),"f_th",itau_w,fm_therm)