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

src/FLEXPART_MPI.f90

@@ -40 +40 @@
   !       detected metdata format                                              *
   !     - Passed metdata format down to timemanager                            *
+  !                                                                            *
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection   *
+  !                                                                            *
   !*****************************************************************************
   !                                                                            *
@@ -54 +57 @@
   use mpi_mod
   use random_mod, only: gasdev1
-  use class_gribfile
+  use check_gribfile_mod
 
 #ifdef USE_NCF
@@ -62 +65 @@
   implicit none
 
-  integer :: i,j,ix,jy,inest
+  integer :: i,j,ix,jy,inest,id_centre
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
-  integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
-  integer :: detectformat
   integer(selected_int_kind(16)), dimension(maxspec) :: tot_b=0, &
        & tot_i=0
@@ -203 +204 @@
   ! Detect metdata format
   !**********************
-
-  metdata_format = detectformat()
-
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+  call cg_get_centre(path(3)(1:length(3)) // trim(wfname(1)), id_centre)
+  if (id_centre.eq.icg_id_ecmwf) then
     if (lroot) print *,'ECMWF metdata detected'
-  elseif (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then
-    if (lroot) print *,'NCEP metdata detected'
+  elseif (id_centre.eq.icg_id_ncep) then
+    if (lroot) print *,'NCEP met data detected'
   else
-    if (lroot) print *,'Unknown metdata format'
+    if (lroot) print *,'Unknown met data format'
     stop
   endif
@@ -233 +232 @@
   endif
 
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+  if (id_centre.eq.icg_id_ecmwf) then
     call gridcheck_ecmwf
   else
@@ -480 +479 @@
 
 
-  call timemanager(metdata_format)
+  call timemanager(id_centre)