Changeset 1043


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

    r1036 r1043  
    600600      CALL histdef2d(iff,flag_slab_bils, "slab_wbils_oce","Bilan au sol sur ocean slab", "W/m2")
    601601
     602 IF (iflag_con.GE.3) THEN
    602603 CALL histdef2d(iff,flag_ale_bl,"ale_bl","ALE BL","m2/s2")
    603604 CALL histdef2d(iff,flag_alp_bl,"alp_bl","ALP BL","m2/s2")
     
    609610 CALL histdef2d(iff,flag_cin,"cin","Convective INhibition","m2/s2")
    610611 CALL histdef2d(iff,flag_wape,"WAPE","WAPE","m2/s2")
     612 ENDIF !(iflag_con.GE.3)
    611613
    612614 CALL histdef2d(iff,flag_weakinv, "weakinv","Weak inversion", "-")
     
    623625 CALL histdef2d(iff,flag_LWdownOR,"LWdownOR","Sfce incident LW radiation OR","W/m2")
    624626 CALL histdef2d(iff,flag_snowl,"snowl","Solid Large-scale Precip.","kg/(m2*s)")
     627 IF (iflag_con.GE.3) THEN
    625628 CALL histdef2d(iff,flag_cape_max,"cape_max","CAPE max.", "J/kg")
     629 ENDIF !(iflag_con.GE.3)
    626630 CALL histdef2d(iff,flag_solldown,"solldown","Down. IR rad. at surface","W/m2")
    627631 CALL histdef2d(iff,flag_dtsvdfo,"dtsvdfo","Boundary-layer dTs(o)","K/s")
     
    646650 CALL histdef3d(iff,flag_rhum,"rhum","Relative humidity","-")
    647651 CALL histdef3d(iff,flag_ozone,"ozone","Ozone concentration", "ppmv")
    648  CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
     652 IF(iflag_con.GE.3) THEN
     653  CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
     654 ENDIF !iflag_con.GE.3
    649655 CALL histdef3d(iff,flag_dtphy,"dtphy","Physics dT","K/s")
    650656 CALL histdef3d(iff,flag_dqphy,"dqphy","Physics dQ", "(kg/kg)/s")
     
    666672 CALL histdef3d(iff,flag_kz_max,"kz_max","Kz melange max","m2/s" )
    667673 CALL histdef3d(iff,flag_clwcon,"clwcon","Convective Cloud Liquid water content", "kg/kg")
     674 IF(iflag_con.GE.3) THEN
    668675 CALL histdef3d(iff,flag_Ma,"Ma","undilute adiab updraft","kg/m2/s")
    669676 CALL histdef3d(iff,flag_dnwd,"dnwd","saturated downdraft","kg/m2/s")
    670677 CALL histdef3d(iff,flag_dnwd0,"dnwd0","unsat. downdraft", "kg/m2/s")
     678 ENDIF !(iflag_con.GE.3)
    671679 CALL histdef3d(iff,flag_dtdyn,"dtdyn","Dynamics dT","K/s")
    672680 CALL histdef3d(iff,flag_dqdyn,"dqdyn","Dynamics dQ", "(kg/kg)/s")
     
    674682 CALL histdef3d(iff,flag_ducon,"ducon","Convection du","m/s2")
    675683 CALL histdef3d(iff,flag_dqcon,"dqcon","Convection dQ", "(kg/kg)/s")
     684 IF(iflag_con.GE.3) THEN
    676685 IF (iflag_wake == 1) THEN
    677686   CALL histdef3d(iff,flag_dtwak,"dtwak","Wake dT","K/s")
    678687   CALL histdef3d(iff,flag_dqwak,"dqwak","Wake dQ","(kg/kg)/s")
    679  endif
     688 ENDIF
     689 ENDIF !(iflag_con.GE.3)
    680690 CALL histdef3d(iff,flag_dtlsc,"dtlsc","Condensation dT", "K/s")
    681691 CALL histdef3d(iff,flag_dtlschr,"dtlschr","Large-scale condensational heating rate","K/s")
  • LMDZ4/trunk/libf/phylmd/phys_output_write.h

    r1036 r1043  
    616616      IF (type_ocean=='force ') THEN
    617617
     618      IF (iflag_con.GE.3) THEN
    618619      IF (iflag_coupl.EQ.1) THEN
    619620       IF (flag_ale_bl(iff)<=lev_files(iff)) THEN
     
    646647       ENDIF
    647648      ENDIF
     649      ENDIF !(iflag_con.GE.3)
    648650 
    649651      ELSE IF (type_ocean=='slab  ') THEN
     
    734736      ENDIF
    735737
     738      IF (iflag_con.GE.3) THEN
    736739      IF (flag_cape_max(iff)<=lev_files(iff)) THEN
    737740      CALL histwrite_phy(nid_files(iff),"cape_max",itau_w,cape)
    738741      ENDIF
     742      ENDIF !(iflag_con.GE.3)
    739743
    740744      IF (flag_solldown(iff)<=lev_files(iff)) THEN
     
    827831      ENDIF
    828832
     833      IF(iflag_con.GE.3) THEN
    829834       IF (flag_upwd(iff)<=lev_files(iff)) THEN
    830835      CALL histwrite_phy(nid_files(iff),"upwd",itau_w,upwd)
    831836       ENDIF
     837      ENDIF !(iflag_con.GE.3)
    832838
    833839       IF (flag_dtphy(iff)<=lev_files(iff)) THEN
     
    897903       ENDIF
    898904
     905      IF(iflag_con.GE.3) THEN
    899906       IF (flag_Ma(iff)<=lev_files(iff)) THEN
    900907      CALL histwrite_phy(nid_files(iff),"Ma",itau_w,Ma)
     
    908915      CALL histwrite_phy(nid_files(iff),"dnwd0",itau_w,dnwd0)
    909916       ENDIF
     917      ENDIF !(iflag_con.GE.3)
    910918
    911919       IF (flag_dtdyn(iff)<=lev_files(iff)) THEN
     
    932940       ENDIF
    933941
     942      IF(iflag_con.GE.3) THEN
    934943       IF (iflag_wake == 1) THEN
    935944         IF (flag_dtwak(iff)<=lev_files(iff)) THEN
     
    944953        ENDIF
    945954       ENDIF
     955      ENDIF !(iflag_con.GE.3)
    946956
    947957       IF (flag_dtlsc(iff)<=lev_files(iff)) THEN
  • LMDZ4/trunk/libf/phylmd/physiq.F

    r1037 r1043  
    12611261c
    12621262      IF(ok_isccp.AND.iflag_con.LE.2) THEN
    1263          abort_message = 'iflag_con >= 3 for KE and ISCCP simulator'
     1263         abort_message = 'ISCCP-like outputs may be available for KE
     1264     .(iflag_con >= 3); for Tiedtke (iflag_con=-2) put ok_isccp=n'
    12641265         CALL abort_gcm (modname,abort_message,1)
    12651266      ENDIF
Note: See TracChangeset for help on using the changeset viewer.