Commit 1c3c7787 authored by Espen Sollum's avatar Espen Sollum
Browse files

Added 'incloud_ratio' for wet deposition

parent c2162ce5
......@@ -10,10 +10,10 @@ SHELL = /bin/bash
# ("ROOT_DIR")
# To use gfortran version 4.9, add "gcc=4.9" to the make command, e.g.
# 'make -j ecmwf gcc=4.9',
# also set environment variable LD_LIBRARY_FLAGS=
# also set environment variable LD_LIBRARY_PATH to point to compiler libraries
#
# USAGE
# Compile serial FLEXPART (ECMWF)
# Compile serial FLEXPART (ECMWF)a
# make [-j] ecmwf
#
# Compile parallel FLEXPART (ECMWF)
......
......@@ -60,7 +60,7 @@ module mpi_mod
!*****************************************************************************
use mpi
use par_mod, only: dp, sp
use par_mod, only: dp,sp
use com_mod, only: lroot
implicit none
......@@ -1408,7 +1408,7 @@ contains
integer :: d3s2 = nxmax*nymax*nuvzmax
integer :: d2s1 = nxmax*nymax
integer :: d2s2 = nxmax*nymax*maxspec
integer :: d1_size1 = maxwf
!integer :: d1_size1 = maxwf
! integer :: d3s1,d3s2,d2s1,d2s2
!*******************************************************************************
......@@ -2153,14 +2153,14 @@ contains
qv(:,:,:,li:ui)=1.0
pv(:,:,:,li:ui)=1.0
clouds(:,:,:,li:ui)=0.0
clouds(:,:,:,li:ui)=0
clwc(:,:,:,li:ui)=0.0
ciwc(:,:,:,li:ui)=0.0
! 2D fields
cloudsh(:,:,li:ui)=0.0
cloudsh(:,:,li:ui)=0
vdep(:,:,:,li:ui)=0.0
ps(:,:,:,li:ui)=1.0e5
sd(:,:,:,li:ui)=0.0
......
......@@ -82,6 +82,9 @@ module par_mod
real,parameter :: hmixmin=100., hmixmax=4500., turbmesoscale=0.16
real,parameter :: d_trop=50., d_strat=0.1
real,parameter :: rho_water=1000. !ZHG 2015 [kg/m3]
!ZHG MAR2016
real,parameter :: incloud_ratio=1.6
! karman Karman's constant
! href [m] Reference height for dry deposition
! konvke Relative share of kinetic energy used for parcel lifting
......@@ -215,7 +218,7 @@ module par_mod
integer,parameter :: maxpart=40000000
integer,parameter :: maxspec=1
real,parameter :: minmass=0.0 !0.0001
real,parameter :: minmass=0.0001
! maxpart Maximum number of particles
! maxspec Maximum number of chemical species per release
......
......@@ -824,7 +824,6 @@ subroutine timemanager
! eso :TODO: this not implemented yet (transfer particles to PID 0 or rewrite)
! the tools to do this are already in mpi_mod.f90
! :CUR: check this
if (lroot) then
do j=1,numpart
if (linit_cond.ge.1) call initial_cond_calc(itime,j)
......
......@@ -142,17 +142,14 @@ subroutine wetdepo(itime,ltsample,loutnext)
! Determine nested grid coordinates
!**********************************
readclouds_this_nest=.false.
if (ngrid.gt.0) then
xtn=(xtra1(jpart)-xln(ngrid))*xresoln(ngrid)
ytn=(ytra1(jpart)-yln(ngrid))*yresoln(ngrid)
ix=int(xtn)
jy=int(ytn)
if (readclouds_nest(ngrid)) then
readclouds_this_nest=.true.
else
readclouds_this_nest=.false.
end if
if (readclouds_nest(ngrid)) readclouds_this_nest=.true.
else
ix=int(xtra1(jpart))
jy=int(ytra1(jpart))
......@@ -363,9 +360,9 @@ subroutine wetdepo(itime,ltsample,loutnext)
! scavenging coefficient based on Hertel et al 1995 - using the S_i for either gas or aerosol
!OLD
if ((readclouds.and.ngrid.eq.0).or.(readclouds_this_nest.and.ngrid.gt.0)) then
wetscav=S_i*(prec(1)/3.6E6)
wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
else
wetscav=S_i*(prec(1)/3.6E6)/clouds_h
wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
endif
......
......@@ -53,8 +53,6 @@ subroutine wetdepokernel_nest(nunc,deposit,x,y,nage,kp)
real :: x,y,deposit(maxspec),ddx,ddy,xl,yl,wx,wy,w
integer :: ix,jy,ixp,jyp,ks,kp,nunc,nage
real :: dbg_dx, dbg_dy, dbg_xoutshiftn, dbg_youtshiftn, dbg_dxoutn, dbg_dyoutn,dbg_t
xl=(x*dx+xoutshiftn)/dxoutn
yl=(y*dy+youtshiftn)/dyoutn
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment