Changeset fe32dca in flexpart.git for src/conccalc.f90

Timestamp:

Oct 9, 2017, 11:25:07 AM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

027e844

Parents:

47f96e5

Message:

Renamed lnokernel, corrected default setting.

File:

• src/conccalc.f90 (modified) (2 diffs)

src/conccalc.f90

@@ -187 +187 @@
   !*****************************************************************************
 
-      if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
+      if ((.not.lusekerneloutput).or.(itage.lt.10800).or. &
+           (xl.lt.0.5).or.(yl.lt.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
@@ -333 +334 @@
         if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
              (xl.gt.real(numxgridn-1)-0.5).or. &
-             (yl.gt.real(numygridn-1)-0.5).or.(lnokernel)) then             ! no kernel, direct attribution to grid cell
+             (yl.gt.real(numygridn-1)-0.5).or.((.not.lusekerneloutput))) then
+! no kernel, direct attribution to grid cell
           if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
                (jy.le.numygridn-1)) then