Changeset 1100


Ignore:
Timestamp:
Feb 16, 2009, 7:01:12 PM (16 years ago)
Author:
musat
Message:

Homogeneisation flags sorties convection + poches froides
IM

Location:
LMDZ4/trunk/libf/phylmd
Files:
2 edited

Legend:

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

    r1081 r1100  
    584584 CALL histdef2d(iff,flag_fbase,"fbase","Cld base mass flux","kg/m2/s")
    585585 CALL histdef2d(iff,flag_prw,"prw","Precipitable water","kg/m2")
     586 CALL histdef2d(iff,flag_cape_max,"cape_max","CAPE max.", "J/kg")
     587 CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
     588 CALL histdef3d(iff,flag_Ma,"Ma","undilute adiab updraft","kg/m2/s")
     589 CALL histdef3d(iff,flag_dnwd,"dnwd","saturated downdraft","kg/m2/s")
     590 CALL histdef3d(iff,flag_dnwd0,"dnwd0","unsat. downdraft", "kg/m2/s")
    586591     ENDIF !iflag_con .GE. 3
    587592
     
    632637      CALL histdef2d(iff,flag_slab_bils, "slab_wbils_oce","Bilan au sol sur ocean slab", "W/m2")
    633638
    634  IF (iflag_con.GE.3) THEN
    635  CALL histdef2d(iff,flag_ale_bl,"ale_bl","ALE BL","m2/s2")
    636  CALL histdef2d(iff,flag_alp_bl,"alp_bl","ALP BL","m2/s2")
    637  CALL histdef2d(iff,flag_ale_wk,"ale_wk","ALE WK","m2/s2")
    638  CALL histdef2d(iff,flag_alp_wk,"alp_wk","ALP WK","m2/s2")
    639 
     639 IF (iflag_con.EQ.3) THEN
    640640 CALL histdef2d(iff,flag_ale,"ale","ALE","m2/s2")
    641641 CALL histdef2d(iff,flag_alp,"alp","ALP","W/m2")
    642642 CALL histdef2d(iff,flag_cin,"cin","Convective INhibition","m2/s2")
    643  CALL histdef2d(iff,flag_wape,"WAPE","WAPE","m2/s2")
    644  ENDIF !(iflag_con.GE.3)
     643 IF (iflag_coupl.EQ.1) THEN
     644  CALL histdef2d(iff,flag_ale_bl,"ale_bl","ALE BL","m2/s2")
     645  CALL histdef2d(iff,flag_alp_bl,"alp_bl","ALP BL","m2/s2")
     646 ENDIF !iflag_coupl.EQ.1
     647 IF (iflag_wake.EQ.1) THEN
     648  CALL histdef2d(iff,flag_ale_wk,"ale_wk","ALE WK","m2/s2")
     649  CALL histdef2d(iff,flag_alp_wk,"alp_wk","ALP WK","m2/s2")
     650  CALL histdef2d(iff,flag_wape,"WAPE","WAPE","m2/s2")
     651  CALL histdef2d(iff,flag_wake_h,"wake_h","wake_h", "-")
     652  CALL histdef2d(iff,flag_wake_s,"wake_s","wake_s", "-")
     653  CALL histdef3d(iff,flag_dtwak,"dtwak","Wake dT","K/s")
     654  CALL histdef3d(iff,flag_dqwak,"dqwak","Wake dQ","(kg/kg)/s")
     655  CALL histdef3d(iff,flag_wake_deltat,"wake_deltat","wake_deltat", " ")
     656  CALL histdef3d(iff,flag_wake_deltaq,"wake_deltaq","wake_deltaq", " ")
     657  CALL histdef3d(iff,flag_wake_omg,"wake_omg","wake_omg", " ")
     658  CALL histdef3d(iff,flag_ftd,"ftd","tend temp due aux descentes precip","-")
     659  CALL histdef3d(iff,flag_fqd,"fqd","tend vap eau due aux descentes precip","-")
     660 ENDIF !iflag_wake.EQ.1
     661  CALL histdef3d(iff,flag_Vprecip,"Vprecip","precipitation vertical profile","-")
     662 ENDIF !(iflag_con.EQ.3)
    645663
    646664 CALL histdef2d(iff,flag_weakinv, "weakinv","Weak inversion", "-")
     
    654672 CALL histdef2d(iff,flag_LWdownOR,"LWdownOR","Sfce incident LW radiation OR","W/m2")
    655673 CALL histdef2d(iff,flag_snowl,"snowl","Solid Large-scale Precip.","kg/(m2*s)")
    656  IF (iflag_con.GE.3) THEN
    657  CALL histdef2d(iff,flag_cape_max,"cape_max","CAPE max.", "J/kg")
    658  ENDIF !(iflag_con.GE.3)
    659674 CALL histdef2d(iff,flag_solldown,"solldown","Down. IR rad. at surface","W/m2")
    660675 CALL histdef2d(iff,flag_dtsvdfo,"dtsvdfo","Boundary-layer dTs(o)","K/s")
     
    679694 CALL histdef3d(iff,flag_rhum,"rhum","Relative humidity","-")
    680695 CALL histdef3d(iff,flag_ozone,"ozone","Ozone concentration", "ppmv")
    681  IF(iflag_con.GE.3) THEN
    682   CALL histdef3d(iff,flag_upwd,"upwd","saturated updraft", "kg/m2/s")
    683  ENDIF !iflag_con.GE.3
    684696 CALL histdef3d(iff,flag_dtphy,"dtphy","Physics dT","K/s")
    685697 CALL histdef3d(iff,flag_dqphy,"dqphy","Physics dQ", "(kg/kg)/s")
     
    701713 CALL histdef3d(iff,flag_kz_max,"kz_max","Kz melange max","m2/s" )
    702714 CALL histdef3d(iff,flag_clwcon,"clwcon","Convective Cloud Liquid water content", "kg/kg")
    703  IF(iflag_con.GE.3) THEN
    704  CALL histdef3d(iff,flag_Ma,"Ma","undilute adiab updraft","kg/m2/s")
    705  CALL histdef3d(iff,flag_dnwd,"dnwd","saturated downdraft","kg/m2/s")
    706  CALL histdef3d(iff,flag_dnwd0,"dnwd0","unsat. downdraft", "kg/m2/s")
    707  ENDIF !(iflag_con.GE.3)
    708715 CALL histdef3d(iff,flag_dtdyn,"dtdyn","Dynamics dT","K/s")
    709716 CALL histdef3d(iff,flag_dqdyn,"dqdyn","Dynamics dQ", "(kg/kg)/s")
     
    713720 CALL histdef3d(iff,flag_ducon,"ducon","Convection du","m/s2")
    714721 CALL histdef3d(iff,flag_dqcon,"dqcon","Convection dQ", "(kg/kg)/s")
    715  IF(iflag_con.GE.3) THEN
    716  IF (iflag_wake == 1) THEN
    717    CALL histdef2d(iff,flag_wake_h,"wake_h","wake_h", "-")
    718    CALL histdef2d(iff,flag_wake_s,"wake_s","wake_s", "-")
    719    CALL histdef3d(iff,flag_dtwak,"dtwak","Wake dT","K/s")
    720    CALL histdef3d(iff,flag_dqwak,"dqwak","Wake dQ","(kg/kg)/s")
    721    CALL histdef3d(iff,flag_wake_deltat,"wake_deltat","wake_deltat", " ")
    722    CALL histdef3d(iff,flag_wake_deltaq,"wake_deltaq","wake_deltaq", " ")
    723    CALL histdef3d(iff,flag_wake_omg,"wake_omg","wake_omg", " ")
    724  ENDIF
    725    CALL histdef3d(iff,flag_Vprecip,"Vprecip","precipitation vertical profile","-")
    726    CALL histdef3d(iff,flag_ftd,"ftd","tend temp due aux descentes precip","-")
    727    CALL histdef3d(iff,flag_fqd,"fqd","tend vap eau due aux descentes precip","-")
    728  ENDIF !(iflag_con.GE.3)
    729722
    730723 CALL histdef3d(iff,flag_dtlsc,"dtlsc","Condensation dT", "K/s")
  • LMDZ4/trunk/libf/phylmd/phys_output_write.h

    r1067 r1100  
    510510      CALL histwrite_phy(nid_files(iff),"prw",itau_w,prw)
    511511        ENDIF
     512!!! IM beg
     513      IF (flag_cape_max(iff)<=lev_files(iff)) THEN
     514       CALL histwrite_phy(nid_files(iff),"cape_max",itau_w,cape)
     515      ENDIF
     516      IF (flag_upwd(iff)<=lev_files(iff)) THEN
     517       CALL histwrite_phy(nid_files(iff),"upwd",itau_w,upwd)
     518      ENDIF
     519      IF (flag_Ma(iff)<=lev_files(iff)) THEN
     520       CALL histwrite_phy(nid_files(iff),"Ma",itau_w,Ma)
     521      ENDIF
     522
     523      IF (flag_dnwd(iff)<=lev_files(iff)) THEN
     524       CALL histwrite_phy(nid_files(iff),"dnwd",itau_w,dnwd)
     525      ENDIF
     526
     527      IF (flag_dnwd0(iff)<=lev_files(iff)) THEN
     528       CALL histwrite_phy(nid_files(iff),"dnwd0",itau_w,dnwd0)
     529      ENDIF
     530!!! IM end
    512531      ENDIF !iflag_con .GE. 3
    513532
     
    616635      IF (type_ocean=='force ') THEN
    617636
    618       IF (iflag_con.GE.3) THEN
     637      IF (iflag_con.EQ.3) THEN
     638       IF (flag_ale(iff)<=lev_files(iff)) THEN
     639       CALL histwrite_phy(nid_files(iff),"ale",itau_w,ale)
     640       ENDIF
     641       IF (flag_alp(iff)<=lev_files(iff)) THEN
     642       CALL histwrite_phy(nid_files(iff),"alp",itau_w,alp)
     643       ENDIF
     644       IF (flag_cin(iff)<=lev_files(iff)) THEN
     645       CALL histwrite_phy(nid_files(iff),"cin",itau_w,cin)
     646       ENDIF
    619647      IF (iflag_coupl.EQ.1) THEN
    620648       IF (flag_ale_bl(iff)<=lev_files(iff)) THEN
     
    634662       ENDIF
    635663
    636        IF (flag_ale(iff)<=lev_files(iff)) THEN
    637        CALL histwrite_phy(nid_files(iff),"ale",itau_w,ale)
    638        ENDIF
    639        IF (flag_alp(iff)<=lev_files(iff)) THEN
    640        CALL histwrite_phy(nid_files(iff),"alp",itau_w,alp)
    641        ENDIF
    642        IF (flag_cin(iff)<=lev_files(iff)) THEN
    643        CALL histwrite_phy(nid_files(iff),"cin",itau_w,cin)
    644        ENDIF
    645664       IF (flag_wape(iff)<=lev_files(iff)) THEN
    646665       CALL histwrite_phy(nid_files(iff),"WAPE",itau_w,wake_pe)
     
    667686       CALL histwrite_phy(nid_files(iff),"wake_omg",itau_w,wake_omg)
    668687        ENDIF
    669       ENDIF
    670 
    671         IF (flag_Vprecip(iff)<=lev_files(iff)) THEN
    672        CALL histwrite_phy(nid_files(iff),"Vprecip",itau_w,Vprecip)
     688!!!IM beg
     689        IF (flag_dtwak(iff)<=lev_files(iff)) THEN
     690          zx_tmp_fi3d(1:klon,1:klev)=d_t_wake(1:klon,1:klev)
     691     &                                        /pdtphys
     692          CALL histwrite_phy(nid_files(iff),"dtwak",itau_w,zx_tmp_fi3d)
     693        ENDIF
     694
     695        IF (flag_dqwak(iff)<=lev_files(iff)) THEN
     696         zx_tmp_fi3d(1:klon,1:klev)=d_q_wake(1:klon,1:klev)/pdtphys
     697         CALL histwrite_phy(nid_files(iff),"dqwak",itau_w,zx_tmp_fi3d)
    673698        ENDIF
    674699
     
    680705       CALL histwrite_phy(nid_files(iff),"fqd",itau_w,fqd)
    681706        ENDIF
    682 
    683       ENDIF !(iflag_con.GE.3)
     707!!!IM end
     708      ENDIF
     709
     710       IF (flag_Vprecip(iff)<=lev_files(iff)) THEN
     711        CALL histwrite_phy(nid_files(iff),"Vprecip",itau_w,Vprecip)
     712       ENDIF
     713
     714      ENDIF !(iflag_con.EQ.3)
    684715 
    685716      ELSE IF (type_ocean=='slab  ') THEN
     
    759790      CALL histwrite_phy(nid_files(iff),"snowl",itau_w,snow_lsc)
    760791      ENDIF
    761 
    762       IF (iflag_con.GE.3) THEN
    763       IF (flag_cape_max(iff)<=lev_files(iff)) THEN
    764       CALL histwrite_phy(nid_files(iff),"cape_max",itau_w,cape)
    765       ENDIF
    766       ENDIF !(iflag_con.GE.3)
    767792
    768793      IF (flag_solldown(iff)<=lev_files(iff)) THEN
     
    854879      CALL histwrite_phy(nid_files(iff),"ozone",itau_w,zx_tmp_fi3d)
    855880      ENDIF
    856 
    857       IF(iflag_con.GE.3) THEN
    858        IF (flag_upwd(iff)<=lev_files(iff)) THEN
    859       CALL histwrite_phy(nid_files(iff),"upwd",itau_w,upwd)
    860        ENDIF
    861       ENDIF !(iflag_con.GE.3)
    862881
    863882       IF (flag_dtphy(iff)<=lev_files(iff)) THEN
     
    933952       ENDIF
    934953
    935       IF(iflag_con.GE.3) THEN
    936        IF (flag_Ma(iff)<=lev_files(iff)) THEN
    937       CALL histwrite_phy(nid_files(iff),"Ma",itau_w,Ma)
    938        ENDIF
    939 
    940        IF (flag_dnwd(iff)<=lev_files(iff)) THEN
    941       CALL histwrite_phy(nid_files(iff),"dnwd",itau_w,dnwd)
    942        ENDIF
    943 
    944        IF (flag_dnwd0(iff)<=lev_files(iff)) THEN
    945       CALL histwrite_phy(nid_files(iff),"dnwd0",itau_w,dnwd0)
    946        ENDIF
    947       ENDIF !(iflag_con.GE.3)
    948 
    949954       IF (flag_dtdyn(iff)<=lev_files(iff)) THEN
    950955      CALL histwrite_phy(nid_files(iff),"dtdyn",itau_w,d_t_dyn)
     
    977982      CALL histwrite_phy(nid_files(iff),"dqcon",itau_w,zx_tmp_fi3d)
    978983       ENDIF
    979 
    980       IF(iflag_con.GE.3) THEN
    981        IF (iflag_wake == 1) THEN
    982          IF (flag_dtwak(iff)<=lev_files(iff)) THEN
    983            zx_tmp_fi3d(1:klon,1:klev)=d_t_wake(1:klon,1:klev)           &
    984      &                                        /pdtphys
    985            CALL histwrite_phy(nid_files(iff),"dtwak",itau_w,zx_tmp_fi3d)
    986          ENDIF
    987 
    988         IF (flag_dqwak(iff)<=lev_files(iff)) THEN
    989         zx_tmp_fi3d(1:klon,1:klev)=d_q_wake(1:klon,1:klev)/pdtphys
    990         CALL histwrite_phy(nid_files(iff),"dqwak",itau_w,zx_tmp_fi3d)
    991         ENDIF
    992        ENDIF
    993       ENDIF !(iflag_con.GE.3)
    994984
    995985       IF (flag_dtlsc(iff)<=lev_files(iff)) THEN
Note: See TracChangeset for help on using the changeset viewer.