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

src/getfields_mpi.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine getfields(itime,nstop,memstat,metdata_format)
+subroutine getfields(itime,nstop,memstat,id_centre)
 !                       i     o       o
 !*****************************************************************************
@@ -60 +60 @@
 !   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:                                                                 *
@@ -81 +82 @@
 ! tt(0:nxmax,0:nymax,nuvzmax,numwfmem)   temperature [K]                     *
 ! ps(0:nxmax,0:nymax,numwfmem)           surface pressure [Pa]               *
-! metdata_format     format of metdata (ecmwf/gfs)                           *
+! id_centre            format of metdata (ecmwf/gfs)                           *
 !                                                                            *
 ! Constants:                                                                 *
@@ -92 +93 @@
   use com_mod
   use mpi_mod, only: lmpreader,lmp_use_reader,lmp_sync
-  use class_gribfile
+  use check_gribfile_mod
 
   implicit none
 
-  integer :: metdata_format
+  integer :: id_centre
   integer :: indj,itime,nstop,memaux,mindread
 ! mindread: index of where to read 3rd field
@@ -211 +212 @@
       if (ldirect*wftime(indj+1).gt.ldirect*itime) then
         if (lmpreader.or..not. lmp_use_reader) then
-          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+          if (id_centre.eq.icg_id_ecmwf) then
             call readwind_ecmwf(indj+1,mindread,uuh,vvh,wwh)
           else
@@ -217 +218 @@
           end if
           call readwind_nests(indj+1,mindread,uuhn,vvhn,wwhn)
-          call calcpar(mindread,uuh,vvh,pvh,metdata_format)
-          call calcpar_nests(mindread,uuhn,vvhn,pvhn,metdata_format)
-          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+          call calcpar(mindread,uuh,vvh,pvh,id_centre)
+          call calcpar_nests(mindread,uuhn,vvhn,pvhn,id_centre)
+          if (id_centre.eq.icg_id_ecmwf) then
             call verttransform_ecmwf(mindread,uuh,vvh,wwh,pvh)
           else
@@ -249 +250 @@
         memind(1)=1
         if (lmpreader.or..not.lmp_use_reader) then
-          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
@@ -255 +256 @@
           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
@@ -267 +268 @@
         memind(2)=2
         if (lmpreader.or..not.lmp_use_reader) 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
@@ -273 +274 @@
           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