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

src/obukhov.f90

@@ -20 +20 @@
 !**********************************************************************
 
-real function obukhov(ps,tsurf,tdsurf,tlev,ustar,hf,akm,bkm)
+real function obukhov(ps,tsurf,tdsurf,tlev,ustar,hf,akm,bkm,plev,metdata_format)
 
   !********************************************************************
@@ -27 +27 @@
   !                       Date:   1994-06-27                          *
   !                                                                   *
-  !  Update: A. Stohl, 2000-09-25, avoid division by zero by          *
-  !  setting ustar to minimum value                                   *
+  !     This program calculates Obukhov scale height from surface     *
+  !     meteorological data and sensible heat flux.                   *
   !                                                                   *
   !********************************************************************
   !                                                                   *
-  !     This program calculates Obukhov scale height from surface     *
-  !     meteorological data and sensible heat flux.                   *
+  !  Update: A. Stohl, 2000-09-25, avoid division by zero by          *
+  !  setting ustar to minimum value                                   *
+  !  CHANGE: 17/11/2005 Caroline Forster NCEP GFS version             *
+  !                                                                   *
+  !   Unified ECMWF and GFS builds                                    *
+  !   Marian Harustak, 12.5.2017                                      *
+  !     - Merged obukhov and obukhov_gfs into one routine using       *
+  !       if-then for meteo-type dependent code                       *
   !                                                                   *
   !********************************************************************
@@ -47 +53 @@
   !     akm     ECMWF vertical discretization parameter               *
   !     bkm     ECMWF vertical discretization parameter               *
+  !     plev                                                          *
+  !     metdata_format format of metdata (ecmwf/gfs)                  *
   !                                                                   *
   !********************************************************************
 
   use par_mod
+  use class_gribfile
 
   implicit none
 
+  integer :: metdata_format
   real :: akm(nwzmax),bkm(nwzmax)
   real :: ps,tsurf,tdsurf,tlev,ustar,hf,e,ew,tv,rhoa,plev
@@ -62 +72 @@
   tv=tsurf*(1.+0.378*e/ps)               ! virtual temperature
   rhoa=ps/(r_air*tv)                      ! air density
+  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
   ak1=(akm(1)+akm(2))/2.
   bk1=(bkm(1)+bkm(2))/2.
   plev=ak1+bk1*ps                        ! Pressure level 1
+  end if
   theta=tlev*(100000./plev)**(r_air/cpa) ! potential temperature
   if (ustar.le.0.) ustar=1.e-8