Changeset 62e65c7 in flexpart.git


Ignore:
Timestamp:
Apr 28, 2016, 12:58:10 PM (8 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:
18adf60, 93786a1
Parents:
e4f26d1
Message:

'incloud_ratio' set to 6.2. 'maxnests' reverted to 0. Updated info messages (readspecies)

Location:
src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • src/com_mod.f90

    r05cf28d r62e65c7  
    373373!ZHG Sep 2015 
    374374!   real :: icloud_stats(0:nxmax-1,0:nymax-1,5,numwfmem)
    375    real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! eso: =icloud_stats(:,:,4,:)
     375   real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! ESO: =icloud_stats(:,:,4,:)
    376376
    377377
  • src/ecmwf_mod.f90

    r8ed5f11 r62e65c7  
    5151  !*********************************************
    5252
    53   integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
    54 !  integer,parameter :: maxnests=1,nxmaxn=86,nymaxn=31
     53  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
    5554
    5655  ! nxmax,nymax        maximum dimension of wind fields in x and y
  • src/gfs_mod.f90

    r8ed5f11 r62e65c7  
    4949  !*********************************************
    5050
    51   integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
     51  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
    5252
    5353  ! nxmax,nymax        maximum dimension of wind fields in x and y
  • src/mpi_mod.f90

    r341f4b7 r62e65c7  
    103103  logical :: lmp_use_reader=.false. ! true if separate readwind process is used
    104104
    105 ! true if only using synchronous MPI send/recv:
     105! .true. if only using synchronous MPI send/recv (default)
    106106! If setting this to .false., numwfmem must be set to 3
    107107!===============================================================================
     
    208208!*********************************************
    209209
    210     if (.not.lmp_sync.and.numwfmem.ne.3.and.lroot) then
    211       write(*,FMT='(80("#"))')
    212       write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
    213            & 'numwfmem must be set to 3 for asyncronous reading ####'
    214       write(*,FMT='(80("#"))')
     210    if (.not.lmp_sync.and.numwfmem.ne.3) then
     211      if (lroot) then
     212        write(*,FMT='(80("#"))')
     213        write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
     214             & 'numwfmem must be set to 3 for asyncronous reading ####'
     215        write(*,FMT='(80("#"))')
     216      end if
     217      call MPI_FINALIZE(mp_ierr)
    215218      stop
    216219    else if (lmp_sync.and.numwfmem.ne.2.and.lroot) then
     
    218221      write(*,*) '#### mpi_mod::mpif_init> WARNING: ', &
    219222           & 'numwfmem should be set to 2 for syncronous'
    220       write(*,*) ' reading. Results will still be valid, but unneccesary '
    221       write(*,*) 'amount of memory is being allocated.'
     223      write(*,*) ' reading. Results will still be valid, but unneccesary memory &
     224           &is allocated.'
    222225      write(*,FMT='(80("#"))')
    223226! Force "syncronized" version if all processes will call getfields
  • src/par_mod.f90

    r05cf28d r62e65c7  
    8989  real,parameter :: rho_water=1000. !ZHG 2015 [kg/m3]
    9090  !ZHG MAR2016
    91   real,parameter :: incloud_ratio=2.2
     91  real,parameter :: incloud_ratio=6.2
    9292
    9393  ! karman                  Karman's constant
     
    186186  !**************************************************
    187187
    188   integer,parameter :: maxpart=1000000
    189   integer,parameter :: maxspec=1
     188  integer,parameter :: maxpart=20000000
     189  integer,parameter :: maxspec=6
    190190  real,parameter :: minmass=0.0001
    191191
  • src/readpaths.f90

    r5f9d14a r62e65c7  
    8282
    8383  do i=1,maxnests
    84     read(unitpath,'(a)') path(numpath+2*(i-1)+1)
    85     read(unitpath,'(a)') path(numpath+2*(i-1)+2)
     84  ! ESO 2016 Added 'end'/'err' in case user forgot '====' at end of file and
     85  ! maxnests > numbnests
     86    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+1)
     87    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+2)
    8688    if (path(numpath+2*(i-1)+1)(1:5).eq.'=====') goto 30
    8789    length(numpath+2*(i-1)+1)=index(path(numpath+2*(i-1)+1),' ')-1
  • src/readspecies.f90

    r05cf28d r62e65c7  
    223223
    224224  if (lroot) then
     225! ZHG 2016.04.07 Start of changes
     226    write(*,*) ' '
     227    if (dquer(pos_spec) .gt.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
     228         &id_spec,'  ', species(pos_spec),'  (AEROSOL) '
     229    if (dquer(pos_spec) .le.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
     230         &id_spec,'  ', species(pos_spec),'  (GAS) '
     231
    225232! Particles
    226233!**********
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG