Changeset 18adf60 in flexpart.git for src/advance.f90
- Timestamp:
- May 9, 2016, 9:35:01 AM (8 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 3b80e98, 93786a1
- Parents:
- 62e65c7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/advance.f90
rfdc0f03 r18adf60 493 493 494 494 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 503 504 w=w+settling 504 505 endif … … 654 655 655 656 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 664 668 w=w+settling 665 669 endif … … 858 862 859 863 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 868 874 w=w+settling 869 875 endif
Note: See TracChangeset
for help on using the changeset viewer.