Changeset 7999df47 in flexpart.git for src


Ignore:
Timestamp:
Mar 8, 2016, 3:28:18 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:
c2162ce
Parents:
9b53903
Message:

For parallel domain-filling version, changed info written to screen more consistent with serial version

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/boundcond_domainfill_mpi.f90

    r38b7917 r7999df47  
    589589! :TODO: eso parallelize
    590590  if ((ipout.gt.0).and.(itime.eq.loutend)) then
    591     open(unitboundcond,file=path(2)(1:length(2))//'boundcond.bin', &
    592          form='unformatted')
    593     write(unitboundcond) numcolumn_we,numcolumn_sn, &
    594          zcolumn_we,zcolumn_sn,acc_mass_we,acc_mass_sn
    595     close(unitboundcond)
     591    if (lroot) then
     592      open(unitboundcond,file=path(2)(1:length(2))//'boundcond.bin', &
     593           form='unformatted')
     594      write(unitboundcond) numcolumn_we,numcolumn_sn, &
     595           zcolumn_we,zcolumn_sn,acc_mass_we,acc_mass_sn
     596      close(unitboundcond)
     597    end if
    596598  endif
    597599
  • src/init_domainfill.f90

    r38b7917 r7999df47  
    293293  end do
    294294
    295   write(*,*) 'init_domainfill> ncolumn: ', ncolumn
    296   write(*,*) 'init_domainfill> numcolumn: ', numcolumn
    297   write(*,*) 'init_domainfill> ny_sn(1),ny_sn(2): ', ny_sn(1),ny_sn(2)
    298   write(*,*) 'init_domainfill> nx_we(1),nx_we(2): ', nx_we(1),nx_we(2)
    299 
    300295
    301296! Check whether numpart is really smaller than maxpart
  • src/init_domainfill_mpi.f90

    r9b53903 r7999df47  
    181181    ylat=ylat0+real(jy)*dy
    182182    do ix=nx_we(1),nx_we(2)      ! loop about longitudes
    183       ncolumn=nint(0.999*real(npart(1))*colmass(ix,jy)/ &
     183      ncolumn=nint(0.999*real(npart(1)/mp_partgroup_np)*colmass(ix,jy)/ &
    184184           colmasstotal)
    185185      if (ncolumn.eq.0) goto 30
     
    341341
    342342  fractus=real(numcolumn)/real(nz)
    343   write(*,*) 'Total number of particles at model start: ',numpart
    344   write(*,*) 'Maximum number of particles per column: ',numcolumn
    345   write(*,*) 'If ',fractus,' <1, better use more particles'
     343  write(*,*) 'Total number of particles at model start: ',numpart*mp_partgroup_np
     344  write(*,*) 'Maximum number of particles per column: ',numcolumn*mp_partgroup_np
     345  write(*,*) 'If ',fractus*mp_partgroup_np,' <1, better use more particles'
    346346  fractus=sqrt(max(fractus,1.))/2.
    347347
    348348  do jy=ny_sn(1),ny_sn(2)      ! loop about latitudes
    349349    do ix=nx_we(1),nx_we(2)      ! loop about longitudes
    350       ncolumn=nint(0.999/fractus*real(npart(1))*colmass(ix,jy) &
     350      ncolumn=nint(0.999/fractus*real(npart(1)/mp_partgroup_np)*colmass(ix,jy) &
    351351           /colmasstotal)
    352352      if (ncolumn.gt.maxcolumn) stop 'maxcolumn too small'
  • src/timemanager_mpi.f90

    r38b7917 r7999df47  
    118118  real :: xold,yold,zold,xmassfract
    119119  real, parameter :: e_inv = 1.0/exp(1.0)
    120 !double precision xm(maxspec,maxpointspec_act),
    121 !    +                 xm_depw(maxspec,maxpointspec_act),
    122 !    +                 xm_depd(maxspec,maxpointspec_act)
    123 
    124 !open(88,file='TEST.dat')
    125120
    126121! Measure time spent in timemanager
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG