Changeset 6ecb30a in flexpart.git for src/FLEXPART_MPI.f90
- Timestamp:
- Aug 17, 2017, 4:39:17 PM (7 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 5b34509
- Parents:
- 61e07ba
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/FLEXPART_MPI.f90
r5184a7c r6ecb30a 33 33 ! * 34 34 !***************************************************************************** 35 ! Changes: * 36 ! Unified ECMWF and GFS builds * 37 ! Marian Harustak, 12.5.2017 * 38 ! - Added detection of metdata format using gributils routines * 39 ! - Distinguished calls to ecmwf/gfs gridcheck versions based on * 40 ! detected metdata format * 41 ! - Passed metdata format down to timemanager * 42 !***************************************************************************** 35 43 ! * 36 44 ! Variables: * … … 47 55 use netcdf_output_mod, only: writeheader_netcdf 48 56 use random_mod, only: gasdev1 57 use class_gribfile 49 58 50 59 implicit none … … 53 62 integer :: idummy = -320 54 63 character(len=256) :: inline_options !pathfile, flexversion, arg2 64 integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN 65 integer :: detectformat 66 55 67 56 68 … … 197 209 call readavailable 198 210 211 ! Detect metdata format 212 !********************** 213 214 metdata_format = detectformat() 215 216 if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then 217 print *,'ECMWF metdata detected' 218 elseif (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then 219 print *,'NCEP metdata detected' 220 else 221 print *,'Unknown metdata format' 222 return 223 endif 224 225 226 199 227 ! If nested wind fields are used, allocate arrays 200 228 !************************************************ … … 213 241 endif 214 242 215 call gridcheck 243 if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then 244 call gridcheck_ecmwf 245 else 246 call gridcheck_gfs 247 end if 248 216 249 217 250 if (verbosity.gt.1 .and. lroot) then … … 456 489 457 490 458 call timemanager 491 call timemanager(metdata_format) 459 492 460 493
Note: See TracChangeset
for help on using the changeset viewer.