Changes in src/FLEXPART.f90 [d8eed02:c8fc724] in flexpart.git

File:

• src/FLEXPART.f90 (modified) (7 diffs)

src/FLEXPART.f90

@@ -33 +33 @@
   !                                                                            *
   !*****************************************************************************
-  ! Changes:                                                                   *
-  !   Unified ECMWF and GFS builds                                             *
-  !   Marian Harustak, 12.5.2017                                               *
-  !     - Added detection of metdata format using gributils routines           *
-  !     - Distinguished calls to ecmwf/gfs gridcheck versions based on         *
-  !       detected metdata format                                              *
-  !     - Passed metdata format down to timemanager                            *
-  !*****************************************************************************
   !                                                                            *
   ! Variables:                                                                 *
@@ -54 +46 @@
   use netcdf_output_mod, only: writeheader_netcdf
   use random_mod, only: gasdev1
-  use class_gribfile
 
   implicit none
@@ -61 +52 @@
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
-  integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
-  integer :: detectformat
-
 
 
@@ -82 +70 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.2beta (2017-08-01)'
+  flexversion='Version '//trim(flexversion_major)//'.1beta (2016-11-02)'
   verbosity=0
 
@@ -184 +172 @@
   call readavailable
 
-  ! Detect metdata format
-  !**********************
-
-  metdata_format = detectformat()
-
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
-    print *,'ECMWF metdata detected'
-  elseif (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then
-    print *,'NCEP metdata detected'
-  else
-    print *,'Unknown metdata format'
-    return
-  endif
-
-
-
   ! If nested wind fields are used, allocate arrays
   !************************************************
@@ -216 +188 @@
   endif
 
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
-    call gridcheck_ecmwf
-  else
-    call gridcheck_gfs
-  end if
+  call gridcheck
 
   if (verbosity.gt.1) then   
@@ -443 +411 @@
   endif
 
-  call timemanager(metdata_format)
+  call timemanager
 
 ! NIK 16.02.2005