Changeset 2392

Timestamp:

Nov 11, 2015, 7:42:11 PM (9 years ago)

Author:

fhourdin

Message:

Retour a 1+1=2. Probleme dans thermcell_alim.
Bug fixing

Location:

LMDZ5/trunk/libf/phylmd

Files:

• thermcell_alim.F90 (modified) (3 diffs)
• thermcell_plume.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/thermcell_alim.F90

@@ -32 +32 @@
 
       REAL h,z,falim
-      falim(h,z)=z*z*(h/2.-z/3.)
+      falim(h,z)=0.2*((z-h)**5+h**5)
+
 
 !===================================================================
 
+   lalim(:)=1
+   alim_star_tot(:)=0.
 
-   DO ig=1,ngrid
-      lalim(ig)=1
-   ENDDO
+   IF (ngrid==1) PRINT*,'NEW ALIM flag=',flag
 
 !-------------------------------------------------------------------------
@@ -89 +90 @@
                 lalim(ig)=l
                 zi(ig)=zlay(ig,l)+(zlay(ig,l+1)-zlay(ig,l))/(ztv(ig,l+1)-ztv(ig,l))*(ztv_parcel-ztv(ig,l))
-                print*,'NEW ALIM CALCUL DE ZI ',zlay(ig,l),zi(ig),zlay(ig,l+1)
                 IF (zi(ig)<0.) STOP
             endif
          enddo
       enddo
-      zh(:)=zi(:)/5.
-
-! Coputing lateral entrainment
+      zh(:)=zi(:)/2.
       alim_star_tot(:)=0.
       alim_star(:,:)=0.
@@ -114 +112 @@
          alim_star_tot(:)=alim_star_tot(:)+alim_star(:,l)
       ENDDO
-      print*,'NEW ALIM CALCUL DE ZI ',alim_star_tot
+      IF (ngrid==1) print*,'NEW ALIM CALCUL DE ZI ',alim_star_tot
       alim_star_tot(:)=1.
 

LMDZ5/trunk/libf/phylmd/thermcell_plume.F90

@@ -129 +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_flag_alim',thermals_flag_alim_omp)
 !    CALL getin('thermals_X',X_omp)
 !    X=X_omp