Changeset 6ecb30a in flexpart.git for src/FLEXPART.f90

Timestamp:

Aug 17, 2017, 4:39:17 PM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

5b34509

Parents:

61e07ba

Message:

Merged changes from CTBTO project

File:

• src/FLEXPART.f90 (modified) (6 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:                                                                 *
@@ -46 +54 @@
   use netcdf_output_mod, only: writeheader_netcdf
   use random_mod, only: gasdev1
+  use class_gribfile
 
   implicit none
@@ -52 +61 @@
   integer :: idummy = -320
   character(len=256) :: inline_options  !pathfile, flexversion, arg2
+  integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
+  integer :: detectformat
+
 
 
@@ -172 +184 @@
   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
   !************************************************
@@ -188 +216 @@
   endif
 
-  call gridcheck
+  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+    call gridcheck_ecmwf
+  else
+    call gridcheck_gfs
+  end if
 
   if (verbosity.gt.1) then   
@@ -411 +443 @@
   endif
 
-  call timemanager
+  call timemanager(metdata_format)
 
 ! NIK 16.02.2005