Changeset 2387

Timestamp:

Nov 7, 2015, 10:27:40 AM (9 years ago)

Author:

fhourdin

Message:

Poursuite du travail sur les thermiques.
Extraction d'une routine calculant l'alimentation laterale à la base.
+ une correction de Jean-Yves sur des initialisations maquantes dans
thermcell_main (mais qui sont maintenant dans thermcell_alp).

Location:

LMDZ5/trunk/libf/phylmd

Files:

• thermcell_alp.F90 (modified) (1 diff)
• thermcell_main.F90 (modified) (1 diff)
• thermcell_plume.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/thermcell_alp.F90

@@ -156 +156 @@
 
 
+!------------------------------------------------------------
+!  Initialize output arrays related to stochastic triggering
+!------------------------------------------------------------
+  DO ig = 1,klon
+     zlcl(ig) = 0.
+     fraca0(ig) = 0.
+     w0(ig) = 0.
+     w_conv(ig) = 0.
+     therm_tke_max0(ig) = 0.
+     env_tke_max0(ig) = 0.
+     n2(ig) = 0.
+     s2(ig) = 0.
+     ale_bl_stat(ig) = 0.
+     alp_bl_det(ig) = 0.
+     alp_bl_fluct_m(ig) = 0.
+     alp_bl_fluct_tke(ig) = 0.
+     alp_bl_conv(ig) = 0.
+     alp_bl_stat(ig) = 0.
+  ENDDO
+  DO l = 1,klev
+    DO ig = 1,klon
+     therm_tke_max(ig,l) = 0.
+     env_tke_max(ig,l) = 0.
+    ENDDO
+  ENDDO
+!------------------------------------------------------------
+
+
 !------------Test sur le LCL des thermiques
     do ig=1,ngrid

LMDZ5/trunk/libf/phylmd/thermcell_main.F90

@@ -749 +749 @@
 ! $Id$
 !
-      print*,'THERM_ALP sorti'
       CALL thermcell_alp(ngrid,nlay,ptimestep  &
      &                  ,pplay,pplev  &

LMDZ5/trunk/libf/phylmd/thermcell_plume.F90

@@ -82 +82 @@
       real zbuoyjam(ngrid,klev),zdqtjam(ngrid,klev)
       real zbuoybis,zdz2,zdz3,lmel,entrbis,zdzbis
+      real d_temp(ngrid)
       real ztv1,ztv2,factinv,zinv,zlmel
       real zlmelup,zlmeldwn,zlt,zltdwn,zltup
@@ -104 +105 @@
       REAL,SAVE :: detr_q_power,detr_q_power_omp=0.5
       REAL,SAVE :: mix0,mix0_omp=0.
+      INTEGER,SAVE :: thermals_flag_alim,thermals_flag_alim_omp=0
 
       LOGICAL, SAVE :: first=.true.
@@ -127 +129 @@
      CALL getin('thermals_detr_q_power',detr_q_power_omp)
      CALL getin('thermals_mix0',mix0_omp)
+     CALL getin('thermals_flag_alim',thermals_flag_alim)
 !    CALL getin('thermals_X',X_omp)
 !    X=X_omp
@@ -140 +143 @@
      detr_q_power=detr_q_power_omp
      mix0=mix0_omp
+     thermals_flag_alim=thermals_flag_alim_omp
       first=.false.
       ENDIF
@@ -188 +192 @@
       lmix_bis(:)=2
       wmaxa(:)=0.
-      lalim(:)=1
 
 
@@ -195 +198 @@
 ! couches sont instables.
 !-------------------------------------------------------------------------
+
       active(:)=ztv(:,1)>ztv(:,2)
-
-!-------------------------------------------------------------------------
-! Definition de l'alimentation a l'origine dans thermcell_init
-!-------------------------------------------------------------------------
-      do l=1,klev-1
-         do ig=1,ngrid
-            if (ztv(ig,l)> ztv(ig,l+1) .and. ztv(ig,1)>=ztv(ig,l) ) then
-               alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.)  &
-     &                       *sqrt(zlev(ig,l+1)) 
-               lalim(ig)=l+1
-               alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
-!               print*,'alim2',l,ztv(ig,l),ztv(ig,l+1),alim_star(ig,l)
-            endif
-         enddo
-      enddo
-      do l=1,klev
-         do ig=1,ngrid 
-            if (alim_star_tot(ig) > 1.e-10 ) then
-               alim_star(ig,l)=alim_star(ig,l)/alim_star_tot(ig)
-            endif
-         enddo
-      enddo
-      alim_star_tot(:)=1.
-
-
-
+      d_temp(:)=0. ! Pour activer un contraste de temperature a la base
+                   ! du panache
+!  Cet appel pourrait être fait avant thermcell_plume dans thermcell_main
+      CALL thermcell_alim(thermals_flag_alim,ngrid,klev,ztv,d_temp,zlev,alim_star,lalim)
 
 !------------------------------------------------------------------------------