Changeset bb579a9 in flexpart.git for src/calcmatrix.f90

Timestamp:

Sep 13, 2017, 11:55:16 AM (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:

08a38b5

Parents:

aa8c34a (diff), dd6a4aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ctbto' into dev

File:

• src/calcmatrix.f90 (modified) (5 diffs)

src/calcmatrix.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine calcmatrix(lconv,delt,cbmf)
+subroutine calcmatrix(lconv,delt,cbmf,metdata_format)
   !                        o    i    o
   !*****************************************************************************
@@ -30 +30 @@
   !  Petra Seibert, Bernd C. Krueger, 2000-2001                                *
   !                                                                            *
+  !*****************************************************************************
+  ! Changes:                                                                   *
   !  changed by C. Forster, November 2003 - February 2004                      *
   !  array fmassfrac(nconvlevmax,nconvlevmax) represents                       *
   !  the convective redistribution matrix for the particles                    *
   !                                                                            *
+  !   Unified ECMWF and GFS builds                                             *
+  !   Marian Harustak, 12.5.2017                                               *
+  !     - Merged calcmatrix and calcmatrix_gfs into one routine using if-then  *
+  !       for meteo-type dependent code                                        *
+  !*****************************************************************************
+  !                                                                            *
   !  lconv        indicates whether there is convection in this cell, or not   *
   !  delt         time step for convection [s]                                 *
   !  cbmf         cloud base mass flux                                         *
+  !  metdata_format format of metdata (ecmwf/gfs)                              *
   !                                                                            *
   !*****************************************************************************
@@ -43 +52 @@
   use com_mod
   use conv_mod
+  use class_gribfile
 
   implicit none
 
   real :: rlevmass,summe
+  integer :: metdata_format
 
   integer :: iflag, k, kk, kuvz
@@ -77 +88 @@
   do kuvz = 2,nuvz
     k = kuvz-1
+    if (metdata_format.eq.GRIBFILE_CENTRE_ECMWF) then
     pconv(k) = (akz(kuvz) + bkz(kuvz)*psconv)
     phconv(kuvz) = (akm(kuvz) + bkm(kuvz)*psconv)
+    else
+      phconv(kuvz) =  0.5*(pconv(kuvz)+pconv(k))
+    endif
     dpr(k) = phconv(k) - phconv(kuvz)
     qsconv(k) = f_qvsat( pconv(k), tconv(k) )
@@ -85 +100 @@
     do kk=1,nconvlev
       fmassfrac(k,kk)=0.
-    enddo
-  enddo
+    end do
+  end do