Changeset c0884a8 in flexpart.git for src/convmix.f90

Timestamp:

Jul 20, 2018, 2:40:39 PM (6 years ago)

Author:

pesei <petra seibert at univie ac at>

Branches:

univie

Children:

7ca2ef4

Parents:

f251e57

Message:

replace CTBTO code for checking type of GRIB

File:

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

src/convmix.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine convmix(itime,metdata_format)
+subroutine convmix(itime,id_centre)
   !                     i
   !**************************************************************
@@ -39 +39 @@
   !   Unified ECMWF and GFS builds                                             
   !   Marian Harustak, 12.5.2017                                              
-  !     - Merged convmix and convmix_gfs into one routine using if-then           
+  !     - Merged convmix and convmix_gfs into one routine using if-then      
   !       for meteo-type dependent code                                        
+  !                                                                          
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection 
+  !                                                                          
   !**************************************************************
 
@@ -47 +50 @@
   use com_mod
   use conv_mod
-  use class_gribfile
+  use check_gribfile_mod
 
   implicit none
@@ -55 +58 @@
   integer :: jy, kpart, ktop, ngrid,kz
   integer :: igrid(maxpart), ipoint(maxpart), igridn(maxpart,maxnests)
-  integer :: metdata_format
+  integer :: id_centre
 
   ! itime [s]                 current time
@@ -116 +119 @@
 
     ngrid=0
-    if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+    if (id_centre.eq.icg_id_ecmwf) then
     do j=numbnests,1,-1
       if ( x.gt.xln(j)+eps .and. x.lt.xrn(j)-eps .and. &
@@ -189 +192 @@
       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
+      if (id_centre.eq.icg_id_ecmwf) then
         do kz=1,nuvz-1           !bugfix
         tconv(kz)=(tth(ix,jy,kz+1,mind1)*dt2+ &
@@ -208 +211 @@
 
   ! Calculate translocation matrix
-      call calcmatrix(lconv,delt,cbaseflux(ix,jy),metdata_format)
+      call calcmatrix(lconv,delt,cbaseflux(ix,jy),id_centre)
       igrold = igr
       ktop = 0
@@ -285 +288 @@
   ! calculate translocation matrix
   !*******************************
-        call calcmatrix(lconv,delt,cbasefluxn(ix,jy,inest),metdata_format)
+        call calcmatrix(lconv,delt,cbasefluxn(ix,jy,inest),id_centre)
         igrold = igr
         ktop = 0