Changeset 4009 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Nov 17, 2021, 11:23:39 PM (4 years ago)

Author:

evignon

Message:

! Prise en compte de l'orographie sous maille, des heterogeneites de surface
! sur le ratqs + nouvelle version des ratqs interactifs de Louis
! Le tout est dan un module: calcratqs_multi_mod.
! Pour l'instant, les nouvelles contributions peuvent s'activer
! uniquement de facon separee

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• calcratqs_multi_mod.F90 (added)
• phys_local_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -16 +16 @@
       REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
       !$OMP THREADPRIVATE(u_seri, v_seri)
-      REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:), l_mix(:,:,:), tke_dissip(:,:,:)
-      !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip)
+      REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:), l_mix(:,:,:), tke_dissip(:,:,:), wprime(:,:,:)
+      !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip, wprime)
       REAL, SAVE, ALLOCATABLE :: tr_seri(:,:,:)
       !$OMP THREADPRIVATE(tr_seri)
@@ -693 +693 @@
       ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev))
       ALLOCATE(u_seri(klon,klev),v_seri(klon,klev))
-      ALLOCATE(l_mixmin(klon,klev+1,nbsrf), l_mix(klon,klev+1,nbsrf), tke_dissip(klon,klev+1,nbsrf))
-      l_mix(:,:,:)=0. ; l_mixmin(:,:,:)=0. ; tke_dissip(:,:,:)=0. ! doit etre initialse car pas toujours remplis
+      ALLOCATE(l_mixmin(klon,klev+1,nbsrf), l_mix(klon,klev+1,nbsrf), tke_dissip(klon,klev+1,nbsrf), wprime(klon,klev+1,nbsrf))
+      l_mix(:,:,:)=0. ; l_mixmin(:,:,:)=0. ; tke_dissip(:,:,:)=0. ; wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis
 
       ALLOCATE(tr_seri(klon,klev,nbtr))
@@ -1090 +1090 @@
       DEALLOCATE(t_seri,q_seri,ql_seri,qs_seri)
       DEALLOCATE(u_seri,v_seri)
-      DEALLOCATE(l_mixmin,l_mix, tke_dissip)
+      DEALLOCATE(l_mixmin,l_mix, tke_dissip, wprime)
 
       DEALLOCATE(tr_seri)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -264 +264 @@
        d_t_vdf_x, d_t_vdf_w, &
        d_q_vdf_x, d_q_vdf_w, &
-       pbl_tke_input, &
+       pbl_tke_input, tke_dissip, l_mix, wprime, &
        t_therm, q_therm, u_therm, v_therm, &
        cdragh_x, cdragh_w, &
@@ -1288 +1288 @@
     integer iostat
 
+    REAL, dimension(klon,klev+1) :: tke_dissip_ave, l_mix_ave, wprime_ave
     REAL zzz
     !albedo SB >>>
@@ -4468 +4469 @@
     ! Computation of ratqs, the width (normalized) of the subrid scale 
     ! water distribution
-    CALL  calcratqs(klon,klev,prt_level,lunout,        &
+
+    tke_dissip_ave(:,:)=0.
+    l_mix_ave(:,:)=0.
+    wprime_ave(:,:)=0.
+
+    DO nsrf = 1, nbsrf
+       DO i = 1, klon
+          tke_dissip_ave(i,:) = tke_dissip_ave(i,:) + tke_dissip(i,:,nsrf)*pctsrf(i,nsrf)
+          l_mix_ave(i,:) = l_mix_ave(i,:) + l_mix(i,:,nsrf)*pctsrf(i,nsrf)
+          wprime_ave(i,:) = wprime_ave(i,:) + wprime(i,:,nsrf)*pctsrf(i,nsrf)
+       ENDDO
+    ENDDO
+
+   CALL  calcratqs(klon,klev,prt_level,lunout,        &
          iflag_ratqs,iflag_con,iflag_cld_th,pdtphys,  &
          ratqsbas,ratqshaut,ratqsp0, ratqsdp, &
          tau_ratqs,fact_cldcon,wake_s, wake_deltaq,   &
          ptconv,ptconvth,clwcon0th, rnebcon0th,     &
-         paprs,pplay,q_seri,zqsat,fm_therm, &
+         paprs,pplay,t_seri,q_seri, qtc_cv, sigt_cv, zqsat, &
+         pbl_tke(:,:,is_ave),tke_dissip_ave,l_mix_ave,wprime_ave,t2m,q2m,fm_therm, &
          ratqs,ratqsc,ratqs_inter)
+
 
     !