Changeset 2406

Timestamp:

Dec 10, 2015, 6:55:45 PM (8 years ago)

Author:

fhourdin

Message:

Small corrections

Location:

LMDZ5/trunk/libf/phylmd

Files:

• thermcell_alim.F90 (modified) (4 diffs)
• thermcell_plume.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/thermcell_alim.F90

@@ -39 +39 @@
    lalim(:)=1
    alim_star_tot(:)=0.
-
-   IF (ngrid==1) PRINT*,'NEW ALIM flag=',flag
 
 !-------------------------------------------------------------------------
@@ -84 +82 @@
       enddo
 
-      do l=1,klev-1
+      do l=klev-1,1,-1
          do ig=1,ngrid
             ztv_parcel=ztv(ig,1)+d_temp(ig)
-            if (ztv_parcel<ztv(ig,l+1) .and. lalim(ig)==1 ) THEN
-                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))
-                IF (zi(ig)<0.) STOP
-            endif
+            if (ztv_parcel<ztv(ig,l+1)) lalim(ig)=l
          enddo
       enddo
+
+      do ig=1,ngrid
+         l=lalim(ig)
+         IF (l==1) THEN
+            zi(ig)=0.
+         ELSE
+            ztv_parcel=ztv(ig,1)+d_temp(ig)
+            zi(ig)=zlay(ig,l)+(zlay(ig,l+1)-zlay(ig,l))/(ztv(ig,l+1)-ztv(ig,l))*(ztv_parcel-ztv(ig,l))
+         ENDIF
+      enddo
+
       zh(:)=zi(:)/2.
       alim_star_tot(:)=0.
@@ -100 +105 @@
       do l=1,klev-1
          do ig=1,ngrid
-            if (zlev(ig,l+1)<=zh(ig)) THEN
+            IF (zh(ig)==0.) THEN
+               alim_star(ig,l)=0.
+               lalim(ig)=1
+            ELSE IF (zlev(ig,l+1)<=zh(ig)) THEN
                alim_star(ig,l)=(falim(zh(ig),zlev(ig,l+1))-falim(zh(ig),zlev(ig,l)))/falim(zh(ig),zh(ig))
                lalim(ig)=l
@@ -112 +120 @@
          alim_star_tot(:)=alim_star_tot(:)+alim_star(:,l)
       ENDDO
-      IF (ngrid==1) print*,'NEW ALIM CALCUL DE ZI ',alim_star_tot
+      IF (ngrid==1) print*,'NEW ALIM CALCUL DE ZI ',alim_star_tot,lalim,zi,zh
       alim_star_tot(:)=1.
 

LMDZ5/trunk/libf/phylmd/thermcell_plume.F90

@@ -106 +106 @@
       REAL,SAVE :: mix0,mix0_omp=0.
       INTEGER,SAVE :: thermals_flag_alim,thermals_flag_alim_omp=0
+
+!$OMP THREADPRIVATE(fact_epsilon, betalpha, afact, fact_shell)
+!$OMP THREADPRIVATE(detr_min, entr_min, detr_q_coef, detr_q_power)
+!$OMP THREADPRIVATE( mix0, thermals_flag_alim)
 
       LOGICAL, SAVE :: first=.true.
@@ -144 +148 @@
      mix0=mix0_omp
      thermals_flag_alim=thermals_flag_alim_omp
+
       first=.false.
       ENDIF