Changeset fe32dca in flexpart.git


Ignore:
Timestamp:
Oct 9, 2017, 11:25:07 AM (6 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.

Location:
src
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • src/FLEXPART.f90

    rd8eed02 rfe32dca  
    420420  !*********************************************
    421421  if (lroot) then
    422     if (lnokernel) then
     422    if (.not.lusekerneloutput) then
    423423      write(*,*) "Concentrations are calculated without using kernel"
    424424    else
  • src/FLEXPART_MPI.f90

    r7233c03 rfe32dca  
    453453
    454454  if (lroot) then
    455     if (lnokernel) then
     455    if (.not.lusekerneloutput) then
    456456      write(*,*) "Concentrations are calculated without using kernel"
    457457    else
  • src/com_mod.f90

    r5184a7c rfe32dca  
    759759  logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
    760760 
    761   logical :: interpolhmix=.false. ! true if the hmix shall be interpolated
    762   logical :: turboff=.false.       ! true if the turbulence shall be switched off
     761  logical, parameter :: interpolhmix=.false. ! true if the hmix shall be interpolated
     762  logical, parameter :: turboff=.false.       ! true if the turbulence shall be switched off
    763763 
    764764 
  • src/conccalc.f90

    r08a38b5 rfe32dca  
    187187  !*****************************************************************************
    188188
    189       if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
     189      if ((.not.lusekerneloutput).or.(itage.lt.10800).or. &
     190           (xl.lt.0.5).or.(yl.lt.0.5).or. &
    190191           (xl.gt.real(numxgrid-1)-0.5).or. &
    191192           (yl.gt.real(numygrid-1)-0.5)) then             ! no kernel, direct attribution to grid cell
     
    333334        if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    334335             (xl.gt.real(numxgridn-1)-0.5).or. &
    335              (yl.gt.real(numygridn-1)-0.5).or.(lnokernel)) then             ! no kernel, direct attribution to grid cell
     336             (yl.gt.real(numygridn-1)-0.5).or.((.not.lusekerneloutput))) then
     337! no kernel, direct attribution to grid cell
    336338          if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
    337339               (jy.le.numygridn-1)) then
  • src/conccalc_mpi.f90

    r08a38b5 rfe32dca  
    200200  !*****************************************************************************
    201201
    202       if (lnokernel.or.(itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
     202      if ((.not.lusekerneloutput).or.(itage.lt.10800).or. &
     203           (xl.lt.0.5).or.(yl.lt.0.5).or. &
    203204           (xl.gt.real(numxgrid-1)-0.5).or. &
    204205           (yl.gt.real(numygrid-1)-0.5)) then             ! no kernel, direct attribution to grid cell
     
    348349        if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. &
    349350             (xl.gt.real(numxgridn-1)-0.5).or. &
    350              (yl.gt.real(numygridn-1)-0.5)) then             ! no kernel, direct attribution to grid cell
     351             (yl.gt.real(numygridn-1)-0.5).or.((.not.lusekerneloutput))) then
     352! no kernel, direct attribution to grid cell
    351353          if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
    352354               (jy.le.numygridn-1)) then
  • src/drydepokernel.f90

    r2bec33e rfe32dca  
    8383  !******************************************************
    8484
    85   if (lnokernel) then
     85  if (.not.lusekerneloutput) then
    8686    do ks=1,nspec
    8787      if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
  • src/makefile

    rde4c5e9 rfe32dca  
    4848
    4949ifeq ($(gcc), 4.9)
    50 # Compiled libraries under users ~flexpart, gfortran v4.9
     50# Compiled libraries under user ~flexpart, gfortran v4.9
    5151        ROOT_DIR = /homevip/flexpart/
    52 #       ROOT_DIR = /homevip/espen/
    5352
    5453        F90       = ${ROOT_DIR}/gcc-4.9.1/bin/gfortran
     
    5857        INCPATH2  = ${ROOT_DIR}/include
    5958        LIBPATH1 = ${ROOT_DIR}/lib
     59
     60else ifeq ($(gcc), 5.4)
     61# Compiled libraries under user ~flexpart, gfortran v5.4
     62        ROOT_DIR = /homevip/flexpart/
     63
     64        F90       = /usr/bin/gfortran
     65        MPIF90    = /usr/bin/mpifort
     66
     67        INCPATH1  = ${ROOT_DIR}/gcc-5.4.0/include       
     68        INCPATH2  = /usr/include
     69        LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
    6070
    6171else
  • src/par_mod.f90

    rde4c5e9 rfe32dca  
    5555
    5656  !****************************************************************
    57   ! Set to T to disable use of kernel for concentrations/deposition
    58   !****************************************************************
    59 
    60   logical, parameter :: lnokernel=.true.
     57  ! Set to F to disable use of kernel for concentrations/deposition
     58  !****************************************************************
     59
     60  logical, parameter :: lusekerneloutput=.true.
    6161
    6262  !*********************************************************************
  • src/timemanager.f90

    r6ecb30a rfe32dca  
    152152!CGZ-lifetime: set lifetime to 0
    153153 
    154   if (lnokernel) write(*,*) 'Not using the kernel'
     154  if (.not.lusekerneloutput) write(*,*) 'Not using the kernel'
    155155  if (turboff) write(*,*) 'Turbulence switched off'
    156156
  • src/wetdepokernel.f90

    r2bec33e rfe32dca  
    8080  !******************************************************
    8181
    82   if (lnokernel) then
     82  if (.not.lusekerneloutput) then
    8383    do ks=1,nspec
    8484      if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG