Changeset 2bec33e in flexpart.git


Ignore:
Timestamp:
May 8, 2017, 5:32:48 PM (2 years ago)
Author:
Sabine <sabine.eckhardt@…>
Branches:
dev, release-10, univie
Children:
6d420c3
Parents:
6985a98
Message:

resolved kernel merge: removed all uskernel

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/com_mod.f90

    r6985a98 r2bec33e  
    756756  logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
    757757 
    758   logical :: usekernel=.false.    ! true if the output kernel shall be switched on
    759758  logical :: interpolhmix=.false. ! true if the hmix shall be interpolated
    760759  logical :: turboff=.false.       ! true if the turbulence shall be switched off
  • src/conccalc.f90

    r6985a98 r2bec33e  
    183183      if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    184184           (xl.gt.real(numxgrid-1)-0.5).or. &
    185            (yl.gt.real(numygrid-1)-0.5))) then             ! no kernel, direct attribution to grid cell
     185           (yl.gt.real(numygrid-1)-0.5)) then             ! no kernel, direct attribution to grid cell
    186186        if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
    187187             (jy.le.numygrid-1)) then
     
    320320        if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    321321             (xl.gt.real(numxgridn-1)-0.5).or. &
    322              (yl.gt.real(numygridn-1)-0.5).or.(.not.usekernel)) then             ! no kernel, direct attribution to grid cell
     322             (yl.gt.real(numygridn-1)-0.5).or.(lnokernel)) then             ! no kernel, direct attribution to grid cell
    323323          if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
    324324               (jy.le.numygridn-1)) then
  • src/drydepokernel.f90

    r6985a98 r2bec33e  
    102102   if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
    103103
    104     if (.not.usekernel) then
    105        drygridunc(ix,jy,ks,kp,nunc,nage)= &
    106            drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
    107     else
    108104      if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
    109105        (jy.le.numygrid-1)) then
     
    134130    endif
    135131
    136     endif ! kernel
    137132    endif ! deposit>0
    138 
    139133  end do
    140134end if
  • src/timemanager.f90

    rd1a8707 r2bec33e  
    147147!CGZ-lifetime: set lifetime to 0
    148148 
    149   if (.not.usekernel) write(*,*) 'Not using the kernel'
     149  if (lnokernel) write(*,*) 'Not using the kernel'
    150150  if (turboff) write(*,*) 'Turbulence switched off'
    151151
  • src/wetdepokernel.f90

    r6985a98 r2bec33e  
    9595  do ks=1,nspec
    9696
    97   if (.not.usekernel) then
    98       wetgridunc(ix,jy,ks,kp,nunc,nage)= &
    99            wetgridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
    100   else
    10197    if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
    10298       (jy.le.numygrid-1)) then
     
    126122           wetgridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
    127123    endif
    128   endif
     124
    129125  end do
    130126  end if
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG