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

src/timemanager_mpi.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine timemanager(metdata_format)
+subroutine timemanager(id_centre)
 
 !*****************************************************************************
@@ -52 +52 @@
 !  Unified ECMWF and GFS builds                                              *
 !   Marian Harustak, 12.5.2017                                               *
-!   - Added passing of metdata_format as it was needed by called routines    *
+!   - Added passing of id_centre as it was needed by called routines         *
+!                                                                            *
+!  Petra Seibert, 2018-06-26: simplified version met data format detection   *
+!                                                                            *
 !*****************************************************************************
 !                                                                            *
@@ -86 +89 @@
 ! xtra1(maxpart), ytra1(maxpart), ztra1(maxpart) =                           *
 !                    spatial positions of trajectories                       *
-! metdata_format     format of metdata (ecmwf/gfs)                           *
+! id_centre          format of metdata (ecmwf/gfs)                           *
 !                                                                            *
 ! Constants:                                                                 *
@@ -109 +112 @@
   implicit none
 
-  integer :: metdata_format
+  integer :: id_centre
   logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1,memstat=0
@@ -214 +217 @@
       endif
 ! readwind process skips this step
-      if (.not.(lmpreader.and.lmp_use_reader)) call convmix(itime,metdata_format)
+      if (.not.(lmpreader.and.lmp_use_reader)) call convmix(itime,id_centre)
     endif
 
@@ -227 +230 @@
     if (mp_measure_time) call mpif_mtime('getfields',0)
 
-    call getfields(itime,nstop1,memstat,metdata_format)
+    call getfields(itime,nstop1,memstat,id_centre)
 
     if (mp_measure_time) call mpif_mtime('getfields',1)
@@ -355 +358 @@
         write (*,*) 'timemanager> call convmix -- forward'
       endif
-      call convmix(itime,metdata_format)
+      call convmix(itime,id_centre)
     endif