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

src/getfields.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine getfields(itime,nstop,metdata_format)
+subroutine getfields(itime,nstop,id_centre)
 !                       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   *
+!                                                                            *
 !*****************************************************************************
 !                                                                            *
@@ -62 +65 @@
 ! tt(0:nxmax,0:nymax,nuvzmax,2)   temperature [K]                            *
 ! ps(0:nxmax,0:nymax,2)           surface pressure [Pa]                      *
-! metdata_format     format of metdata (ecmwf/gfs)                           *
+! id_centre            format of metdata (ecmwf/gfs)                         *
 !                                                                            *
 ! Constants:                                                                 *
@@ -72 +75 @@
   use par_mod
   use com_mod
-  use class_gribfile
+  use check_gribfile_mod
 
   implicit none
 
   integer :: indj,itime,nstop,memaux
-  integer :: metdata_format
+  integer :: id_centre
 
   real :: uuh(0:nxmax-1,0:nymax-1,nuvzmax)
@@ -132 +135 @@
     do indj=indmin,numbwf-1
       if (ldirect*wftime(indj+1).gt.ldirect*itime) then
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        if (id_centre.eq.icg_id_ecmwf) then
           call readwind_ecmwf(indj+1,memind(2),uuh,vvh,wwh)
         else
@@ -138 +141 @@
         end if
         call readwind_nests(indj+1,memind(2),uuhn,vvhn,wwhn)
-        call calcpar(memind(2),uuh,vvh,pvh,metdata_format)
-        call calcpar_nests(memind(2),uuhn,vvhn,pvhn,metdata_format)
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        call calcpar(memind(2),uuh,vvh,pvh,id_centre)
+        call calcpar_nests(memind(2),uuhn,vvhn,pvhn,id_centre)
+        if (id_centre.eq.icg_id_ecmwf) then
           call verttransform_ecmwf(memind(2),uuh,vvh,wwh,pvh)
         else
@@ -167 +170 @@
            (ldirect*wftime(indj+1).gt.ldirect*itime)) then
         memind(1)=1
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        if (id_centre.eq.icg_id_ecmwf) then
           call readwind_ecmwf(indj,memind(1),uuh,vvh,wwh)
         else
@@ -173 +176 @@
         end if
         call readwind_nests(indj,memind(1),uuhn,vvhn,wwhn)
-        call calcpar(memind(1),uuh,vvh,pvh,metdata_format)
-        call calcpar_nests(memind(1),uuhn,vvhn,pvhn,metdata_format)
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        call calcpar(memind(1),uuh,vvh,pvh,id_centre)
+        call calcpar_nests(memind(1),uuhn,vvhn,pvhn,id_centre)
+        if (id_centre.eq.icg_id_ecmwf) then
           call verttransform_ecmwf(memind(1),uuh,vvh,wwh,pvh)
         else
@@ -183 +186 @@
         memtime(1)=wftime(indj)
         memind(2)=2
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        if (id_centre.eq.icg_id_ecmwf) then
           call readwind_ecmwf(indj+1,memind(2),uuh,vvh,wwh)
         else
@@ -189 +192 @@
         end if
         call readwind_nests(indj+1,memind(2),uuhn,vvhn,wwhn)
-        call calcpar(memind(2),uuh,vvh,pvh,metdata_format)
-        call calcpar_nests(memind(2),uuhn,vvhn,pvhn,metdata_format)
-        if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+        call calcpar(memind(2),uuh,vvh,pvh,id_centre)
+        call calcpar_nests(memind(2),uuhn,vvhn,pvhn,id_centre)
+        if (id_centre.eq.icg_id_ecmwf) then
           call verttransform_ecmwf(memind(2),uuh,vvh,wwh,pvh)
         else