Changeset 1043 for LMDZ4/trunk

Timestamp:

Nov 3, 2008, 11:57:59 AM (16 years ago)

Author:

lmdzadmin

Message:

Corrections sorties KE sous flag iflag_con + choix Tiedtke / sorties ISCCP - incompatibles
IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (6 diffs)
• phys_output_write.h (modified) (8 diffs)
• physiq.F (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -600 +600 @@
       CALL histdef2d(iff,flag_slab_bils, "slab_wbils_oce","Bilan au sol sur ocean slab", "W/m2")
 
+ IF (iflag_con.GE.3) THEN
  CALL histdef2d(iff,flag_ale_bl,"ale_bl","ALE BL","m2/s2") 
  CALL histdef2d(iff,flag_alp_bl,"alp_bl","ALP BL","m2/s2") 
@@ -609 +610 @@
  CALL histdef2d(iff,flag_cin,"cin","Convective INhibition","m2/s2")
  CALL histdef2d(iff,flag_wape,"WAPE","WAPE","m2/s2")
+ ENDIF !(iflag_con.GE.3)
 
  CALL histdef2d(iff,flag_weakinv, "weakinv","Weak inversion", "-")
@@ -623 +625 @@
  CALL histdef2d(iff,flag_LWdownOR,"LWdownOR","Sfce incident LW radiation OR","W/m2")
  CALL histdef2d(iff,flag_snowl,"snowl","Solid Large-scale Precip.","kg/(m2*s)")
+ IF (iflag_con.GE.3) THEN
  CALL histdef2d(iff,flag_cape_max,"cape_max","CAPE max.", "J/kg")
+ ENDIF !(iflag_con.GE.3) 
  CALL histdef2d(iff,flag_solldown,"solldown","Down. IR rad. at surface","W/m2")
  CALL histdef2d(iff,flag_dtsvdfo,"dtsvdfo","Boundary-layer dTs(o)","K/s")
@@ -646 +650 @@
  CALL histdef3d(iff,flag_rhum,"rhum","Relative humidity","-")
  CALL histdef3d(iff,flag_ozone,"ozone","Ozone concentration", "ppmv")
- CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
+ IF(iflag_con.GE.3) THEN
+  CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
+ ENDIF !iflag_con.GE.3
  CALL histdef3d(iff,flag_dtphy,"dtphy","Physics dT","K/s")
  CALL histdef3d(iff,flag_dqphy,"dqphy","Physics dQ", "(kg/kg)/s")
@@ -666 +672 @@
  CALL histdef3d(iff,flag_kz_max,"kz_max","Kz melange max","m2/s" )
  CALL histdef3d(iff,flag_clwcon,"clwcon","Convective Cloud Liquid water content", "kg/kg") 
+ IF(iflag_con.GE.3) THEN
  CALL histdef3d(iff,flag_Ma,"Ma","undilute adiab updraft","kg/m2/s")
  CALL histdef3d(iff,flag_dnwd,"dnwd","saturated downdraft","kg/m2/s")
  CALL histdef3d(iff,flag_dnwd0,"dnwd0","unsat. downdraft", "kg/m2/s")
+ ENDIF !(iflag_con.GE.3) 
  CALL histdef3d(iff,flag_dtdyn,"dtdyn","Dynamics dT","K/s")
  CALL histdef3d(iff,flag_dqdyn,"dqdyn","Dynamics dQ", "(kg/kg)/s")
@@ -674 +682 @@
  CALL histdef3d(iff,flag_ducon,"ducon","Convection du","m/s2")
  CALL histdef3d(iff,flag_dqcon,"dqcon","Convection dQ", "(kg/kg)/s")
+ IF(iflag_con.GE.3) THEN
  IF (iflag_wake == 1) THEN
    CALL histdef3d(iff,flag_dtwak,"dtwak","Wake dT","K/s")
    CALL histdef3d(iff,flag_dqwak,"dqwak","Wake dQ","(kg/kg)/s")
- endif
+ ENDIF
+ 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")

LMDZ4/trunk/libf/phylmd/phys_output_write.h

@@ -616 +616 @@
       IF (type_ocean=='force ') THEN
 
+      IF (iflag_con.GE.3) THEN
       IF (iflag_coupl.EQ.1) THEN
        IF (flag_ale_bl(iff)<=lev_files(iff)) THEN
@@ -646 +647 @@
        ENDIF
       ENDIF
+      ENDIF !(iflag_con.GE.3) 
  
       ELSE IF (type_ocean=='slab  ') THEN
@@ -734 +736 @@
       ENDIF
 
+      IF (iflag_con.GE.3) THEN
       IF (flag_cape_max(iff)<=lev_files(iff)) THEN
       CALL histwrite_phy(nid_files(iff),"cape_max",itau_w,cape)
       ENDIF
+      ENDIF !(iflag_con.GE.3)
 
       IF (flag_solldown(iff)<=lev_files(iff)) THEN
@@ -827 +831 @@
       ENDIF
 
+      IF(iflag_con.GE.3) THEN
        IF (flag_upwd(iff)<=lev_files(iff)) THEN
       CALL histwrite_phy(nid_files(iff),"upwd",itau_w,upwd)
        ENDIF
+      ENDIF !(iflag_con.GE.3)
 
        IF (flag_dtphy(iff)<=lev_files(iff)) THEN
@@ -897 +903 @@
        ENDIF
 
+      IF(iflag_con.GE.3) THEN
        IF (flag_Ma(iff)<=lev_files(iff)) THEN
       CALL histwrite_phy(nid_files(iff),"Ma",itau_w,Ma)
@@ -908 +915 @@
       CALL histwrite_phy(nid_files(iff),"dnwd0",itau_w,dnwd0)
        ENDIF
+      ENDIF !(iflag_con.GE.3)
 
        IF (flag_dtdyn(iff)<=lev_files(iff)) THEN
@@ -932 +940 @@
        ENDIF
 
+      IF(iflag_con.GE.3) THEN
        IF (iflag_wake == 1) THEN
          IF (flag_dtwak(iff)<=lev_files(iff)) THEN
@@ -944 +953 @@
         ENDIF
        ENDIF
+      ENDIF !(iflag_con.GE.3) 
 
        IF (flag_dtlsc(iff)<=lev_files(iff)) THEN

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -1261 +1261 @@
 c
       IF(ok_isccp.AND.iflag_con.LE.2) THEN
-         abort_message = 'iflag_con >= 3 for KE and ISCCP simulator'
+         abort_message = 'ISCCP-like outputs may be available for KE
+     .(iflag_con >= 3); for Tiedtke (iflag_con=-2) put ok_isccp=n'
          CALL abort_gcm (modname,abort_message,1)
       ENDIF