Changeset 341f4b7 in flexpart.git for src/verttransform.f90

Timestamp:

Apr 20, 2016, 1:39:51 PM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

61df8d9

Parents:

32b49c3

Message:

SPECIES files converted to namelist format. Fixed-format SPCIES files renamed with .oldformat extension. Added 2 wet depo parameters to old-format SPECIES. Renamed internal variables and parameters used for wet deposition. incloud_ratio increased to 2.2

File:

• src/verttransform.f90 (modified) (5 diffs)

src/verttransform.f90

@@ -82 +82 @@
 
   integer :: ix,jy,kz,iz,n,kmin,ix1,jy1,ixp,jyp,ixm,jym,kz_inv
-  real :: f_qvsat,pressure,rh,lsp,convp,prec
+  real :: f_qvsat,pressure,rh,lsp,convp,cloudh_min,prec
   real :: ew,dz1,dz2,dz
   real :: xlon,ylat,xlonr,dzdx,dzdy
@@ -586 +586 @@
     write(*,*) 'Global ECMWF fields: using cloud water'
     clw(:,:,:,n)=0.0
-    icloud_stats(:,:,:,n)=0.0
+!    icloud_stats(:,:,:,n)=0.0
+    ctwc(:,:,n)=0.0
     clouds(:,:,:,n)=0
 ! If water/ice are read separately into clwc and ciwc, store sum in clwc
@@ -604 +605 @@
             clw(ix,jy,kz,n)=(clwc(ix,jy,kz,n)*rho(ix,jy,kz,n))*(height(kz+1)-height(kz))
             tot_cloud_h=tot_cloud_h+(height(kz+1)-height(kz)) 
-            icloud_stats(ix,jy,4,n)= icloud_stats(ix,jy,4,n)+clw(ix,jy,kz,n)          ! Column cloud water [m3/m3]
-            icloud_stats(ix,jy,3,n)= min(height(kz+1),height(kz))                     ! Cloud BOT height stats      [m]
+            
+!            icloud_stats(ix,jy,4,n)= icloud_stats(ix,jy,4,n)+clw(ix,jy,kz,n)          ! Column cloud water [m3/m3]
+            ctwc(ix,jy,n) = ctwc(ix,jy,n)+clw(ix,jy,kz,n)
+!            icloud_stats(ix,jy,3,n)= min(height(kz+1),height(kz))                     ! Cloud BOT height stats      [m]
+            cloudh_min=min(height(kz+1),height(kz))
 !ZHG 2015 extra for testing
 !            clh(ix,jy,kz,n)=height(kz+1)-height(kz)
-            icloud_stats(ix,jy,1,n)=icloud_stats(ix,jy,1,n)+(height(kz+1)-height(kz)) ! Cloud total vertical extent [m]
-            icloud_stats(ix,jy,2,n)= max(icloud_stats(ix,jy,2,n),height(kz))          ! Cloud TOP height            [m]
+!            icloud_stats(ix,jy,1,n)=icloud_stats(ix,jy,1,n)+(height(kz+1)-height(kz)) ! Cloud total vertical extent [m]
+!            icloud_stats(ix,jy,2,n)= max(icloud_stats(ix,jy,2,n),height(kz))          ! Cloud TOP height            [m]
 !ZHG
           endif
@@ -626 +630 @@
                 clouds(ix,jy,kz,n)=2                             ! convp in-cloud
               endif                                              ! convective or large scale
-            elseif((clw(ix,jy,kz,n).le.0) .and. (icloud_stats(ix,jy,3,n).ge.height(kz)) ) then ! is below cloud
+            elseif((clw(ix,jy,kz,n).le.0) .and. (cloudh_min.ge.height(kz))) then ! is below cloud
               if (lsp.ge.convp) then
                 clouds(ix,jy,kz,n)=5                             ! lsp dominated washout
@@ -643 +647 @@
 
 ! eso: copy the relevant data to clw4 to reduce amount of communicated data for MPI
-    clw4(:,:,n) = icloud_stats(:,:,4,n)
+!    ctwc(:,:,n) = icloud_stats(:,:,4,n)
 
 !**************************************************************************