Changeset bb579a9 in flexpart.git for src/timemanager_mpi.f90

Timestamp:

Sep 13, 2017, 11:55:16 AM (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:

08a38b5

Parents:

aa8c34a (diff), dd6a4aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ctbto' into dev

File:

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

src/timemanager_mpi.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine timemanager
+subroutine timemanager(metdata_format)
 
 !*****************************************************************************
@@ -50 +50 @@
 !   MPI version                                                              *
 !   Variables uap,ucp,uzp,us,vs,ws,cbt now in module com_mod                 *
+!  Unified ECMWF and GFS builds                                              *
+!   Marian Harustak, 12.5.2017                                               *
+!   - Added passing of metdata_format as it was needed by called routines    *
 !*****************************************************************************
 !                                                                            *
@@ -83 +86 @@
 ! xtra1(maxpart), ytra1(maxpart), ztra1(maxpart) =                           *
 !                    spatial positions of trajectories                       *
+! metdata_format     format of metdata (ecmwf/gfs)                           *
 !                                                                            *
 ! Constants:                                                                 *
@@ -103 +107 @@
   implicit none
 
+  integer :: metdata_format
   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
@@ -205 +210 @@
       endif
 ! readwind process skips this step
-      if (.not.(lmpreader.and.lmp_use_reader)) call convmix(itime)
+      if (.not.(lmpreader.and.lmp_use_reader)) call convmix(itime,metdata_format)
     endif
 
@@ -218 +223 @@
     if (mp_measure_time) call mpif_mtime('getfields',0)
 
-    call getfields(itime,nstop1,memstat)
+    call getfields(itime,nstop1,memstat,metdata_format)
 
     if (mp_measure_time) call mpif_mtime('getfields',1)
@@ -346 +351 @@
         write (*,*) 'timemanager> call convmix -- forward'
       endif
-      call convmix(itime)
+      call convmix(itime,metdata_format)
     endif