Changeset 6ecb30a in flexpart.git for src/timemanager.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/timemanager.f90 (modified) (7 diffs)

src/timemanager.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine timemanager
+subroutine timemanager(metdata_format)
 
   !*****************************************************************************
@@ -50 +50 @@
   !   For compatibility with 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:                                                                 *
@@ -102 +106 @@
   implicit none
 
+  integer :: metdata_format
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1
 ! integer :: ksp
@@ -194 +199 @@
            write (*,*) 'timemanager> call convmix -- backward'
         endif         
-      call convmix(itime)
+      call convmix(itime,metdata_format)
         if (verbosity.gt.1) then
           !CALL SYSTEM_CLOCK(count_clock, count_rate, count_max)
@@ -207 +212 @@
            write (*,*) 'timemanager> call getfields'
     endif 
-    call getfields(itime,nstop1)
+    call getfields(itime,nstop1,metdata_format)
         if (verbosity.gt.1) then
           CALL SYSTEM_CLOCK(count_clock)
@@ -266 +271 @@
        write (*,*) 'timemanager> call convmix -- forward'
      endif    
-     call convmix(itime)
+     call convmix(itime,metdata_format)
    endif