--- trunk/phylmd/physiq.f90 2019/09/26 17:08:42 339 +++ trunk/phylmd/physiq.f90 2019/09/26 17:29:50 340 @@ -19,7 +19,7 @@ use ajsec_m, only: ajsec use calltherm_m, only: calltherm USE clesphys, ONLY: cdhmax, cdmmax, ecrit_ins, ok_instan - USE clesphys2, ONLY: conv_emanuel, nbapp_rad, new_oliq, ok_orodr, ok_orolf + USE clesphys2, ONLY: conv_emanuel, nbapp_rad, ok_orodr, ok_orolf USE conf_interface_m, ONLY: conf_interface USE pbl_surface_m, ONLY: pbl_surface use clouds_gno_m, only: clouds_gno @@ -103,9 +103,6 @@ LOGICAL:: firstcal = .true. - LOGICAL, PARAMETER:: ok_stratus = .FALSE. - ! Ajouter artificiellement les stratus - ! pour phystoke avec thermiques REAL fm_therm(klon, llm + 1) REAL entr_therm(klon, llm) @@ -727,7 +724,6 @@ q_seri(i, k) = q_seri(i, k) + d_q_lsc(i, k) ql_seri(i, k) = ql_seri(i, k) + d_ql_lsc(i, k) cldfra(i, k) = rneb(i, k) - IF (.NOT. new_oliq) cldliq(i, k) = ql_seri(i, k) ENDDO ENDDO @@ -784,20 +780,6 @@ cldliq = cldliq + rnebcon * clwcon ENDIF - ! 2. Nuages stratiformes - - IF (ok_stratus) THEN - CALL diagcld2(paprs, play, t_seri, q_seri, diafra, dialiq) - DO k = 1, llm - DO i = 1, klon - IF (diafra(i, k) > cldfra(i, k)) THEN - cldliq(i, k) = dialiq(i, k) - cldfra(i, k) = diafra(i, k) - ENDIF - ENDDO - ENDDO - ENDIF - ! Precipitation totale DO i = 1, klon rain_fall(i) = rain_con(i) + rain_lsc(i)