Renamed lnokernel, corrected default setting.

src/FLEXPART.f90

@@ -419,7 +419,7 @@ program flexpart
   ! Inform whether output kernel is used or not
   !*********************************************
   if (lroot) then
-    if (lnokernel) then
+    if (.not.lusekerneloutput) then
       write(*,*) "Concentrations are calculated without using kernel"
     else
       write(*,*) "Concentrations are calculated using kernel"

src/FLEXPART_MPI.f90

@@ -452,7 +452,7 @@ program flexpart
   !*********************************************
 
   if (lroot) then
-    if (lnokernel) then
+    if (.not.lusekerneloutput) then
       write(*,*) "Concentrations are calculated without using kernel"
     else
       write(*,*) "Concentrations are calculated using kernel"

src/com_mod.f90

@@ -758,8 +758,8 @@ module com_mod
   integer :: mpi_mode=0 ! .gt. 0 if running MPI version
   logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
   
-  logical :: interpolhmix=.false. ! true if the hmix shall be interpolated
-  logical :: turboff=.false.       ! true if the turbulence shall be switched off
+  logical, parameter :: interpolhmix=.false. ! true if the hmix shall be interpolated
+  logical, parameter :: turboff=.false.       ! true if the turbulence shall be switched off
   
   
 contains

src/conccalc.f90

@@ -186,7 +186,8 @@ subroutine conccalc(itime,weight)
   ! If a particle is close to the domain boundary, do not use the kernel either.
   !*****************************************************************************
 
-      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
         if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
@@ -332,7 +333,8 @@ subroutine conccalc(itime,weight)
 
         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
             if (DRYBKDEP.or.WETBKDEP) then

src/conccalc_mpi.f90

@@ -199,7 +199,8 @@ subroutine conccalc(itime,weight)
   ! If a particle is close to the domain boundary, do not use the kernel either.
   !*****************************************************************************
 
-      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
         if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
@@ -347,7 +348,8 @@ subroutine conccalc(itime,weight)
 
         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)) 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
             if (DRYBKDEP.or.WETBKDEP) then

src/drydepokernel.f90

@@ -82,7 +82,7 @@ subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
   ! If no kernel is used, direct attribution to grid cell
   !******************************************************
 
-  if (lnokernel) then
+  if (.not.lusekerneloutput) then
     do ks=1,nspec
       if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
         if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &

src/makefile

@@ -47,9 +47,8 @@ FLEXPART-SERIAL = FLEXPART
 
 
 ifeq ($(gcc), 4.9)
-# Compiled libraries under users ~flexpart, gfortran v4.9
+# Compiled libraries under user ~flexpart, gfortran v4.9
 	ROOT_DIR = /homevip/flexpart/
-#	ROOT_DIR = /homevip/espen/
 
 	F90	  = ${ROOT_DIR}/gcc-4.9.1/bin/gfortran
 	MPIF90    = ${ROOT_DIR}/bin/mpifort
@@ -58,6 +57,17 @@ ifeq ($(gcc), 4.9)
 	INCPATH2  = ${ROOT_DIR}/include
 	LIBPATH1 = ${ROOT_DIR}/lib
 
+else ifeq ($(gcc), 5.4)
+# Compiled libraries under user ~flexpart, gfortran v5.4
+	ROOT_DIR = /homevip/flexpart/
+
+	F90	  = /usr/bin/gfortran
+	MPIF90    = /usr/bin/mpifort
+
+	INCPATH1  = ${ROOT_DIR}/gcc-5.4.0/include	
+	INCPATH2  = /usr/include
+	LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
+
 else
 # Default: System libraries at NILU, gfortran v4.6
 	F90       = /usr/bin/gfortran

src/par_mod.f90

@@ -54,10 +54,10 @@ module par_mod
   integer,parameter :: dep_prec=sp
 
   !****************************************************************
-  ! Set to T to disable use of kernel for concentrations/deposition
+  ! Set to F to disable use of kernel for concentrations/deposition
   !****************************************************************
 
-  logical, parameter :: lnokernel=.true.
+  logical, parameter :: lusekerneloutput=.true.
 
   !*********************************************************************
   ! Set to T to change output units to number of particles per grid cell

src/timemanager.f90

@@ -151,7 +151,7 @@ subroutine timemanager(metdata_format)
   ! print*, 'Initialized lifetime'
 !CGZ-lifetime: set lifetime to 0
   
-  if (lnokernel) write(*,*) 'Not using the kernel'
+  if (.not.lusekerneloutput) write(*,*) 'Not using the kernel'
   if (turboff) write(*,*) 'Turbulence switched off'
 
   write(*,46) float(itime)/3600,itime,numpart

src/wetdepokernel.f90

@@ -79,7 +79,7 @@ subroutine wetdepokernel(nunc,deposit,x,y,nage,kp)
   ! If no kernel is used, direct attribution to grid cell
   !******************************************************
 
-  if (lnokernel) then
+  if (.not.lusekerneloutput) then
     do ks=1,nspec
       if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
            (jy.le.numygrid-1)) then