Changeset c0884a8 in flexpart.git for src/richardson.f90

Timestamp:

Jul 20, 2018, 2:40:39 PM (6 years ago)

Author:

pesei <petra seibert at univie ac at>

Branches:

univie

Children:

7ca2ef4

Parents:

f251e57

Message:

replace CTBTO code for checking type of GRIB

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,id_centre)
   !                        i    i    i     i    i    i    i
   ! i   i  i   i   i  o  o     o
@@ -41 +41 @@
   !     Meteor. 81, 245-269.                                                  *
   !                                                                           *
+  !                                                                           *
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection  *
+  !                                                                           *
   !****************************************************************************
   !                                                                           *
@@ -55 +58 @@
   !       - Merged richardson and richardson_gfs into one routine using       *
   !         if-then for meteo-type dependent code                             *
+  !                                                                           *
+  !                                                                           *
+  !  Petra Seibert, 2018-06-26: simplified version met data format detection  *
   !                                                                           *
   !****************************************************************************
@@ -64 +70 @@
   ! tv                         virtual temperature                            *
   ! wst                        convective velocity scale                      *
-  ! metdata_format             format of metdata (ecmwf/gfs)                  *
+  ! id_centre                  format of metdata (ecmwf/gfs)                  *
   !                                                                           *
   ! Constants:                                                                *
@@ -72 +78 @@
 
   use par_mod
-  use class_gribfile
+  use check_gribfile_mod
 
   implicit none
 
-  integer :: metdata_format
+  integer :: id_centre
   integer :: i,k,nuvz,iter,llev,loop_start
   real :: tv,tvold,zref,z,zold,pint,pold,theta,thetaref,ri
@@ -89 +95 @@
   iter=0
 
-  if (metdata_format.eq.GRIBFILE_CENTRE_NCEP) then
+  if (id_centre.eq.icg_id_ncep) then
     ! NCEP version: find first model level above ground
     !**************************************************
@@ -123 +129 @@
   ! Integrate z up to one level above zt
   !*************************************
-  if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
+  if (id_centre.eq.icg_id_ecmwf) then
     loop_start=2
   else