Changes in / [0c8c7f2:d005a67] in flexpart.git

Location:

src

Files:

• readwind_gfs.f90 (modified) (3 diffs)
• releaseparticles.f90 (modified) (1 diff)
• verttransform_ecmwf.f90 (modified) (1 diff)
• verttransform_gfs.f90 (modified) (1 diff)

src/readwind_gfs.f90

@@ -83 +83 @@
 
   ! NCEP
-  integer :: numpt,numpu,numpv,numpw,numprh
+  integer :: numpt,numpu,numpv,numpw,numprh,numpclwch
   real :: help, temp, ew
   real :: elev
@@ -134 +134 @@
   numpw=0
   numprh=0
+  numpclwch=0
   ifield=0
 10   ifield=ifield+1
@@ -557 +558 @@
       endif
 ! SEC & IP 12/2018 read GFS clouds
-      if(isec1(6).eq.153) then  !! CLWCR  Cloud liquid water content [kg/kg]
-        clwch(i,j,nlev_ec-k+2,n)=zsec4(nxfield*(ny-j-1)+i+1)
+      if((isec1(6).eq.153).and.(isec1(7).eq.100)) then  !! CLWCR  Cloud liquid water content [kg/kg] 
+         if((i.eq.0).and.(j.eq.0)) then
+            do ii=1,nuvz
+              if ((isec1(8)*100.0).eq.akz(ii)) numpclwch=ii
+            end do
+        endif
+        help=zsec4(nxfield*(ny-j-1)+i+1)
+        if(i.le.i180) then
+          clwch(i179+i,j,numpclwch,n)=help
+        else
+          clwch(i-i181,j,numpclwch,n)=help
+        endif
         readclouds=.true.
         sumclouds=.true.
+!        readclouds=.false.
+!       sumclouds=.false.
       endif
 

src/releaseparticles.f90

@@ -114 +114 @@
       average_timecorrect=0.
       do k=1,nspec
-        if (zpoint1(i).gt.0.5) then      ! point source
+        if(abs(xpoint2(i)-xpoint1(i)).lt.1.E-4.and.abs(ypoint2(i)-ypoint1(i)).lt.1.E-4) then
+!        if (zpoint1(i).gt.0.5) then      ! point source
           timecorrect(k)=point_hour(k,nhour)*point_dow(k,ndayofweek)
         else                             ! area source

src/verttransform_ecmwf.f90

@@ -653 +653 @@
         if ((lsp.gt.0.01).or.(convp.gt.0.01)) then ! cloud and precipitation
 
-          do kz=nz,1,-1 !go Bottom up!
+          do kz=nz,2,-1 !go Bottom up!
             if (clw(ix,jy,kz,n).gt. 0) then ! is in cloud
               cloudsh(ix,jy,n)=cloudsh(ix,jy,n)+height(kz)-height(kz-1) 

src/verttransform_gfs.f90

@@ -548 +548 @@
         if ((lsp.gt.0.01).or.(convp.gt.0.01)) then ! cloud and precipitation
 
-          do kz=nz,1,-1 !go Bottom up!
+          do kz=nz,2,-1 !go Bottom up!
             if (clw(ix,jy,kz,n).gt. 0) then ! is in cloud
               cloudsh(ix,jy,n)=cloudsh(ix,jy,n)+height(kz)-height(kz-1)
               clouds(ix,jy,kz,n)=1                               ! is a cloud
               if (lsp.ge.convp) then
-                clouds(ix,jy,kz,n)=3                            ! lsp in-cloud
+                clouds(ix,jy,kz,n)=3                             ! lsp in-cloud
               else
                 clouds(ix,jy,kz,n)=2                             ! convp in-cloud