Changes in src/richardson.f90 [6ecb30a:c2162ce] in flexpart.git

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,metdata_format)
+       akz,bkz,hf,tt2,td2,h,wst,hmixplus)
   !                        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                                       *
   !                                                                           *
@@ -48 +46 @@
   !     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                             *
   !                                                                           *
   !****************************************************************************
@@ -64 +55 @@
   ! tv                         virtual temperature                            *
   ! wst                        convective velocity scale                      *
-  ! metdata_format             format of metdata (ecmwf/gfs)                  *
   !                                                                           *
   ! Constants:                                                                *
@@ -72 +62 @@
 
   use par_mod
-  use class_gribfile
 
   implicit none
 
-  integer :: metdata_format
-  integer :: i,k,nuvz,iter,llev,loop_start
+  integer :: i,k,nuvz,iter
   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
@@ -88 +76 @@
   excess=0.0
   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
@@ -123 +95 @@
   ! Integrate z up to one level above zt
   !*************************************
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
-    loop_start=2
-  else
-    loop_start=llev
-  end if
-  do k=loop_start,nuvz
+
+  do k=2,nuvz
     pint=akz(k)+bkz(k)*psurf  ! pressure on model layers
     tv=ttlev(k)*(1.+0.608*qvlev(k))