Changeset 1491 for LMDZ5/branches/LMDZ5V2.0-dev/libf

Timestamp:

Feb 23, 2011, 1:20:08 PM (14 years ago)

Author:

musat

Message:

Couplage Thermiques/Emanuel? seulement si T<0 avec iflag_coupl==2 (FH)
Correction bug initialisation ptconvth (FH/JYG)
Correction dimensions tableau paprs_glo definition ZPM1R pour le 1D (JYG)
IM

Location:

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd

Files:

• orografi_strato.F (modified) (1 diff)
• phys_output_mod.F90 (modified) (1 diff)
• phys_output_write.h (modified) (2 diffs)
• physiq.F (modified) (2 diffs)

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/orografi_strato.F

@@ -2004 +2004 @@
 
       DO 110 JK=1,NLEV
-      ZPM1R=pplay_glo(klon_glo/2,jk)/paprs_glo(klon_glo/2,1) 
+      ZPM1R=pplay_glo(klon_glo/2,jk)/paprs_glo(klon_glo/2+1,1) 
       IF(ZPM1R.GE.ZSIGT)THEN
          nktopg=JK
       ENDIF
-      ZPM1R=pplay_glo(klon_glo/2,jk)/paprs_glo(klon_glo/2,1) 
+      ZPM1R=pplay_glo(klon_glo/2,jk)/paprs_glo(klon_glo/2+1,1) 
       IF(ZPM1R.GE.ZTOP)THEN
          nstra=JK

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/phys_output_mod.F90

@@ -1059 +1059 @@
 ! Couplage conv-CL
  IF (iflag_con.GE.3) THEN
-    IF (iflag_coupl.EQ.1) THEN
+    IF (iflag_coupl>=1) THEN
  CALL histdef2d(iff,o_ale_bl%flag,o_ale_bl%name, "ALE BL", "m2/s2") 
  CALL histdef2d(iff,o_alp_bl%flag,o_alp_bl%name, "ALP BL", "m2/s2") 

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/phys_output_write.h

@@ -696 +696 @@
 ! Couplage convection-couche limite
       IF (iflag_con.GE.3) THEN
-      IF (iflag_coupl.EQ.1) THEN
+      IF (iflag_coupl>=1) THEN
        IF (o_ale_bl%flag(iff)<=lev_files(iff)) THEN
        CALL histwrite_phy(nid_files(iff),o_ale_bl%name,itau_w,ale_bl)
@@ -703 +703 @@
        CALL histwrite_phy(nid_files(iff),o_alp_bl%name,itau_w,alp_bl)
        ENDIF
-      ENDIF !iflag_coupl.EQ.1
+      ENDIF !iflag_coupl>=1
       ENDIF !(iflag_con.GE.3)
 

LMDZ5/branches/LMDZ5V2.0-dev/libf/phylmd/physiq.F

@@ -2465 +2465 @@
       endif
 ! ----------------------------------------------------------------------
+!IM/FH: 2011/02/23 
+! Couplage Thermiques/Emanuel seulement si T<0
+      if (iflag_coupl==2) then
+        print*,'Couplage Thermiques/Emanuel seulement si T<0'
+        do i=1,klon
+           if (t_seri(i,lmax_th(i))>273.) then
+              Ale_bl(i)=0.
+           endif
+        enddo
+      endif
 
          endif
@@ -2840 +2850 @@
 ! de la convection profonde.
 
-         print*,'TEST SCHEMA DE NUAGES '
+!IM/FH: 2011/02/23 
+! definition des points sur lesquels ls thermiques sont actifs
+         print*,'TEST SCHEMA DE NUAGES DEBUG '
+         ptconvth(:,:)=fm_therm(:,:)>0.
          do k=1,klev
             do i=1,klon