Changeset 2229

Timestamp:

Jan 29, 2020, 6:28:42 PM (5 years ago)

Author:

aboissinot

Message:

A bug in thermcell_dq is fixed. Now zqt is correctly initialized when tracer h2o_vap
is missing (consistency with flag water is assumed).

Useless arguments in thermcell_dq subroutine are removed (lmin, lmax)

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (2 diffs)
• libf/phystd/thermcell_dq.F90 (modified) (5 diffs)
• libf/phystd/thermcell_main.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/README

@@ -1469 +1469 @@
 - some fixes for the slab ocean. Still need to make it work in parallel.
 
-== 26/02/2019 == AB
+== 26/03/2019 == AB
 - new formulae to compute vertical speed in thermcell_plume
 - fix an inconsistency in zdttherm and zdqtherm computation according to water key value in physiq_mod
@@ -1499 +1499 @@
 - Cleanup thermal plums model subroutines (thermcell_main, thermcell_env, thercell_dq, thermcell_dv2, thermcell_closure, thermcell_height)
 - In thermcell_plume, restore initial formula to compute the vertical speed and cleanup the file
+
+== 29/01/2019 == AB
+- fix a bug in thermcell_dq. Now zqt is correctly initialized when tracer h2o_vap is missing (consistency with flag water is assumed).

trunk/LMDZ.GENERIC/libf/phystd/thermcell_dq.F90

@@ -3 +3 @@
 !
 SUBROUTINE thermcell_dq(ngrid,nlay,ptimestep,fm,entr,detr,masse,              &
-                        q,dq,qa,lmin,lmax)
+                        q,dq,qa)
       
       
@@ -22 +22 @@
       
       USE print_control_mod, ONLY: prt_level
-      USe thermcell_mod, ONLY: dqimpl
+      USE thermcell_mod, ONLY: dqimpl
       
       IMPLICIT NONE
@@ -36 +36 @@
       INTEGER, INTENT(in) :: ngrid
       INTEGER, INTENT(in) :: nlay
-      INTEGER, INTENT(in) :: lmin(ngrid)
-      INTEGER, INTENT(in) :: lmax(ngrid)
       
       REAL, INTENT(in) :: ptimestep
@@ -87 +85 @@
                print *, 'ERROR: entrainment is greater than the layer mass!'
                print *, 'ig,l,entr', ig, l, entr(ig,l)
-               print *, 'lmin,lmax', lmin(ig), lmax(ig)
                print *, '-------------------------------'
                print *, 'entr*dt,mass', entr(ig,l)*ptimestep, masse(ig,l)
@@ -107 +104 @@
       
       DO ig=1,ngrid
-         DO l=1,lmin(ig)
-            qa(ig,l) = q(ig,l)
-         ENDDO
-      ENDDO
-      
-      DO ig=1,ngrid
-         DO l=lmin(ig)+1,nlay
-            IF ((fm(ig,l+1)+detr(ig,l))*ptimestep.gt.1.e-6*masse(ig,l)) THEN
+         DO l=1,nlay
+            IF ((fm(ig,l+1)+detr(ig,l))*ptimestep > 1.e-6*masse(ig,l)) THEN
                qa(ig,l) = (fm(ig,l) * qa(ig,l-1) + entr(ig,l) * q(ig,l))      &
                &        / (fm(ig,l+1) + detr(ig,l))

trunk/LMDZ.GENERIC/libf/phystd/thermcell_main.F90

@@ -383 +383 @@
       
       CALL thermcell_dq(ngrid,nlay,ptimestep,fm0,entr0,detr0,masse,           &
-      &                 zhl,zdthladj,dummy,lmin,lmax)
+      &                 zhl,zdthladj,dummy)
       
       DO l=1,nlay
@@ -397 +397 @@
       DO iq=1,nq
          CALL thermcell_dq(ngrid,nlay,ptimestep,fm0,entr0,detr0,masse,        &
-         &                 pq(:,:,iq),pdqadj(:,:,iq),zqa(:,:,iq),lmin,lmax)
+         &                 pq(:,:,iq),pdqadj(:,:,iq),zqa(:,:,iq))
       ENDDO
       
@@ -409 +409 @@
       ELSE
          CALL thermcell_dq(ngrid,nlay,ptimestep,fm0,entr0,detr0,masse,           &
-         &                 zu,pduadj,zua,lmin,lmax)
+         &                 zu,pduadj,zua)
          CALL thermcell_dq(ngrid,nlay,ptimestep,fm0,entr0,detr0,masse,           &
-         &                 zv,pdvadj,zva,lmin,lmax)
+         &                 zv,pdvadj,zva)
       ENDIF