Changeset fe32dca in flexpart.git
- Timestamp:
- Oct 9, 2017, 11:25:07 AM (6 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 027e844
- Parents:
- 47f96e5
- Location:
- src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
src/FLEXPART.f90
rd8eed02 rfe32dca 420 420 !********************************************* 421 421 if (lroot) then 422 if ( lnokernel) then422 if (.not.lusekerneloutput) then 423 423 write(*,*) "Concentrations are calculated without using kernel" 424 424 else -
src/FLEXPART_MPI.f90
r7233c03 rfe32dca 453 453 454 454 if (lroot) then 455 if ( lnokernel) then455 if (.not.lusekerneloutput) then 456 456 write(*,*) "Concentrations are calculated without using kernel" 457 457 else -
src/com_mod.f90
r5184a7c rfe32dca 759 759 logical :: lroot=.true. ! true if serial version, or if MPI .and. root process 760 760 761 logical :: interpolhmix=.false. ! true if the hmix shall be interpolated762 logical :: turboff=.false. ! true if the turbulence shall be switched off761 logical, parameter :: interpolhmix=.false. ! true if the hmix shall be interpolated 762 logical, parameter :: turboff=.false. ! true if the turbulence shall be switched off 763 763 764 764 -
src/conccalc.f90
r08a38b5 rfe32dca 187 187 !***************************************************************************** 188 188 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. & 190 191 (xl.gt.real(numxgrid-1)-0.5).or. & 191 192 (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. & 334 335 (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 336 338 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. & 337 339 (jy.le.numygridn-1)) then -
src/conccalc_mpi.f90
r08a38b5 rfe32dca 200 200 !***************************************************************************** 201 201 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. & 203 204 (xl.gt.real(numxgrid-1)-0.5).or. & 204 205 (yl.gt.real(numygrid-1)-0.5)) then ! no kernel, direct attribution to grid cell … … 348 349 if ((itage.lt.10800).or.(xl.lt.0.5).or.(yl.lt.0.5).or. & 349 350 (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 351 353 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. & 352 354 (jy.le.numygridn-1)) then -
src/drydepokernel.f90
r2bec33e rfe32dca 83 83 !****************************************************** 84 84 85 if ( lnokernel) then85 if (.not.lusekerneloutput) then 86 86 do ks=1,nspec 87 87 if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then -
src/makefile
rde4c5e9 rfe32dca 48 48 49 49 ifeq ($(gcc), 4.9) 50 # Compiled libraries under user s~flexpart, gfortran v4.950 # Compiled libraries under user ~flexpart, gfortran v4.9 51 51 ROOT_DIR = /homevip/flexpart/ 52 # ROOT_DIR = /homevip/espen/53 52 54 53 F90 = ${ROOT_DIR}/gcc-4.9.1/bin/gfortran … … 58 57 INCPATH2 = ${ROOT_DIR}/include 59 58 LIBPATH1 = ${ROOT_DIR}/lib 59 60 else 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 60 70 61 71 else -
src/par_mod.f90
rde4c5e9 rfe32dca 55 55 56 56 !**************************************************************** 57 ! Set to Tto disable use of kernel for concentrations/deposition58 !**************************************************************** 59 60 logical, parameter :: l nokernel=.true.57 ! Set to F to disable use of kernel for concentrations/deposition 58 !**************************************************************** 59 60 logical, parameter :: lusekerneloutput=.true. 61 61 62 62 !********************************************************************* -
src/timemanager.f90
r6ecb30a rfe32dca 152 152 !CGZ-lifetime: set lifetime to 0 153 153 154 if ( lnokernel) write(*,*) 'Not using the kernel'154 if (.not.lusekerneloutput) write(*,*) 'Not using the kernel' 155 155 if (turboff) write(*,*) 'Turbulence switched off' 156 156 -
src/wetdepokernel.f90
r2bec33e rfe32dca 80 80 !****************************************************** 81 81 82 if ( lnokernel) then82 if (.not.lusekerneloutput) then 83 83 do ks=1,nspec 84 84 if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
Note: See TracChangeset
for help on using the changeset viewer.