Commit 2bec33ef authored by Sabine's avatar Sabine
Browse files

resolved kernel merge: removed all uskernel

parent 6985a986
...@@ -755,7 +755,6 @@ module com_mod ...@@ -755,7 +755,6 @@ module com_mod
integer :: mpi_mode=0 ! .gt. 0 if running MPI version integer :: mpi_mode=0 ! .gt. 0 if running MPI version
logical :: lroot=.true. ! true if serial version, or if MPI .and. root process logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
logical :: usekernel=.false. ! true if the output kernel shall be switched on
logical :: interpolhmix=.false. ! true if the hmix shall be interpolated logical :: interpolhmix=.false. ! true if the hmix shall be interpolated
logical :: turboff=.false. ! true if the turbulence shall be switched off logical :: turboff=.false. ! true if the turbulence shall be switched off
......
...@@ -182,7 +182,7 @@ subroutine conccalc(itime,weight) ...@@ -182,7 +182,7 @@ subroutine conccalc(itime,weight)
if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. & if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
(xl.gt.real(numxgrid-1)-0.5).or. & (xl.gt.real(numxgrid-1)-0.5).or. &
(yl.gt.real(numygrid-1)-0.5))) then ! no kernel, direct attribution to grid cell (yl.gt.real(numygrid-1)-0.5)) then ! no kernel, direct attribution to grid cell
if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
(jy.le.numygrid-1)) then (jy.le.numygrid-1)) then
if (DRYBKDEP.or.WETBKDEP) then if (DRYBKDEP.or.WETBKDEP) then
...@@ -319,7 +319,7 @@ subroutine conccalc(itime,weight) ...@@ -319,7 +319,7 @@ subroutine conccalc(itime,weight)
if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. & if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
(xl.gt.real(numxgridn-1)-0.5).or. & (xl.gt.real(numxgridn-1)-0.5).or. &
(yl.gt.real(numygridn-1)-0.5).or.(.not.usekernel)) then ! no kernel, direct attribution to grid cell (yl.gt.real(numygridn-1)-0.5).or.(lnokernel)) then ! no kernel, direct attribution to grid cell
if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. & if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
(jy.le.numygridn-1)) then (jy.le.numygridn-1)) then
if (DRYBKDEP.or.WETBKDEP) then if (DRYBKDEP.or.WETBKDEP) then
......
...@@ -101,10 +101,6 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp) ...@@ -101,10 +101,6 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
if (.not.usekernel) then
drygridunc(ix,jy,ks,kp,nunc,nage)= &
drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
else
if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
(jy.le.numygrid-1)) then (jy.le.numygrid-1)) then
w=wx*wy w=wx*wy
...@@ -133,9 +129,7 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp) ...@@ -133,9 +129,7 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
drygridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w drygridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
endif endif
endif ! kernel
endif ! deposit>0 endif ! deposit>0
end do end do
end if end if
......
...@@ -146,7 +146,7 @@ subroutine timemanager ...@@ -146,7 +146,7 @@ subroutine timemanager
! print*, 'Initialized lifetime' ! print*, 'Initialized lifetime'
!CGZ-lifetime: set lifetime to 0 !CGZ-lifetime: set lifetime to 0
if (.not.usekernel) write(*,*) 'Not using the kernel' if (lnokernel) write(*,*) 'Not using the kernel'
if (turboff) write(*,*) 'Turbulence switched off' if (turboff) write(*,*) 'Turbulence switched off'
write(*,46) float(itime)/3600,itime,numpart write(*,46) float(itime)/3600,itime,numpart
......
...@@ -94,10 +94,6 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp) ...@@ -94,10 +94,6 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp)
do ks=1,nspec do ks=1,nspec
if (.not.usekernel) then
wetgridunc(ix,jy,ks,kp,nunc,nage)= &
wetgridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
else
if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
(jy.le.numygrid-1)) then (jy.le.numygrid-1)) then
w=wx*wy w=wx*wy
...@@ -125,7 +121,7 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp) ...@@ -125,7 +121,7 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp)
wetgridunc(ix,jyp,ks,kp,nunc,nage)= & wetgridunc(ix,jyp,ks,kp,nunc,nage)= &
wetgridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w wetgridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
endif endif
endif
end do end do
end if end if
......
Supports Markdown
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