Changes in src/FLEXPART_MPI.f90 [5184a7c:d8eed02] in flexpart.git

File:

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

src/FLEXPART_MPI.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:                                                                 *
@@ -47 +55 @@
   use netcdf_output_mod, only: writeheader_netcdf
   use random_mod, only: gasdev1
+  use class_gribfile
 
   implicit none
@@ -53 +62 @@
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
+  integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
+  integer :: detectformat
+
 
 
@@ -80 +92 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Ver. '//trim(flexversion_major)//'.1beta MPI (2016-11-02)'
+  flexversion='Ver. '//trim(flexversion_major)//'.2beta MPI (2017-08-01)'
   verbosity=0
 
@@ -197 +209 @@
   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
   !************************************************
@@ -213 +241 @@
   endif
 
-  call gridcheck
+  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+    call gridcheck_ecmwf
+  else
+    call gridcheck_gfs
+  end if
+
 
   if (verbosity.gt.1 .and. lroot) then   
@@ -456 +489 @@
 
 
-  call timemanager
+  call timemanager(metdata_format)