Changeset 1648 for LMDZ5/trunk


Ignore:
Timestamp:
Aug 9, 2012, 12:50:09 PM (12 years ago)
Author:
Ehouarn Millour
Message:

Bug correction: outputs (introduced in rev 1638) related to the stochastic triggering of convection should only be done if the later is used.
JYG

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

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

    r1641 r1648  
    265265!!! nrlmd le 10/04/2012
    266266
    267 !-------Propriétés du thermiques au LCL
    268   type(ctrl_out),save :: o_zlcl_th        = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'zlcl_th')
    269   type(ctrl_out),save :: o_fraca0         = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'fraca0')
    270   type(ctrl_out),save :: o_w0             = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'w0')
    271   type(ctrl_out),save :: o_w_conv         = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'w_conv')
    272   type(ctrl_out),save :: o_therm_tke_max0 = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'therm_tke_max0')
    273   type(ctrl_out),save :: o_env_tke_max0   = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'env_tke_max0')
    274 
    275267!-------Spectre de thermiques de type 2 au LCL
    276268  type(ctrl_out),save :: o_n2                = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'n2')
    … …  
    282274  type(ctrl_out),save :: o_ale_bl_stat       = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'ale_bl_stat')
    283275  type(ctrl_out),save :: o_ale_bl_trig       = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'ale_bl_trig')
    284                                                                              
    285 !-------Profils de TKE dans et hors du thermique                             
    286   type(ctrl_out),save :: o_therm_tke_max     = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'therm_tke_max')
    287   type(ctrl_out),save :: o_env_tke_max       = ctrl_out((/ 1, 1, 1, 6, 10, 10 /),'env_tke_max')
    288276
    289277!-------Fermeture statistique
    … …  
    15561544!!! nrlmd le 10/04/2012
    15571545
    1558  CALL histdef2d(iff,clef_stations(iff),o_zlcl_th%flag,o_zlcl_th%name, "Altitude du LCL", "m")
    1559  CALL histdef2d(iff,clef_stations(iff),o_fraca0%flag,o_fraca0%name, "Fraction de Thermique au LCL", "")
    1560  CALL histdef2d(iff,clef_stations(iff),o_w0%flag,o_w0%name, "Vitesse thermique au LCL", "m/s")
    1561  CALL histdef2d(iff,clef_stations(iff),o_w_conv%flag,o_w_conv%name, "Vitesse verticale grande échelle au LCL", "m/s")
    1562  CALL histdef2d(iff,clef_stations(iff),o_therm_tke_max0%flag,o_therm_tke_max0%name, "TKE thermique au LCL", "m2/s2")
    1563  CALL histdef2d(iff,clef_stations(iff),o_env_tke_max0%flag,o_env_tke_max0%name, "TKE environnement au LCL", "m2/s2")
    1564 
     1546        IF (iflag_trig_bl>=1) THEN
    15651547 CALL histdef2d(iff,clef_stations(iff),o_n2%flag,o_n2%name, "Nombre de panaches de type 2", " ")
    15661548 CALL histdef2d(iff,clef_stations(iff),o_s2%flag,o_s2%name, "Surface moyenne des panaches de type 2", "m2")
    … …  
    15701552 CALL histdef2d(iff,clef_stations(iff),o_ale_bl_trig%flag,o_ale_bl_trig%name, "ALE_BL_STAT + Condition P>Pseuil", "m2/s2")
    15711553 CALL histdef2d(iff,clef_stations(iff),o_ale_bl_stat%flag,o_ale_bl_stat%name, "ALE_BL_STAT", "m2/s2")
    1572 
    1573  CALL histdef3d(iff,clef_stations(iff),o_therm_tke_max%flag,o_therm_tke_max%name, "TKE thermique", "m2/s2")
    1574  CALL histdef3d(iff,clef_stations(iff),o_env_tke_max%flag,o_env_tke_max%name, "TKE environnement", "m2/s2")
     1554       ENDIF  !(iflag_trig_bl>=1)
     1555
     1556        IF (iflag_clos_bl>=1) THEN
    15751557 CALL histdef2d(iff,clef_stations(iff),o_alp_bl_det%flag,o_alp_bl_det%name, "ALP_BL_DET", "W/m2")
    15761558 CALL histdef2d(iff,clef_stations(iff),o_alp_bl_fluct_m%flag,o_alp_bl_fluct_m%name, "ALP_BL_FLUCT_M", "W/m2")
    … …  
    15781560 CALL histdef2d(iff,clef_stations(iff),o_alp_bl_conv%flag,o_alp_bl_conv%name, "ALP_BL_CONV", "W/m2")
    15791561 CALL histdef2d(iff,clef_stations(iff),o_alp_bl_stat%flag,o_alp_bl_stat%name, "ALP_BL_STAT", "W/m2")
     1562       ENDIF  !(iflag_clos_bl>=1)
    15801563
    15811564!!! fin nrlmd le 10/04/2012

  • LMDZ5/trunk/libf/phylmd/phys_output_write.h

    r1646 r1648  
    901901!!! nrlmd le 10/04/2012
    902902
    903         IF (o_zlcl_th%flag(iff)<=lev_files(iff)) THEN
    904         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    905      s                     o_zlcl_th%name,itau_w,zlcl_th)
    906         ENDIF
    907 
    908         IF (o_fraca0%flag(iff)<=lev_files(iff)) THEN
    909         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    910      s                     o_fraca0%name,itau_w,fraca0)
    911         ENDIF
    912 
    913         IF (o_w0%flag(iff)<=lev_files(iff)) THEN
    914         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    915      s                     o_w0%name,itau_w,w0)
    916         ENDIF
    917 
    918         IF (o_w_conv%flag(iff)<=lev_files(iff)) THEN
    919         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    920      s                     o_w_conv%name,itau_w,w_conv)
    921         ENDIF
    922 
    923         IF (o_therm_tke_max0%flag(iff)<=lev_files(iff)) THEN
    924         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    925      s                     o_therm_tke_max0%name,itau_w,therm_tke_max0)
    926         ENDIF
    927 
    928         IF (o_env_tke_max0%flag(iff)<=lev_files(iff)) THEN
    929         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    930      s                     o_env_tke_max0%name,itau_w,env_tke_max0)
    931         ENDIF
    932 
    933         IF (o_n2%flag(iff)<=lev_files(iff)) THEN
    934       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     903        IF (iflag_trig_bl>=1) THEN
     904          IF (o_n2%flag(iff)<=lev_files(iff)) THEN
     905        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    935906     s                     o_n2%name,itau_w,n2)
    936        ENDIF
    937 
    938        IF (o_s2%flag(iff)<=lev_files(iff)) THEN
    939       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     907         ENDIF
     908
     909         IF (o_s2%flag(iff)<=lev_files(iff)) THEN
     910        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    940911     s                     o_s2%name,itau_w,s2)
    941        ENDIF
    942 
    943         IF (o_proba_notrig%flag(iff)<=lev_files(iff)) THEN
    944       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     912         ENDIF
     913
     914          IF (o_proba_notrig%flag(iff)<=lev_files(iff)) THEN
     915        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    945916     s                     o_proba_notrig%name,itau_w,proba_notrig)
    946        ENDIF
    947 
    948        IF (o_random_notrig%flag(iff)<=lev_files(iff)) THEN
    949       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     917         ENDIF
     918
     919         IF (o_random_notrig%flag(iff)<=lev_files(iff)) THEN
     920        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    950921     s                     o_random_notrig%name,itau_w,random_notrig)
    951        ENDIF
    952 
    953        IF (o_ale_bl_stat%flag(iff)<=lev_files(iff)) THEN
    954       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     922         ENDIF
     923
     924         IF (o_ale_bl_stat%flag(iff)<=lev_files(iff)) THEN
     925        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    955926     s                     o_ale_bl_stat%name,itau_w,ale_bl_stat)
    956        ENDIF
    957 
    958        IF (o_ale_bl_trig%flag(iff)<=lev_files(iff)) THEN
    959       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     927         ENDIF
     928
     929         IF (o_ale_bl_trig%flag(iff)<=lev_files(iff)) THEN
     930        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    960931     s                     o_ale_bl_trig%name,itau_w,ale_bl_trig)
    961        ENDIF
    962 
    963        IF (o_therm_tke_max%flag(iff)<=lev_files(iff)) THEN
    964         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    965      s                     o_therm_tke_max%name,itau_w,therm_tke_max)
    966         ENDIF
    967 
    968         IF (o_env_tke_max%flag(iff)<=lev_files(iff)) THEN
    969         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    970      s                     o_env_tke_max%name,itau_w,env_tke_max)
    971         ENDIF
    972 
    973        IF (o_alp_bl_det%flag(iff)<=lev_files(iff)) THEN
    974       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     932         ENDIF
     933       ENDIF  !(iflag_trig_bl>=1)
     934
     935        IF (iflag_clos_bl>=1) THEN
     936         IF (o_alp_bl_det%flag(iff)<=lev_files(iff)) THEN
     937        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    975938     s                     o_alp_bl_det%name,itau_w,alp_bl_det)
    976        ENDIF
    977 
    978        IF (o_alp_bl_fluct_m%flag(iff)<=lev_files(iff)) THEN
    979       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     939         ENDIF
     940
     941         IF (o_alp_bl_fluct_m%flag(iff)<=lev_files(iff)) THEN
     942        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    980943     s                     o_alp_bl_fluct_m%name,itau_w,alp_bl_fluct_m)
    981        ENDIF
    982 
    983        IF (o_alp_bl_fluct_tke%flag(iff)<=lev_files(iff)) THEN
    984       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     944         ENDIF
     945
     946         IF (o_alp_bl_fluct_tke%flag(iff)<=lev_files(iff)) THEN
     947        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    985948     s                o_alp_bl_fluct_tke%name,itau_w,alp_bl_fluct_tke)
    986        ENDIF
    987 
    988        IF (o_alp_bl_conv%flag(iff)<=lev_files(iff)) THEN
    989       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     949         ENDIF
     950
     951         IF (o_alp_bl_conv%flag(iff)<=lev_files(iff)) THEN
     952        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    990953     s                     o_alp_bl_conv%name,itau_w,alp_bl_conv)
    991        ENDIF
    992 
    993        IF (o_alp_bl_stat%flag(iff)<=lev_files(iff)) THEN
    994       CALL histwrite_phy(nid_files(iff),clef_stations(iff),
     954         ENDIF
     955
     956         IF (o_alp_bl_stat%flag(iff)<=lev_files(iff)) THEN
     957        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
    995958     s                     o_alp_bl_stat%name,itau_w,alp_bl_stat)
    996        ENDIF
     959         ENDIF
     960       ENDIF  !(iflag_clos_bl>=1)
    997961
    998962!!! fin nrlmd le 10/04/2012
Note: See TracChangeset for help on using the changeset viewer.