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

src/calcmatrix.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine calcmatrix(lconv,delt,cbmf,metdata_format)
+subroutine calcmatrix(lconv,delt,cbmf,id_centre)
   !                        o    i    o
   !*****************************************************************************
@@ -40 +40 @@
   !     - Merged calcmatrix and calcmatrix_gfs into one routine using if-then  *
   !       for meteo-type dependent code                                        *
+  !                                                                            *
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection   *
+  !                                                                            *
   !*****************************************************************************
   !                                                                            *
@@ -45 +48 @@
   !  delt         time step for convection [s]                                 *
   !  cbmf         cloud base mass flux                                         *
-  !  metdata_format format of metdata (ecmwf/gfs)                              *
+  !  id_centre    format of metdata (ecmwf/gfs)                                *
   !                                                                            *
   !*****************************************************************************
@@ -52 +55 @@
   use com_mod
   use conv_mod
-  use class_gribfile
+  use check_gribfile_mod
 
   implicit none
 
   real :: rlevmass,summe
-  integer :: metdata_format
+  integer :: id_centre
 
   integer :: iflag, k, kk, kuvz
@@ -88 +91 @@
   do kuvz = 2,nuvz
     k = kuvz-1
-    if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+    if (id_centre.eq.icg_id_ecmwf) then
     pconv(k) = (akz(kuvz) + bkz(kuvz)*psconv)
     phconv(kuvz) = (akm(kuvz) + bkm(kuvz)*psconv)