Changeset 1c3c778 in flexpart.git


Ignore:
Timestamp:
Mar 14, 2016, 11:06:31 AM (3 years ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
dev, release-10, univie
Children:
7e52e2e
Parents:
c2162ce
Message:

Added 'incloud_ratio' for wet deposition

Location:
src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/makefile

    rdb712a8 r1c3c778  
    1111#    To use gfortran version 4.9, add "gcc=4.9" to the make command, e.g.
    1212#       'make -j ecmwf gcc=4.9',
    13 #    also set environment variable LD_LIBRARY_FLAGS=
     13#    also set environment variable LD_LIBRARY_PATH to point to compiler libraries
    1414#
    1515#  USAGE
    16 #    Compile serial FLEXPART (ECMWF)
     16#    Compile serial FLEXPART (ECMWF)a
    1717#      make [-j] ecmwf
    1818#
  • src/mpi_mod.f90

    r38b7917 r1c3c778  
    6161
    6262  use mpi
    63   use par_mod, only: dp, sp
     63  use par_mod, only: dp,sp
    6464  use com_mod, only: lroot
    6565
     
    14091409    integer :: d2s1 = nxmax*nymax
    14101410    integer :: d2s2 = nxmax*nymax*maxspec
    1411     integer :: d1_size1 = maxwf
     1411    !integer :: d1_size1 = maxwf
    14121412
    14131413!    integer :: d3s1,d3s2,d2s1,d2s2
     
    21542154
    21552155    pv(:,:,:,li:ui)=1.0
    2156     clouds(:,:,:,li:ui)=0.0
     2156    clouds(:,:,:,li:ui)=0
    21572157
    21582158    clwc(:,:,:,li:ui)=0.0
     
    21612161! 2D fields
    21622162
    2163     cloudsh(:,:,li:ui)=0.0
     2163    cloudsh(:,:,li:ui)=0
    21642164    vdep(:,:,:,li:ui)=0.0
    21652165    ps(:,:,:,li:ui)=1.0e5
  • src/par_mod.f90

    r38b7917 r1c3c778  
    8383  real,parameter :: d_trop=50., d_strat=0.1
    8484  real,parameter :: rho_water=1000. !ZHG 2015 [kg/m3]
     85  !ZHG MAR2016
     86  real,parameter :: incloud_ratio=1.6
     87
    8588  ! karman                  Karman's constant
    8689  ! href [m]                Reference height for dry deposition
     
    216219  integer,parameter :: maxpart=40000000
    217220  integer,parameter :: maxspec=1
    218   real,parameter :: minmass=0.0 !0.0001
     221  real,parameter :: minmass=0.0001
    219222
    220223  ! maxpart                 Maximum number of particles
  • src/timemanager_mpi.f90

    r7999df47 r1c3c778  
    825825! eso :TODO: this not implemented yet (transfer particles to PID 0 or rewrite)
    826826! the tools to do this are already in mpi_mod.f90
    827 ! :CUR: check this
    828827  if (lroot) then
    829828    do j=1,numpart
  • src/wetdepo.f90

    rdb712a8 r1c3c778  
    143143! Determine nested grid coordinates
    144144!**********************************
     145    readclouds_this_nest=.false.
    145146
    146147    if (ngrid.gt.0) then
     
    149150      ix=int(xtn)
    150151      jy=int(ytn)
    151       if (readclouds_nest(ngrid)) then
    152         readclouds_this_nest=.true.
    153       else
    154         readclouds_this_nest=.false.
    155       end if
     152      if (readclouds_nest(ngrid)) readclouds_this_nest=.true.
    156153    else
    157154      ix=int(xtra1(jpart))
     
    364361!OLD
    365362          if ((readclouds.and.ngrid.eq.0).or.(readclouds_this_nest.and.ngrid.gt.0)) then
    366             wetscav=S_i*(prec(1)/3.6E6)
     363            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
    367364          else
    368             wetscav=S_i*(prec(1)/3.6E6)/clouds_h
     365            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
    369366          endif
    370367
  • src/wetdepokernel_nest.f90

    rdb712a8 r1c3c778  
    5353  real :: x,y,deposit(maxspec),ddx,ddy,xl,yl,wx,wy,w
    5454  integer :: ix,jy,ixp,jyp,ks,kp,nunc,nage
    55 
    56   real :: dbg_dx, dbg_dy, dbg_xoutshiftn, dbg_youtshiftn, dbg_dxoutn, dbg_dyoutn,dbg_t
    5755
    5856  xl=(x*dx+xoutshiftn)/dxoutn
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG