Changeset 6ecb30a in flexpart.git for src/convmix.f90

Timestamp:

Aug 17, 2017, 4:39:17 PM (7 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:

5b34509

Parents:

61e07ba

Message:

Merged changes from CTBTO project

File:

• src/convmix.f90 (modified) (9 diffs)

src/convmix.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine convmix(itime)
+subroutine convmix(itime,metdata_format)
   !                     i
   !**************************************************************
@@ -31 +31 @@
   !CHANGES by A. Stohl:
   !  various run-time optimizations - February 2005
+  ! CHANGES by C. Forster, November 2005, NCEP GFS version
+  !      in the ECMWF version convection is calculated on the
+  !      original eta-levels
+  !      in the GFS version convection is calculated on the
+  !      FLEXPART levels
+  !
+  !   Unified ECMWF and GFS builds                                             
+  !   Marian Harustak, 12.5.2017                                              
+  !     - Merged convmix and convmix_gfs into one routine using if-then           
+  !       for meteo-type dependent code                                        
   !**************************************************************
 
@@ -37 +47 @@
   use com_mod
   use conv_mod
+  use class_gribfile
 
   implicit none
@@ -44 +55 @@
   integer :: jy, kpart, ktop, ngrid,kz
   integer :: igrid(maxpart), ipoint(maxpart), igridn(maxpart,maxnests)
+  integer :: metdata_format
 
   ! itime [s]                 current time
@@ -104 +116 @@
 
     ngrid=0
+    if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
     do j=numbnests,1,-1
       if ( x.gt.xln(j)+eps .and. x.lt.xrn(j)-eps .and. &
@@ -111 +124 @@
       endif
     end do
+    else
+      do j=numbnests,1,-1
+        if ( x.gt.xln(j) .and. x.lt.xrn(j) .and. &
+             y.gt.yln(j) .and. y.lt.yrn(j) ) then
+          ngrid=j
+          goto 23
+        endif
+      end do
+    endif
  23   continue
 
@@ -167 +189 @@
       td2conv=(td2(ix,jy,1,mind1)*dt2+td2(ix,jy,1,mind2)*dt1)*dtt
 !!$      do kz=1,nconvlev+1      !old
+      if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
         do kz=1,nuvz-1           !bugfix
         tconv(kz)=(tth(ix,jy,kz+1,mind1)*dt2+ &
@@ -173 +196 @@
              qvh(ix,jy,kz+1,mind2)*dt1)*dtt
       end do
+      else
+        do kz=1,nuvz-1           !bugfix
+          pconv(kz)=(pplev(ix,jy,kz,mind1)*dt2+ &
+              pplev(ix,jy,kz,mind2)*dt1)*dtt
+          tconv(kz)=(tt(ix,jy,kz,mind1)*dt2+ &
+              tt(ix,jy,kz,mind2)*dt1)*dtt
+          qconv(kz)=(qv(ix,jy,kz,mind1)*dt2+ &
+              qv(ix,jy,kz,mind2)*dt1)*dtt
+        end do
+      end if
 
   ! Calculate translocation matrix
-      call calcmatrix(lconv,delt,cbaseflux(ix,jy))
+      call calcmatrix(lconv,delt,cbaseflux(ix,jy),metdata_format)
       igrold = igr
       ktop = 0
@@ -252 +285 @@
   ! calculate translocation matrix
   !*******************************
-        call calcmatrix(lconv,delt,cbasefluxn(ix,jy,inest))
+        call calcmatrix(lconv,delt,cbasefluxn(ix,jy,inest),metdata_format)
         igrold = igr
         ktop = 0