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

src/getfields_mpi.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine getfields(itime,nstop,memstat)
+subroutine getfields(itime,nstop,memstat,metdata_format)
 !                       i     o       o
 !*****************************************************************************
@@ -58 +58 @@
 !    memstat=0:      no new fields to be read
 !          
+!   Unified ECMWF and GFS builds                                             
+!   Marian Harustak, 12.5.2017                                               
+!     - Added passing of metdata_format as it was needed by called routines  
+!          
 !*****************************************************************************
 !                                                                            *
@@ -77 +81 @@
 ! tt(0:nxmax,0:nymax,nuvzmax,numwfmem)   temperature [K]                     *
 ! ps(0:nxmax,0:nymax,numwfmem)           surface pressure [Pa]               *
+! metdata_format     format of metdata (ecmwf/gfs)                           *
 !                                                                            *
 ! Constants:                                                                 *
@@ -87 +92 @@
   use com_mod
   use mpi_mod, only: lmpreader,lmp_use_reader,lmp_sync
+  use class_gribfile
 
   implicit none
 
+  integer :: metdata_format
   integer :: indj,itime,nstop,memaux,mindread
 ! mindread: index of where to read 3rd field
@@ -204 +211 @@
       if (ldirect*wftime(indj+1).gt.ldirect*itime) then
         if (lmpreader.or..not. lmp_use_reader) then
-          call readwind(indj+1,mindread,uuh,vvh,wwh)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call readwind_ecmwf(indj+1,mindread,uuh,vvh,wwh)
+          else
+            call readwind_gfs(indj+1,mindread,uuh,vvh,wwh)
+          end if
           call readwind_nests(indj+1,mindread,uuhn,vvhn,wwhn)
-          call calcpar(mindread,uuh,vvh,pvh)
-          call calcpar_nests(mindread,uuhn,vvhn,pvhn)
-          call verttransform(mindread,uuh,vvh,wwh,pvh)
+          call calcpar(mindread,uuh,vvh,pvh,metdata_format)
+          call calcpar_nests(mindread,uuhn,vvhn,pvhn,metdata_format)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call verttransform_ecmwf(mindread,uuh,vvh,wwh,pvh)
+          else
+            call verttransform_gfs(mindread,uuh,vvh,wwh,pvh)
+          end if
           call verttransform_nests(mindread,uuhn,vvhn,wwhn,pvhn)
         end if
@@ -230 +245 @@
         memind(1)=1
         if (lmpreader.or..not.lmp_use_reader) then
-          call readwind(indj,memind(1),uuh,vvh,wwh)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call readwind_ecmwf(indj,memind(1),uuh,vvh,wwh)
+          else
+            call readwind_gfs(indj,memind(1),uuh,vvh,wwh)
+          end if
           call readwind_nests(indj,memind(1),uuhn,vvhn,wwhn)
-          call calcpar(memind(1),uuh,vvh,pvh)
-          call calcpar_nests(memind(1),uuhn,vvhn,pvhn)
-          call verttransform(memind(1),uuh,vvh,wwh,pvh)
+          call calcpar(memind(1),uuh,vvh,pvh,metdata_format)
+          call calcpar_nests(memind(1),uuhn,vvhn,pvhn,metdata_format)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call verttransform_ecmwf(memind(1),uuh,vvh,wwh,pvh)
+          else
+            call verttransform_gfs(memind(1),uuh,vvh,wwh,pvh)
+          end if
           call verttransform_nests(memind(1),uuhn,vvhn,wwhn,pvhn)
         end if
@@ -240 +263 @@
         memind(2)=2
         if (lmpreader.or..not.lmp_use_reader) then
-          call readwind(indj+1,memind(2),uuh,vvh,wwh)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call readwind_ecmwf(indj+1,memind(2),uuh,vvh,wwh)
+          else
+            call readwind_gfs(indj+1,memind(2),uuh,vvh,wwh)
+          end if
           call readwind_nests(indj+1,memind(2),uuhn,vvhn,wwhn)
-          call calcpar(memind(2),uuh,vvh,pvh)
-          call calcpar_nests(memind(2),uuhn,vvhn,pvhn)
-          call verttransform(memind(2),uuh,vvh,wwh,pvh)
+          call calcpar(memind(2),uuh,vvh,pvh,metdata_format)
+          call calcpar_nests(memind(2),uuhn,vvhn,pvhn,metdata_format)
+          if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+            call verttransform_ecmwf(memind(2),uuh,vvh,wwh,pvh)
+          else
+            call verttransform_gfs(memind(2),uuh,vvh,wwh,pvh)
+          end if
           call verttransform_nests(memind(2),uuhn,vvhn,wwhn,pvhn)
         end if