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

src/calcpar_nests.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine calcpar_nests(n,uuhn,vvhn,pvhn)
+subroutine calcpar_nests(n,uuhn,vvhn,pvhn,metdata_format)
   !                         i  i    i    o
   !*****************************************************************************
@@ -39 +39 @@
   !                                                                            *
   !*****************************************************************************
-  !  Changes, Bernd C. Krueger, Feb. 2001:
-  !   Variables tth and qvh (on eta coordinates) in common block
+  !  Changes, Bernd C. Krueger, Feb. 2001:                                     *
+  !   Variables tth and qvh (on eta coordinates) in common block               *
+  !                                                                            *
+  !   Unified ECMWF and GFS builds                                             *
+  !   Marian Harustak, 12.5.2017                                               *
+  !     - Added passing of metdata_format as it was needed by called routines  *
   !*****************************************************************************
   !                                                                            *
   ! Variables:                                                                 *
   ! n                  temporal index for meteorological fields (1 to 3)       *
+  ! metdata_format     format of metdata (ecmwf/gfs)                           *
   !                                                                            *
   ! Constants:                                                                 *
@@ -60 +65 @@
   implicit none
 
+  integer :: metdata_format
   integer :: n,ix,jy,i,l,kz,lz,kzmin
-  real :: ttlev(nuvzmax),qvlev(nuvzmax),obukhov,scalev,ol,hmixplus
+  real :: ttlev(nuvzmax),qvlev(nuvzmax),obukhov,scalev,ol,hmixplus,dummyakzllev
   real :: ulev(nuvzmax),vlev(nuvzmax),ew,rh,vd(maxspec),subsceff,ylat
   real :: altmin,tvold,pold,zold,pint,tv,zlev(nuvzmax)
@@ -110 +116 @@
       ol=obukhov(psn(ix,jy,1,n,l),tt2n(ix,jy,1,n,l), &
            td2n(ix,jy,1,n,l),tthn(ix,jy,2,n,l),ustarn(ix,jy,1,n,l), &
-           sshfn(ix,jy,1,n,l),akm,bkm)
+           sshfn(ix,jy,1,n,l),akm,bkm,dummyakzllev,metdata_format)
       if (ol.ne.0.) then
         olin(ix,jy,1,n,l)=1./ol
@@ -131 +137 @@
            qvlev,ulev,vlev,nuvz,akz,bkz,sshfn(ix,jy,1,n,l), &
            tt2n(ix,jy,1,n,l),td2n(ix,jy,1,n,l),hmixn(ix,jy,1,n,l), &
-           wstarn(ix,jy,1,n,l),hmixplus)
+           wstarn(ix,jy,1,n,l),hmixplus,metdata_format)
 
       if(lsubgrid.eq.1) then