Changeset 2105 for trunk/LMDZ.GENERIC/libf

Timestamp:

Feb 18, 2019, 3:53:24 PM (6 years ago)

Author:

aboissinot

Message:

Fix a big oversight: now water ice evaporates before calling the thermal plume.

File:

• trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90 (modified) (3 diffs)

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

@@ -262 +262 @@
       INTEGER zlcl(ngrid)
       
-      real,allocatable :: f0(:)           ! Mass flux norm
-      save f0                             ! 
+      real,allocatable,save :: f0(:)      ! Mass flux norm
+      real dqevap(ngrid,nlayer,nq)        ! water tracer mass mixing ratio variations due to evaporation
+      real dtevap(ngrid,nlayer)           ! temperature variation due to evaporation
+      real zqtherm(ngrid,nlayer,nq)       ! vapor mass mixing ratio after evaporation
+      real zttherm(ngrid,nlayer)          ! temperature after evaporation
       real fm0(ngrid, nlayer+1)           ! Mass flux
       real entr0(ngrid, nlayer)           ! Entrainment
@@ -1186 +1189 @@
       
       IF (calltherm) THEN
+! AB : we need to evaporate ice before calling thermcell_main
+         IF (water) THEN
+            CALL evap(ngrid,nlayer,nq,ptimestep,pt,pq,pdq,pdt,dqevap,dtevap,zqtherm,zttherm)
+         ELSE
+            zttherm(:,:) = pt(:,:)
+            zqtherm(:,:,:) = pq(:,:,:)
+         ENDIF
+         
 ! AB:  WARNING: if a plume stops, the parametrization never look above if somewhere the atmosphere is still unstable!
 !               As is, there cannot be more than one plume by grid point by time step.
@@ -1324 +1335 @@
   ! ---------------------
          if (water) then
-
+            
             ! Water ice condensation in the atmosphere
             if(watercond.and.(RLVTT.gt.1.e-8))then
-
-               dqmoist(1:ngrid,1:nlayer,1:nq)=0.
-               dtmoist(1:ngrid,1:nlayer)=0.
                
-               ! Moist Convective Adjustment.
-               ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-               call moistadj(ngrid,nlayer,nq,pt,pq,pdq,pplev,pplay,dtmoist,dqmoist,ptimestep,rneb_man)
-
-               pdq(1:ngrid,1:nlayer,igcm_h2o_vap) = pdq(1:ngrid,1:nlayer,igcm_h2o_vap)     &
-                                                  + dqmoist(1:ngrid,1:nlayer,igcm_h2o_vap)
-               pdq(1:ngrid,1:nlayer,igcm_h2o_ice) = pdq(1:ngrid,1:nlayer,igcm_h2o_ice)     &
-                                                  + dqmoist(1:ngrid,1:nlayer,igcm_h2o_ice)
-               pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtmoist(1:ngrid,1:nlayer)
-
-               ! Test energy conservation.
-               if(enertest)then
+               if (.not.calltherm) then
+                  dqmoist(1:ngrid,1:nlayer,1:nq)=0.
+                  dtmoist(1:ngrid,1:nlayer)=0.
+                  
+                  ! Moist Convective Adjustment.
+                  ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                  call moistadj(ngrid,nlayer,nq,pt,pq,pdq,pplev,pplay,dtmoist,dqmoist,ptimestep,rneb_man)
                
-                  call planetwide_sumval(cpp*massarea(:,:)*dtmoist(:,:)/totarea_planet,dEtot)
-                  call planetwide_maxval(dtmoist(:,:),dtmoist_max)
-                  call planetwide_minval(dtmoist(:,:),dtmoist_min)
-                  madjdEz(:,:)=cpp*mass(:,:)*dtmoist(:,:)
-                  do ig=1,ngrid
-                     madjdE(ig) = cpp*SUM(mass(:,:)*dtmoist(:,:))
-                  enddo
-                  
-                  if (is_master) then
-                     print*,'In moistadj atmospheric energy change   =',dEtot,' W m-2'
-                     print*,'In moistadj MAX atmospheric energy change   =',dtmoist_max*ptimestep,'K/step'
-                     print*,'In moistadj MIN atmospheric energy change   =',dtmoist_min*ptimestep,'K/step'
-                  endif
-                  
-                  call planetwide_sumval(massarea(:,:)*dqmoist(:,:,igcm_h2o_vap)*ptimestep/totarea_planet+        &
-                                           massarea(:,:)*dqmoist(:,:,igcm_h2o_ice)*ptimestep/totarea_planet,dWtot)
-                  if (is_master) print*,'In moistadj atmospheric water change    =',dWtot,' kg m-2'
-                  
-               endif ! end of 'enertest'
+                  pdq(1:ngrid,1:nlayer,igcm_h2o_vap) = pdq(1:ngrid,1:nlayer,igcm_h2o_vap)     &
+                                                     + dqmoist(1:ngrid,1:nlayer,igcm_h2o_vap)
+                  pdq(1:ngrid,1:nlayer,igcm_h2o_ice) = pdq(1:ngrid,1:nlayer,igcm_h2o_ice)     &
+                                                     + dqmoist(1:ngrid,1:nlayer,igcm_h2o_ice)
+                  pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtmoist(1:ngrid,1:nlayer)
+                   
+                  ! Test energy conservation.
+                  if(enertest)then
+                     call planetwide_sumval(cpp*massarea(:,:)*dtmoist(:,:)/totarea_planet,dEtot)
+                     call planetwide_maxval(dtmoist(:,:),dtmoist_max)
+                     call planetwide_minval(dtmoist(:,:),dtmoist_min)
+                     madjdEz(:,:)=cpp*mass(:,:)*dtmoist(:,:)
+                     
+                     do ig=1,ngrid
+                        madjdE(ig) = cpp*SUM(mass(:,:)*dtmoist(:,:))
+                     enddo
+                     
+                     if (is_master) then
+                        print*,'In moistadj atmospheric energy change   =',dEtot,' W m-2'
+                        print*,'In moistadj MAX atmospheric energy change   =',dtmoist_max*ptimestep,'K/step'
+                        print*,'In moistadj MIN atmospheric energy change   =',dtmoist_min*ptimestep,'K/step'
+                     endif
+                     
+                     call planetwide_sumval(massarea(:,:)*dqmoist(:,:,igcm_h2o_vap)*ptimestep/totarea_planet+        &
+                                            massarea(:,:)*dqmoist(:,:,igcm_h2o_ice)*ptimestep/totarea_planet,dWtot)
+                     if (is_master) print*,'In moistadj atmospheric water change    =',dWtot,' kg m-2'
+                     
+                  endif ! end of 'enertest'
+               endif
                
-
                ! Large scale condensation/evaporation.
                ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~