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

src/richardson.f90

@@ -21 +21 @@
 
 subroutine richardson(psurf,ust,ttlev,qvlev,ulev,vlev,nuvz, &
-       akz,bkz,hf,tt2,td2,h,wst,hmixplus)
+       akz,bkz,hf,tt2,td2,h,wst,hmixplus,metdata_format)
   !                        i    i    i     i    i    i    i
   ! i   i  i   i   i  o  o     o
@@ -41 +41 @@
   !     Meteor. 81, 245-269.                                                  *
   !                                                                           *
+  !****************************************************************************
+  !                                                                           *
   !     Update: 1999-02-01 by G. Wotawa                                       *
   !                                                                           *
@@ -46 +48 @@
   !     instead of first model level.                                         *
   !     New input variables tt2, td2 introduced.                              *
+  !                                                                           *
+  !     CHANGE: 17/11/2005 Caroline Forster NCEP GFS version                  * 
+  !                                                                           *
+  !     Unified ECMWF and GFS builds                                          *
+  !     Marian Harustak, 12.5.2017                                            *
+  !       - Merged richardson and richardson_gfs into one routine using       *
+  !         if-then for meteo-type dependent code                             *
   !                                                                           *
   !****************************************************************************
@@ -55 +64 @@
   ! tv                         virtual temperature                            *
   ! wst                        convective velocity scale                      *
+  ! metdata_format             format of metdata (ecmwf/gfs)                  *
   !                                                                           *
   ! Constants:                                                                *
@@ -62 +72 @@
 
   use par_mod
+  use class_gribfile
 
   implicit none
 
-  integer :: i,k,nuvz,iter
+  integer :: metdata_format
+  integer :: i,k,nuvz,iter,llev,loop_start
   real :: tv,tvold,zref,z,zold,pint,pold,theta,thetaref,ri
   real :: akz(nuvz),bkz(nuvz),ulev(nuvz),vlev(nuvz),hf,wst,tt2,td2,ew
@@ -77 +89 @@
   iter=0
 
+  if (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then
+    ! NCEP version: find first model level above ground
+    !**************************************************
+
+     llev = 0
+     do i=1,nuvz
+       if (psurf.lt.akz(i)) llev=i
+     end do
+     llev = llev+1
+    ! sec llev should not be 1!
+     if (llev.eq.1) llev = 2
+     if (llev.gt.nuvz) llev = nuvz-1
+    ! NCEP version
+  end if
+
+
   ! Compute virtual temperature and virtual potential temperature at
   ! reference level (2 m)
@@ -95 +123 @@
   ! Integrate z up to one level above zt
   !*************************************
-
-  do k=2,nuvz
+  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+    loop_start=2
+  else
+    loop_start=llev
+  end if
+  do k=loop_start,nuvz
     pint=akz(k)+bkz(k)*psurf  ! pressure on model layers
     tv=ttlev(k)*(1.+0.608*qvlev(k))