Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/thermcell_plume.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/thermcell_plume.F90 (modified) (10 diffs)

LMDZ5/branches/testing/libf/phylmd/thermcell_plume.F90

@@ -13 +13 @@
 USE IOIPSL, ONLY : getin
 
+       USE print_control_mod, ONLY: prt_level
        IMPLICIT NONE
 
@@ -18 +19 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"
 
@@ -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_omp)
 !    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)
 
 !------------------------------------------------------------------------------
@@ -811 +793 @@
 !--------------------------------------------------------------------------
 
+      USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
 
@@ -816 +799 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"