Changeset 94bb383 in flexpart.git


Ignore:
Timestamp:
May 9, 2016, 9:54:04 AM (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:
06f094f
Parents:
1a04fab (diff), 18adf60 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'wetdep' into dev

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/advance.f90

    rfdc0f03 r18adf60  
    493493
    494494      if (mdomainfill.eq.0) then
    495         do nsp=1,nspec
    496           if (xmass(nrelpoint,nsp).gt.eps2) goto 887
    497         end do
    498 887     nsp=min(nsp,nspec)
    499 !!$        if (density(nsp).gt.0.) &
    500 !!$             call get_settling(itime,xts,yts,zt,nsp,settling)    !old
    501         if (density(nsp).gt.0.) &
    502              call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
     495! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
     496!              particle number and thus xmass array goes out of bounds
     497!        do nsp=1,nspec
     498!           if (xmass(nrelpoint,nsp).gt.eps2) goto 887
     499!         end do
     500! 887     nsp=min(nsp,nspec)
     501        if (nspec.eq.1.and.density(1).gt.0.) then
     502          call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
     503        end if
    503504        w=w+settling
    504505      endif
     
    654655
    655656    if (mdomainfill.eq.0) then
    656       do nsp=1,nspec
    657         if (xmass(nrelpoint,nsp).gt.eps2) goto 888
    658       end do
    659 888   nsp=min(nsp,nspec)
    660 !!$      if (density(nsp).gt.0.) &
    661 !!$           call get_settling(itime,xts,yts,zt,nsp,settling)    !old
    662       if (density(nsp).gt.0.) &
    663            call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
     657! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
     658!              particle number and thus xmass array goes out of bounds
     659
     660!      do nsp=1,nspec
     661!         if (xmass(nrelpoint,nsp).gt.eps2) goto 888
     662!       end do
     663! 888   nsp=min(nsp,nspec)
     664!        if (density(nsp).gt.0.) then
     665      if (nspec.eq.1.and.density(1).gt.0.) then
     666        call get_settling(itime,real(xt),real(yt),zt,nsp,settling)  !bugfix
     667      end if
    664668      w=w+settling
    665669    endif
     
    858862
    859863  if (mdomainfill.eq.0) then
    860     do nsp=1,nspec
    861       if (xmass(nrelpoint,nsp).gt.eps2) goto 889
    862     end do
    863 889   nsp=min(nsp,nspec)
    864 !!$    if (density(nsp).gt.0.) &
    865 !!$         call get_settling(itime+ldt,xts,yts,zt,nsp,settling)    !old
    866     if (density(nsp).gt.0.) &
    867          call get_settling(itime+ldt,real(xt),real(yt),zt,nsp,settling)  !bugfix
     864! ESO 05.2015  Changed this to fix MQUASILAG option, where nrelpoint is
     865!              particle number and thus xmass array goes out of bounds
     866!    do nsp=1,nspec
     867!       if (xmass(nrelpoint,nsp).gt.eps2) goto 889
     868!     end do
     869! 889   nsp=min(nsp,nspec)
     870!      if (density(nsp).gt.0.) then
     871    if (nspec.eq.1.and.density(1).gt.0.) then
     872      call get_settling(itime+ldt,real(xt),real(yt),zt,nsp,settling)  !bugfix
     873    end if
    868874    w=w+settling
    869875  endif
  • src/par_mod.f90

    r62e65c7 r18adf60  
    186186  !**************************************************
    187187
    188   integer,parameter :: maxpart=20000000
     188  integer,parameter :: maxpart=1000000
    189189  integer,parameter :: maxspec=6
    190190  real,parameter :: minmass=0.0001
  • src/partoutput_short.f90

    re200b7a r18adf60  
    146146
    147147
    148   write(*,*) numshortout,numshortall
     148  !write(*,*) numshortout,numshortall
    149149
    150150  close(unitshortpart)
  • src/timemanager.f90

    r05cf28d r18adf60  
    589589            endif
    590590
    591 
    592             if (mdomainfill.eq.0) then
     591! Skip check on mass fraction when npoint represents particle number
     592            if (mdomainfill.eq.0.and.mquasilag.eq.0) then
    593593              if (xmass(npoint(j),ks).gt.0.) &
    594594                   xmassfract=max(xmassfract,real(npart(npoint(j)))* &
     
    605605!ZHG 2015
    606606            else
    607               xmassfract=1.
    608             endif
     607              xmassfract=1.0
     608            end if
    609609          end do
    610610
  • src/timemanager_mpi.f90

    r05cf28d r18adf60  
    546546! Decide whether to write an estimate of the number of particles released,
    547547! or exact number (require MPI reduce operation)
    548         numpart_tot_mpi = numpart*mp_partgroup_np
    549 
    550         if (mp_exact_numpart.and..not.(lmpreader.and.lmp_use_reader)) then
     548        if (mp_dev_mode) then
     549          numpart_tot_mpi = numpart
     550        else
     551          numpart_tot_mpi = numpart*mp_partgroup_np
     552        end if
     553
     554        if (mp_exact_numpart.and..not.(lmpreader.and.lmp_use_reader).and.&
     555             &.not.mp_dev_mode) then
    551556          call MPI_Reduce(numpart, numpart_tot_mpi, 1, MPI_INTEGER, MPI_SUM, id_root, &
    552557               & mp_comm_used, mp_ierr)
     
    738743            endif
    739744
    740 
    741             if (mdomainfill.eq.0) then
     745! Skip check on mass fraction when npoint represents particle number
     746            if (mdomainfill.eq.0.and.mquasilag.eq.0) then
    742747              if (xmass(npoint(j),ks).gt.0.)then
    743748                   xmassfract=max(xmassfract,real(npart(npoint(j)))* &
  • options/SPECIES/SPECIES_016

    r356dcb9 re8929a8  
    44 PCSNOW_AERO=  1.0    ,
    55 PCCN_AERO= 0.9    ,
    6  PIN_AERO= 0.1    ,
    7  PDENSITY=  2500.00000    ,
    8  PDQUER=  6.0E-07,
     6 PIN_AERO= 0.9    ,
     7 PDENSITY=  1900.0    ,
     8 PDQUER=  0.4E-06,
    99 PDSIGMA= 0.3    ,
    1010 /
Note: See TracChangeset for help on using the changeset viewer.
hosted by ZAMG