Changeset c0884a8 in flexpart.git for src/calcpar_nests.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/calcpar_nests.f90 (modified) (5 diffs)

src/calcpar_nests.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine calcpar_nests(n,uuhn,vvhn,pvhn,metdata_format)
+subroutine calcpar_nests(n,uuhn,vvhn,pvhn,id_centre)
   !                         i  i    i    o
   !*****************************************************************************
@@ -44 +44 @@
   !   Unified ECMWF and GFS builds                                             *
   !   Marian Harustak, 12.5.2017                                               *
-  !     - Added passing of metdata_format as it was needed by called routines  *
+  !     - Added passing of id_centre as it was needed by called routines       *
+  !                                                                            *
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection   *
+  !                                                                            *
   !*****************************************************************************
   !                                                                            *
   ! Variables:                                                                 *
   ! n                  temporal index for meteorological fields (1 to 3)       *
-  ! metdata_format     format of metdata (ecmwf/gfs)                           *
+  ! id_centre          format of metdata (ecmwf/gfs)                           *
   !                                                                            *
   ! Constants:                                                                 *
@@ -65 +68 @@
   implicit none
 
-  integer :: metdata_format
+  integer :: id_centre
   integer :: n,ix,jy,i,l,kz,lz,kzmin
   real :: ttlev(nuvzmax),qvlev(nuvzmax),obukhov,scalev,ol,hmixplus,dummyakzllev
@@ -116 +119 @@
       ol=obukhov(psn(ix,jy,1,n,l),tt2n(ix,jy,1,n,l), &
            td2n(ix,jy,1,n,l),tthn(ix,jy,2,n,l),ustarn(ix,jy,1,n,l), &
-           sshfn(ix,jy,1,n,l),akm,bkm,dummyakzllev,metdata_format)
+           sshfn(ix,jy,1,n,l),akm,bkm,dummyakzllev,id_centre)
       if (ol.ne.0.) then
         olin(ix,jy,1,n,l)=1./ol
@@ -137 +140 @@
            qvlev,ulev,vlev,nuvz,akz,bkz,sshfn(ix,jy,1,n,l), &
            tt2n(ix,jy,1,n,l),td2n(ix,jy,1,n,l),hmixn(ix,jy,1,n,l), &
-           wstarn(ix,jy,1,n,l),hmixplus,metdata_format)
+           wstarn(ix,jy,1,n,l),hmixplus,id_centre)
 
       if(lsubgrid.eq.1) then