Changeset 1062 for LMDZ4/trunk

Timestamp:

Dec 17, 2008, 1:15:05 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Ajout sorties wake, etc (JYG); correction stockage sous-domaine (LG);
initialisation convection (JYG)
AI/IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• cva_driver.F (modified) (1 diff)
• phys_output_mod.F90 (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/cva_driver.F

@@ -733 +733 @@
       IF (iflag_con .eq. 3) THEN
        IF (iflag_mix .ge. 1 ) THEN
-    
+         CALL zilch(supmax,nloc*klev)    
          CALL cv3p_mixing(nloc,ncum,nd,nd,ntra,icb,nk,inb    ! na->nd
      :                       ,ph,t,q,qs,u,v,tra,h,lv,qnk

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -265 +265 @@
   integer, dimension(nfiles) , save :: flag_dtwak        = (/ 4, 5, 10, 10, 10 /)
   integer, dimension(nfiles) , save :: flag_dqwak        = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_wake_h       = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_wake_s       = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_wake_deltat  = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_wake_deltaq  = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_wake_omg     = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_Vprecip      = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_ftd          = (/ 4, 5, 10, 10, 10 /)
+  integer, dimension(nfiles) , save :: flag_fqd          = (/ 4, 5, 10, 10, 10 /)
   integer, dimension(nfiles) , save :: flag_dtlsc        = (/ 4, 10, 10, 10, 10 /)
   integer, dimension(nfiles) , save :: flag_dtlschr      = (/ 4, 10, 10, 10, 10 /)
@@ -408 +416 @@
         jmax_ins=jjmp1
 
-        do i=1,iim-1
+! correction abderr        do i=1,iim-1
+        do i=1,iim
            print*,'io_lon(i)=',io_lon(i)
            if (io_lon(i).le.lonmin_reg(iff)) imin_ins=i
@@ -705 +714 @@
  IF(iflag_con.GE.3) THEN
  IF (iflag_wake == 1) THEN
+   CALL histdef2d(iff,flag_wake_h,"wake_h","wake_h", "-")
+   CALL histdef2d(iff,flag_wake_s,"wake_s","wake_s", "-")
    CALL histdef3d(iff,flag_dtwak,"dtwak","Wake dT","K/s")
    CALL histdef3d(iff,flag_dqwak,"dqwak","Wake dQ","(kg/kg)/s")
+   CALL histdef3d(iff,flag_wake_deltat,"wake_deltat","wake_deltat", " ")
+   CALL histdef3d(iff,flag_wake_deltaq,"wake_deltaq","wake_deltaq", " ")
+   CALL histdef3d(iff,flag_wake_omg,"wake_omg","wake_omg", " ")
  ENDIF
+   CALL histdef3d(iff,flag_Vprecip,"Vprecip","precipitation vertical profile","-")
+   CALL histdef3d(iff,flag_ftd,"ftd","tend temp due aux descentes precip","-")
+   CALL histdef3d(iff,flag_fqd,"fqd","tend vap eau due aux descentes precip","-")
  ENDIF !(iflag_con.GE.3)
+
  CALL histdef3d(iff,flag_dtlsc,"dtlsc","Condensation dT", "K/s")
  CALL histdef3d(iff,flag_dtlschr,"dtlschr","Large-scale condensational heating rate","K/s")