Changes in src/getfields_mpi.f90 [6ecb30a:78e62dc] in flexpart.git

File:

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

src/getfields_mpi.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine getfields(itime,nstop,memstat,metdata_format)
+subroutine getfields(itime,nstop,memstat)
 !                       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  
-!          
 !*****************************************************************************
 !                                                                            *
@@ -81 +77 @@
 ! 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:                                                                 *
@@ -92 +87 @@
   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
@@ -211 +204 @@
       if (ldirect*wftime(indj+1).gt.ldirect*itime) then
         if (lmpreader.or..not. lmp_use_reader) then
-          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(indj+1,mindread,uuh,vvh,wwh)
           call readwind_nests(indj+1,mindread,uuhn,vvhn,wwhn)
-          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 calcpar(mindread,uuh,vvh,pvh)
+          call calcpar_nests(mindread,uuhn,vvhn,pvhn)
+          call verttransform(mindread,uuh,vvh,wwh,pvh)
           call verttransform_nests(mindread,uuhn,vvhn,wwhn,pvhn)
         end if
@@ -245 +230 @@
         memind(1)=1
         if (lmpreader.or..not.lmp_use_reader) then
-          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(indj,memind(1),uuh,vvh,wwh)
           call readwind_nests(indj,memind(1),uuhn,vvhn,wwhn)
-          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 calcpar(memind(1),uuh,vvh,pvh)
+          call calcpar_nests(memind(1),uuhn,vvhn,pvhn)
+          call verttransform(memind(1),uuh,vvh,wwh,pvh)
           call verttransform_nests(memind(1),uuhn,vvhn,wwhn,pvhn)
         end if
@@ -263 +240 @@
         memind(2)=2
         if (lmpreader.or..not.lmp_use_reader) then
-          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(indj+1,memind(2),uuh,vvh,wwh)
           call readwind_nests(indj+1,memind(2),uuhn,vvhn,wwhn)
-          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 calcpar(memind(2),uuh,vvh,pvh)
+          call calcpar_nests(memind(2),uuhn,vvhn,pvhn)
+          call verttransform(memind(2),uuh,vvh,wwh,pvh)
           call verttransform_nests(memind(2),uuhn,vvhn,wwhn,pvhn)
         end if