Changeset de4c5e9 in flexpart.git for src


Ignore:
Timestamp:
Oct 5, 2017, 9:09:23 AM (2 years ago)
Author:
Espen Sollum ATMOS <eso@…>
Branches:
dev, release-10, univie
Children:
7233c03
Parents:
08a38b5
Message:

Added option to output particle count per grid cell. Deleted some unused .f90 files.

Location:
src
Files:
11 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src/makefile

    rd8eed02 rde4c5e9  
    6464        MPIF90    = /usr/bin/mpif90.openmpi
    6565
    66         INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
     66        INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
    6767        INCPATH2 = /usr/include
    68         LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
     68        LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
    6969endif
    7070
  • src/par_mod.f90

    r08a38b5 rde4c5e9  
    5858  !****************************************************************
    5959
    60   logical, parameter :: lnokernel=.false.
     60  logical, parameter :: lnokernel=.true.
    6161
    6262  !*********************************************************************
     
    218218  !**************************************************
    219219
    220   integer,parameter :: maxpart=3000000
    221   integer,parameter :: maxspec=4
     220  integer,parameter :: maxpart=300000000
     221  integer,parameter :: maxspec=1
    222222
    223223  real,parameter :: minmass=0.0001
  • src/verttransform_ecmwf.f90

    r6ecb30a rde4c5e9  
    5353! Marian Harustak, 12.5.2017
    5454!     - Renamed from verttransform to verttransform_ecmwf
    55 !
     55!*****************************************************************************
     56! Date: 2017-05-30 modification of a bug in ew. Don Morton (CTBTO project)   *
    5657!*****************************************************************************
    5758!                                                                            *
     
    9697
    9798  logical :: init = .true.
     99  logical :: init_w = .false.
     100  logical :: init_r = .true.
     101
    98102
    99103  !ZHG SEP 2014 tests 
     
    108112  ! CHARACTER(LEN=3)  :: aspec
    109113  ! integer :: virr=0
    110   real :: tot_cloud_h
    111   real :: dbg_height(nzmax)
     114  !real :: tot_cloud_h
     115  !real :: dbg_height(nzmax)
    112116!ZHG
    113117
     
    128132  if (init) then
    129133
     134
     135    if (init_r) then
     136
     137        open(333,file='heights.txt', &
     138          form='formatted')
     139        do kz=1,nuvz
     140            read(333,*) height(kz)
     141        end do
     142        close(333)
     143        write(*,*) 'height read'
     144    else
     145
     146
    130147! Search for a point with high surface pressure (i.e. not above significant topography)
    131148! Then, use this point to construct a reference z profile, to be used at all times
     
    166183    end do
    167184
     185    if (init_w) then
     186        open(333,file='heights.txt', &
     187          form='formatted')
     188        do kz=1,nuvz
     189              write(333,*) height(kz)
     190        end do
     191        close(333)
     192    endif
     193
     194    endif ! init
    168195
    169196! Determine highest levels that can be within PBL
     
    183210    init=.false.
    184211
    185     dbg_height = height
     212!    dbg_height = height
    186213
    187214  endif
     
    603630        convp=convprec(ix,jy,1,n)
    604631        prec=lsp+convp
    605         tot_cloud_h=0
     632!        tot_cloud_h=0
    606633! Find clouds in the vertical
    607634        do kz=1, nz-1 !go from top to bottom
     
    609636! assuming rho is in kg/m3 and hz in m gives: kg/kg * kg/m3 *m3/kg /m = m2/m3
    610637            clw(ix,jy,kz,n)=(clwc(ix,jy,kz,n)*rho(ix,jy,kz,n))*(height(kz+1)-height(kz))
    611             tot_cloud_h=tot_cloud_h+(height(kz+1)-height(kz))
     638!            tot_cloud_h=tot_cloud_h+(height(kz+1)-height(kz))
    612639           
    613640!            icloud_stats(ix,jy,4,n)= icloud_stats(ix,jy,4,n)+clw(ix,jy,kz,n)          ! Column cloud water [m3/m3]
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG