Changeset 4830 for LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90

Timestamp:

Feb 22, 2024, 5:29:02 PM (3 months ago)

Author:

evignon

Message:

changements suite à l'atelier nuage d'aujourd'hui.

File:

• LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_lscp.F90

@@ -15 +15 @@
      ztv, zpspsk, ztla, zthl, iflag_cld_th,             &
      iflag_ice_thermo, ok_ice_sursat, qsatl, qsats,     &
-     distcltop,temp_cltop,                               &
+     distcltop,temp_cltop,                              &
      qclr, qcld, qss, qvc, rnebclr, rnebss, gamma_ss,   &
      Tcontr, qcontr, qcontr2, fcontrN, fcontrP,         &
      cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv, &
-     qrain, qsnow, dqreva, dqssub, dqrauto, dqrcol,     &
-     dqrmelt, dqrfreez, dqsauto, dqsagg, dqsrim,        &
+     qraindiag, qsnowdiag, dqreva, dqssub, dqrauto,     &
+     dqrcol, dqrmelt, dqrfreez, dqsauto, dqsagg, dqsrim,&
      dqsmelt, dqsfreez)
 
@@ -106 +106 @@
 USE lmdz_lscp_ini, ONLY : iflag_mpc_bl, ok_radocond_snow, a_tr_sca, cld_expo_con, cld_expo_lsc
 USE lmdz_lscp_ini, ONLY : iflag_cloudth_vert, iflag_rain_incloud_vol, iflag_t_glace, t_glace_min 
-USE lmdz_lscp_ini, ONLY : coef_eva, coef_eva_i,cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
+USE lmdz_lscp_ini, ONLY : coef_eva, coef_sub,cld_tau_lsc, cld_tau_con, cld_lc_lsc, cld_lc_con
 USE lmdz_lscp_ini, ONLY : iflag_bergeron, iflag_fisrtilp_qsat, iflag_vice, cice_velo, dice_velo
 USE lmdz_lscp_ini, ONLY : iflag_autoconversion, ffallv_con, ffallv_lsc
@@ -204 +204 @@
   ! for POPRECIP
 
-  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: qrain          !--specific rain content [kg/kg]
-  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: qsnow          !--specific snow content [kg/kg]
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: qraindiag      !--DIAGNOSTIC specific rain content [kg/kg]
+  REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: qsnowdiag      !--DIAGNOSTIC specific snow content [kg/kg]
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: dqreva         !--rain tendendy due to evaporation [kg/kg/s]
   REAL, DIMENSION(klon,klev),      INTENT(OUT)  :: dqssub         !--snow tendency due to sublimation [kg/kg/s]
@@ -374 +374 @@
 temp_cltop(:,:)=0.
 !-- poprecip
-qrain(:,:)    = 0.
-qsnow(:,:)    = 0.
+qraindiag(:,:)= 0.
+qsnowdiag(:,:)= 0.
 dqreva(:,:)   = 0.
 dqrauto(:,:)  = 0.
@@ -547 +547 @@
                 ! sublimation of the solid precipitation coming from above
                 IF (iflag_evap_prec.EQ.3) THEN
-                    zqevti = znebprecip(i)*coef_eva_i*(1.0-zq(i)/qsi(i)) &
+                    zqevti = znebprecip(i)*coef_sub*(1.0-zq(i)/qsi(i)) &
                     *SQRT(zifl(i)/max(1.e-4,znebprecip(i))) &
                     *(paprs(i,k)-paprs(i,k+1))/pplay(i,k)*zt(i)*RD/RG
                 ELSE IF (iflag_evap_prec.GE.4) THEN
-                     zqevti = znebprecipclr(i)*coef_eva_i*(1.0-zq(i)/qsi(i)) &
+                     zqevti = znebprecipclr(i)*coef_sub*(1.0-zq(i)/qsi(i)) &
                     *SQRT(zifl(i)/max(1.e-8,znebprecipclr(i))) &
                     *(paprs(i,k)-paprs(i,k+1))/pplay(i,k)*zt(i)*RD/RG
                 ELSE
-                    zqevti = 1.*coef_eva_i*(1.0-zq(i)/qsi(i))*SQRT(zifl(i)) &
+                    zqevti = 1.*coef_sub*(1.0-zq(i)/qsi(i))*SQRT(zifl(i)) &
                     *(paprs(i,k)-paprs(i,k+1))/pplay(i,k)*zt(i)*RD/RG
                 ENDIF
@@ -997 +997 @@
                             zrfl, zrflclr, zrflcld, &
                             zifl, ziflclr, ziflcld, &
-                            qrain(:,k), qsnow(:,k), dqrauto(:,k), &
+                            qraindiag(:,k), qsnowdiag(:,k), dqrauto(:,k), &
                             dqrcol(:,k), dqrmelt(:,k), dqrfreez(:,k), &
                             dqsauto(:,k), dqsagg(:,k), dqsrim(:,k), &
@@ -1015 +1015 @@
            radocond(i,k) = zoliq(i)
            radocondl(i,k)= radocond(i,k)*(1.-zfice(i))
-           radocondi(i,k)= radocond(i,k)*zfice(i)+qsnow(i,k)
+           radocondi(i,k)= radocond(i,k)*zfice(i)+qsnowdiag(i,k)
         ELSE
            radocond(i,k) = zoliq(i)