Changeset 1c0d5e6 in flexpart.git
- Timestamp:
- Dec 1, 2016, 12:47:22 PM (7 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 56a2e54
- Parents:
- 8ee24a5
- Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/com_mod.f90
r54cbd6c r1c0d5e6 752 752 logical :: lroot=.true. ! true if serial version, or if MPI .and. root process 753 753 754 logical :: usekernel=.false. ! true if the output kernel shall be switched on 755 754 756 contains 755 757 subroutine com_mod_allocate_part(nmpart) -
src/conccalc.f90
r92a74b2 r1c0d5e6 61 61 62 62 63 integer :: usekernel 64 65 usekernel=1 66 if (usekernel.ne.1) then 63 if (.not.usekernel) then 67 64 write (*,*) 'NOT USING THE KERNEL!' 68 65 endif … … 189 186 if (((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. & 190 187 (xl.gt.real(numxgrid-1)-0.5).or. & 191 (yl.gt.real(numygrid-1)-0.5)).or.( usekernel.eq.0)) then ! no kernel, direct attribution to grid cell188 (yl.gt.real(numygrid-1)-0.5)).or.(.not.usekernel)) then ! no kernel, direct attribution to grid cell 192 189 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & 193 190 (jy.le.numygrid-1)) then … … 326 323 if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. & 327 324 (xl.gt.real(numxgridn-1)-0.5).or. & 328 (yl.gt.real(numygridn-1)-0.5).or.( usekernel.eq.0)) then ! no kernel, direct attribution to grid cell325 (yl.gt.real(numygridn-1)-0.5).or.(.not.usekernel)) then ! no kernel, direct attribution to grid cell 329 326 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. & 330 327 (jy.le.numygridn-1)) then -
src/drydepokernel.f90
re200b7a r1c0d5e6 81 81 if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then 82 82 83 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & 83 if (.not.usekernel) then 84 drygridunc(ix,jy,ks,kp,nunc,nage)= & 85 drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks) 86 else 87 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & 84 88 (jy.le.numygrid-1)) then 85 w=wx*wy89 w=wx*wy 86 90 drygridunc(ix,jy,ks,kp,nunc,nage)= & 87 91 drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w 88 continue 89 endif 92 endif 90 93 91 if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. &94 if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. & 92 95 (jyp.le.numygrid-1)) then 93 96 w=(1.-wx)*(1.-wy) 94 97 drygridunc(ixp,jyp,ks,kp,nunc,nage)= & 95 98 drygridunc(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w 96 endif99 endif 97 100 98 if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. &101 if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. & 99 102 (jy.le.numygrid-1)) then 100 w=(1.-wx)*wy103 w=(1.-wx)*wy 101 104 drygridunc(ixp,jy,ks,kp,nunc,nage)= & 102 105 drygridunc(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w 103 endif106 endif 104 107 105 if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. &108 if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. & 106 109 (jyp.le.numygrid-1)) then 107 w=wx*(1.-wy)110 w=wx*(1.-wy) 108 111 drygridunc(ix,jyp,ks,kp,nunc,nage)= & 109 112 drygridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w 110 endif113 endif 111 114 112 endif 115 endif ! kernel 116 endif ! deposit>0 113 117 114 118 end do -
src/wetdepokernel.f90
re200b7a r1c0d5e6 79 79 do ks=1,nspec 80 80 81 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & 81 if (.not.usekernel) then 82 wetgridunc(ix,jy,ks,kp,nunc,nage)= & 83 wetgridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks) 84 else 85 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. & 82 86 (jy.le.numygrid-1)) then 83 w=wx*wy87 w=wx*wy 84 88 wetgridunc(ix,jy,ks,kp,nunc,nage)= & 85 89 wetgridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w 86 endif90 endif 87 91 88 if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. &92 if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. & 89 93 (jyp.le.numygrid-1)) then 90 w=(1.-wx)*(1.-wy)94 w=(1.-wx)*(1.-wy) 91 95 wetgridunc(ixp,jyp,ks,kp,nunc,nage)= & 92 96 wetgridunc(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w 93 endif97 endif 94 98 95 if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. &99 if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. & 96 100 (jy.le.numygrid-1)) then 97 w=(1.-wx)*wy101 w=(1.-wx)*wy 98 102 wetgridunc(ixp,jy,ks,kp,nunc,nage)= & 99 103 wetgridunc(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w 100 endif104 endif 101 105 102 if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. &106 if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. & 103 107 (jyp.le.numygrid-1)) then 104 w=wx*(1.-wy)108 w=wx*(1.-wy) 105 109 wetgridunc(ix,jyp,ks,kp,nunc,nage)= & 106 110 wetgridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w 107 endif 111 endif 112 endif 108 113 end do 109 114
Note: See TracChangeset
for help on using the changeset viewer.