From 18d6f718f832c2943d22eb6845ff0d48a529750d Mon Sep 17 00:00:00 2001
From: Heiko Klein <heiko.klein@met.no>
Date: Thu, 18 Jan 2018 13:20:15 +0100
Subject: [PATCH] increase readability of drydep2

---
 src/common/drydep2.f          | 29 ++++++++++++++---------------
 utils/SnapPy/debian/changelog | 12 ++++++++++++
 utils/SnapPy/debpkg.sh        |  2 +-
 utils/SnapPy/setup.py         |  2 +-
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/common/drydep2.f b/src/common/drydep2.f
index 8f19dfc0..b53615af 100644
--- a/src/common/drydep2.f
+++ b/src/common/drydep2.f
@@ -72,31 +72,30 @@ subroutine drydep2(tstep,n)
         totinp=totinp+dble(pdata(n)%rad)
 c################################################################
        m= icomp(n)
-c######	if(kdrydep(m).eq.1 .and. pdata(n)%z.lt.pdata(n)%tbl) then
-cjb	if(kdrydep(m).eq.1 .and. pdata(n)%z.gt.pdata(n)%tbl) then
+c#### 30m = surface-layer (deposition-layer); sigma(hybrid)=0.996 ~ 30m
        if(kdrydep(m).eq.1 .and. pdata(n)%z.gt. 0.996) then
-cjb	  h=pdata(n)%hbl
          h=30.0
-c..gravityms=pdata(n)%grv
 cjb...23.04.12... difference between particle and gas
 c
          if(radiusmym(m) .le. 0.05) then
-           deprate= 1.0-exp(-tstep*(0.008)/h)	!gas
+           ! gas
+           deprate= 1.0-exp(-tstep*(0.008)/h)	
+         else if (radiusmym(m) .le. 10.0) then
+           ! particle 0.05<r<10
+           deprate= 1.0-exp(-tstep*(0.002)/h)	
+         else
+           ! particle r>=10                                   
+           deprate= 1.0-exp(-tstep*(0.002+pdata(n)%grv)/h)	
+           ! complete deposition when particle hits ground
+           if (pdata(n)%z .eq. vlevel(1)) deprate = 1.
          endif
-         if(radiusmym(m) .gt. 0.05 .and. radiusmym(m) .le. 10.0) then
-           deprate= 1.0-exp(-tstep*(0.002)/h)	!particle 0.05<r<10
-         endif
-         if(radiusmym(m) .gt. 10.0) then
-           deprate= 1.0-exp(-tstep*(0.002+pdata(n)%grv)/h)	!particle r>10
-           if (pdata(n)%z .eq. vlevel(1)) deprate = 1.  ! complete deposition when particle hits ground
-         endif
-          dep=deprate*pdata(n)%rad
-          pdata(n)%rad=pdata(n)%rad-dep
+         dep=deprate*pdata(n)%rad
+         pdata(n)%rad=pdata(n)%rad-dep
          i=nint(pdata(n)%x)
          j=nint(pdata(n)%y)
          mm=iruncomp(m)
 !$omp atomic
-          depdry(i,j,mm)=depdry(i,j,mm)+dble(dep)
+         depdry(i,j,mm)=depdry(i,j,mm)+dble(dep)
 c################################################################
          if(hblmin.gt.h) hblmin=h
          if(hblmax.lt.h) hblmax=h
diff --git a/utils/SnapPy/debian/changelog b/utils/SnapPy/debian/changelog
index 7a91977f..88a34417 100644
--- a/utils/SnapPy/debian/changelog
+++ b/utils/SnapPy/debian/changelog
@@ -1,3 +1,15 @@
+snap-py (1.6.5-1) xenial; urgency=medium
+
+  * initial upload
+
+ -- Heiko Klein <heikok@pc4631.pc.met.no>  Mon, 18 Dec 2017 13:27:55 +0100
+
+snap-py (1.6.4-1) xenial; urgency=medium
+
+  * initial upload
+
+ -- Heiko Klein <heikok@pc4631.pc.met.no>  Mon, 18 Dec 2017 11:52:26 +0100
+
 snap-py (1.6.3-1) xenial; urgency=medium
 
   * initial upload
diff --git a/utils/SnapPy/debpkg.sh b/utils/SnapPy/debpkg.sh
index 2a054c71..7aae6bb9 100644
--- a/utils/SnapPy/debpkg.sh
+++ b/utils/SnapPy/debpkg.sh
@@ -1,5 +1,5 @@
 # results appear under dist
-VERSION=1.6.3
+VERSION=1.6.5
 dch -v ${VERSION}-1 -U "initial upload"
 dch -r ''
 VERSION=$VERSION python3 setup.py sdist
diff --git a/utils/SnapPy/setup.py b/utils/SnapPy/setup.py
index 1c110d3c..cdbbd209 100644
--- a/utils/SnapPy/setup.py
+++ b/utils/SnapPy/setup.py
@@ -29,7 +29,7 @@
       author='Heiko Klein',
       author_email='Heiko.Klein@met.no',
       url='https://gitlab.met.no/emep/snap',
-      packages=['Snappy', 'Snappy.EEMEP'],
+      packages=['Snappy', 'Snappy.EEMEP', 'METNO'],
       package_dir={'Snappy': 'Snappy',
                    'Snappy.EEMEP': 'Snappy/EEMEP'},
       package_data={'Snappy': ['resources/*'],