Changeset 41d8574 in flexpart.git for src/verttransform.f90

Timestamp:

Jan 15, 2016, 12:35:58 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:

fdc0f03

Parents:

d8107c2

Message:

bugfix: MPI version gave wrong wet deposition when using ECMWF cloud water fields. Cloud water in ECMWF fields now uses parameter qc, or reads clwc+ciwc. Added minmass variable as limit for terminating particles.

File:

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

src/verttransform.f90

@@ -251 +251 @@
 !hg adding the cloud water 
   clwc(:,:,1,n)=clwch(:,:,1,n)
-  ciwc(:,:,1,n)=ciwch(:,:,1,n)   
+  if (.not.sumclouds) ciwc(:,:,1,n)=ciwch(:,:,1,n)   
 !hg 
   pv(:,:,1,n)=pvh(:,:,1)
@@ -262 +262 @@
 !hg adding the cloud water
   clwc(:,:,nz,n)=clwch(:,:,nuvz,n)
-  ciwc(:,:,nz,n)=ciwch(:,:,nuvz,n)
+  if (.not.sumclouds) ciwc(:,:,nz,n)=ciwch(:,:,nuvz,n)
 !hg
   pv(:,:,nz,n)=pvh(:,:,nuvz)
@@ -280 +280 @@
 !hg adding the cloud water
           clwc(ix,jy,iz,n)=clwc(ix,jy,nz,n)
-          ciwc(ix,jy,iz,n)=ciwc(ix,jy,nz,n)
+          if (.not.sumclouds) ciwc(ix,jy,iz,n)=ciwc(ix,jy,nz,n)
 !hg
           pv(ix,jy,iz,n)=pv(ix,jy,nz,n)
@@ -310 +310 @@
 !hg adding the cloud water
           clwc(ix,jy,iz,n)=(clwch(ix,jy,kz-1,n)*dz2+clwch(ix,jy,kz,n)*dz1)/dz
-          ciwc(ix,jy,iz,n)=(ciwch(ix,jy,kz-1,n)*dz2+ciwch(ix,jy,kz,n)*dz1)/dz
+          if (.not.sumclouds) &
+               &ciwc(ix,jy,iz,n)=(ciwch(ix,jy,kz-1,n)*dz2+ciwch(ix,jy,kz,n)*dz1)/dz
 !hg
           pv(ix,jy,iz,n)=(pvh(ix,jy,kz-1)*dz2+pvh(ix,jy,kz)*dz1)/dz
@@ -578 +579 @@
 !***********************************************************************************
     write(*,*) 'using cloud water from ECMWF'
-    clw(:,:,:,n)=0
-    icloud_stats(:,:,:,n)=0
+    clw(:,:,:,n)=0.0
+    icloud_stats(:,:,:,n)=0.0
     clouds(:,:,:,n)=0
+! If water/ice are read separately into clwc and ciwc, store sum in clwc
+    if (.not.sumclouds) then 
+      clwc(:,:,:,n) = clwc(:,:,:,n) + ciwc(:,:,:,n)
+    end if
     do jy=0,nymin1
       do ix=0,nxmin1
@@ -635 +640 @@
 !   create a cloud and rainout/washout field, clouds occur where rh>80%
 !   total cloudheight is stored at level 0
-! if (.not.readclouds) write(*,*) 'using cloud water from Parameterization'
     write(*,*) 'using cloud water from Parameterization'
     do jy=0,nymin1
@@ -676 +680 @@
     end do
   endif !readclouds
+
+! eso: copy the relevant data to clw4 to reduce amount of communicated data for MPI
+  clw4(:,:,n) = icloud_stats(:,:,4,n)
 
      !********* TEST ***************