Changeset c0884a8 in flexpart.git for src/calcpar.f90
- Timestamp:
- Jul 20, 2018, 2:40:39 PM (6 years ago)
- Branches:
- univie
- Children:
- 7ca2ef4
- Parents:
- f251e57
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/calcpar.f90
r027e844 rc0884a8 20 20 !********************************************************************** 21 21 22 subroutine calcpar(n,uuh,vvh,pvh, metdata_format)22 subroutine calcpar(n,uuh,vvh,pvh,id_centre) 23 23 ! i i i o 24 24 !***************************************************************************** … … 46 46 ! - Merged calcpar and calcpar_gfs into one routine using if-then * 47 47 ! for meteo-type dependent code * 48 !***************************************************************************** 49 48 ! * 49 ! Petra Seibert, 2018-06-26: simplified version met data format detection * 50 ! * 50 51 !***************************************************************************** 51 52 ! * … … 55 56 ! vvh * 56 57 ! pvh * 57 ! metdata_format format of metdata (ecmwf/gfs) *58 ! id_centre format of metdata (ecmwf/gfs) * 58 59 ! * 59 60 ! Constants: * … … 68 69 use par_mod 69 70 use com_mod 70 use c lass_gribfile71 use check_gribfile_mod 71 72 72 73 implicit none 73 74 74 integer :: metdata_format75 integer :: id_centre 75 76 integer :: n,ix,jy,i,kz,lz,kzmin,llev,loop_start 76 77 real :: ttlev(nuvzmax),qvlev(nuvzmax),obukhov,scalev,ol,hmixplus … … 125 126 !*********************************************** 126 127 127 if ( metdata_format.eq.GRIBFILE_CENTRE_NCEP) then128 if (id_centre.eq.icg_id_ncep) then 128 129 ! NCEP version: find first level above ground 129 130 llev = 0 … … 137 138 ! calculate inverse Obukhov length scale with tth(llev) 138 139 ol=obukhov(ps(ix,jy,1,n),tt2(ix,jy,1,n),td2(ix,jy,1,n), & 139 tth(ix,jy,llev,n),ustar(ix,jy,1,n),sshf(ix,jy,1,n),akm,bkm,akz(llev),metdata_format) 140 tth(ix,jy,llev,n),ustar(ix,jy,1,n),sshf(ix,jy,1,n), & 141 akm,bkm,akz(llev),id_centre) 140 142 else 141 143 llev=0 142 144 ol=obukhov(ps(ix,jy,1,n),tt2(ix,jy,1,n),td2(ix,jy,1,n), & 143 tth(ix,jy,2,n),ustar(ix,jy,1,n),sshf(ix,jy,1,n),akm,bkm,akzdummy,metdata_format) 145 tth(ix,jy,2,n),ustar(ix,jy,1,n),sshf(ix,jy,1,n), & 146 akm,bkm,akzdummy,id_centre) 144 147 end if 145 148 … … 161 164 end do 162 165 163 if ( metdata_format.eq.GRIBFILE_CENTRE_NCEP) then166 if (id_centre.eq.icg_id_ncep) then 164 167 ! NCEP version hmix has been read in in readwind.f, is therefore not calculated here 165 168 call richardson(ps(ix,jy,1,n),ustar(ix,jy,1,n),ttlev,qvlev, & 166 169 ulev,vlev,nuvz,akz,bkz,sshf(ix,jy,1,n),tt2(ix,jy,1,n), & 167 td2(ix,jy,1,n),hmixdummy,wstar(ix,jy,1,n),hmixplus, metdata_format)170 td2(ix,jy,1,n),hmixdummy,wstar(ix,jy,1,n),hmixplus,id_centre) 168 171 else 169 172 call richardson(ps(ix,jy,1,n),ustar(ix,jy,1,n),ttlev,qvlev, & 170 173 ulev,vlev,nuvz,akz,bkz,sshf(ix,jy,1,n),tt2(ix,jy,1,n), & 171 td2(ix,jy,1,n),hmix(ix,jy,1,n),wstar(ix,jy,1,n),hmixplus, metdata_format)174 td2(ix,jy,1,n),hmix(ix,jy,1,n),wstar(ix,jy,1,n),hmixplus,id_centre) 172 175 end if 173 176 … … 218 221 pold=ps(ix,jy,1,n) 219 222 zold=0. 220 if ( metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then223 if (id_centre.eq.icg_id_ecmwf) then 221 224 loop_start=2 222 225 else … … 242 245 !************************************************************************ 243 246 244 if ( metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then247 if (id_centre.eq.icg_id_ecmwf) then 245 248 loop_start=1 246 249 else
Note: See TracChangeset
for help on using the changeset viewer.