Changeset 1c0d5e6 in flexpart.git


Ignore:
Timestamp:
Dec 1, 2016, 12:47:22 PM (7 years ago)
Author:
Sabine <sabine.eckhardt@…>
Branches:
master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
Children:
56a2e54
Parents:
8ee24a5
Message:

adding logical usekernel var-also for dry and wet

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/com_mod.f90

    r54cbd6c r1c0d5e6  
    752752  logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
    753753 
     754  logical :: usekernel=.false. ! true if the output kernel shall be switched on
     755 
    754756contains
    755757  subroutine com_mod_allocate_part(nmpart)
  • src/conccalc.f90

    r92a74b2 r1c0d5e6  
    6161
    6262
    63   integer :: usekernel
    64 
    65   usekernel=1
    66   if (usekernel.ne.1) then
     63  if (.not.usekernel) then
    6764     write (*,*) 'NOT USING THE KERNEL!'
    6865  endif
     
    189186      if (((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    190187           (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 cell
     188           (yl.gt.real(numygrid-1)-0.5)).or.(.not.usekernel)) then             ! no kernel, direct attribution to grid cell
    192189        if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
    193190             (jy.le.numygrid-1)) then
     
    326323        if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    327324             (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 cell
     325             (yl.gt.real(numygridn-1)-0.5).or.(.not.usekernel)) then             ! no kernel, direct attribution to grid cell
    329326          if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
    330327               (jy.le.numygridn-1)) then
  • src/drydepokernel.f90

    re200b7a r1c0d5e6  
    8181    if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
    8282
    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. &
    8488        (jy.le.numygrid-1)) then
    85     w=wx*wy
     89       w=wx*wy
    8690      drygridunc(ix,jy,ks,kp,nunc,nage)= &
    8791           drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
    88       continue
    89   endif
     92     endif
    9093
    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. &
    9295       (jyp.le.numygrid-1)) then
    9396    w=(1.-wx)*(1.-wy)
    9497      drygridunc(ixp,jyp,ks,kp,nunc,nage)= &
    9598           drygridunc(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w
    96   endif
     99    endif
    97100
    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. &
    99102       (jy.le.numygrid-1)) then
    100     w=(1.-wx)*wy
     103      w=(1.-wx)*wy
    101104      drygridunc(ixp,jy,ks,kp,nunc,nage)= &
    102105           drygridunc(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w
    103   endif
     106    endif
    104107
    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. &
    106109       (jyp.le.numygrid-1)) then
    107     w=wx*(1.-wy)
     110      w=wx*(1.-wy)
    108111      drygridunc(ix,jyp,ks,kp,nunc,nage)= &
    109112           drygridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
    110   endif
     113    endif
    111114
    112   endif
     115    endif ! kernel
     116    endif ! deposit>0
    113117
    114118    end do
  • src/wetdepokernel.f90

    re200b7a r1c0d5e6  
    7979  do ks=1,nspec
    8080
    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. &
    8286       (jy.le.numygrid-1)) then
    83     w=wx*wy
     87      w=wx*wy
    8488      wetgridunc(ix,jy,ks,kp,nunc,nage)= &
    8589           wetgridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
    86   endif
     90    endif
    8791
    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. &
    8993       (jyp.le.numygrid-1)) then
    90     w=(1.-wx)*(1.-wy)
     94      w=(1.-wx)*(1.-wy)
    9195      wetgridunc(ixp,jyp,ks,kp,nunc,nage)= &
    9296           wetgridunc(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w
    93   endif
     97    endif
    9498
    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. &
    96100       (jy.le.numygrid-1)) then
    97     w=(1.-wx)*wy
     101      w=(1.-wx)*wy
    98102      wetgridunc(ixp,jy,ks,kp,nunc,nage)= &
    99103           wetgridunc(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w
    100   endif
     104    endif
    101105
    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. &
    103107       (jyp.le.numygrid-1)) then
    104     w=wx*(1.-wy)
     108      w=wx*(1.-wy)
    105109      wetgridunc(ix,jyp,ks,kp,nunc,nage)= &
    106110           wetgridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
    107   endif
     111    endif
     112  endif
    108113  end do
    109114
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG