Changeset 6ecb30a in flexpart.git for src/calcmatrix.f90
- Timestamp:
- Aug 17, 2017, 4:39:17 PM (7 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 5b34509
- Parents:
- 61e07ba
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/calcmatrix.f90
re200b7a r6ecb30a 20 20 !********************************************************************** 21 21 22 subroutine calcmatrix(lconv,delt,cbmf )22 subroutine calcmatrix(lconv,delt,cbmf,metdata_format) 23 23 ! o i o 24 24 !***************************************************************************** … … 30 30 ! Petra Seibert, Bernd C. Krueger, 2000-2001 * 31 31 ! * 32 !***************************************************************************** 33 ! Changes: * 32 34 ! changed by C. Forster, November 2003 - February 2004 * 33 35 ! array fmassfrac(nconvlevmax,nconvlevmax) represents * 34 36 ! the convective redistribution matrix for the particles * 35 37 ! * 38 ! Unified ECMWF and GFS builds * 39 ! Marian Harustak, 12.5.2017 * 40 ! - Merged calcmatrix and calcmatrix_gfs into one routine using if-then * 41 ! for meteo-type dependent code * 42 !***************************************************************************** 43 ! * 36 44 ! lconv indicates whether there is convection in this cell, or not * 37 45 ! delt time step for convection [s] * 38 46 ! cbmf cloud base mass flux * 47 ! metdata_format format of metdata (ecmwf/gfs) * 39 48 ! * 40 49 !***************************************************************************** … … 43 52 use com_mod 44 53 use conv_mod 54 use class_gribfile 45 55 46 56 implicit none 47 57 48 58 real :: rlevmass,summe 59 integer :: metdata_format 49 60 50 61 integer :: iflag, k, kk, kuvz … … 77 88 do kuvz = 2,nuvz 78 89 k = kuvz-1 90 if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then 79 91 pconv(k) = (akz(kuvz) + bkz(kuvz)*psconv) 80 92 phconv(kuvz) = (akm(kuvz) + bkm(kuvz)*psconv) 93 else 94 phconv(kuvz) = 0.5*(pconv(kuvz)+pconv(k)) 95 endif 81 96 dpr(k) = phconv(k) - phconv(kuvz) 82 97 qsconv(k) = f_qvsat( pconv(k), tconv(k) )
Note: See TracChangeset
for help on using the changeset viewer.