- Timestamp:
- Jan 26, 2017, 3:42:38 PM (7 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 88929bf
- Parents:
- 7725d96
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/timemanager.f90
r56a2e54 r420423c 311 311 ! if (itime.eq.loutnext) then 312 312 ! do 247 ksp=1, nspec 313 ! do247 kp=1, maxpointspec_act313 ! 247 kp=1, maxpointspec_act 314 314 !47 xm(ksp,kp)=0. 315 315 … … 355 355 if (mod(itime-loutstart,loutsample).eq.0) then 356 356 357 358 do j=1,numpart 359 ! RECEPTOR: dry/wet depovel 360 !**************************** 361 ! Before the particle is moved 362 ! the calculation of the scavenged mass shall only be done once after release 363 ! xscav_frac1 was initialised with a negative value 364 365 ! write (*,*) 'out:',j,xtra1(j),ytra1(j),prob_rec(1),xscav_frac1(j,1) 366 if (DRYBKDEP) then 367 do ks=1,nspec 368 if ((xscav_frac1(j,ks).lt.0)) then 369 call get_vdep_prob(itime,xtra1(j),ytra1(j),ztra1(j),prob_rec) 370 if (DRYDEPSPEC(ks)) then ! dry deposition 371 ! write (*,*) 'j,..:',j,xtra1(j),ytra1(j),prob_rec(1),xscav_frac1(j,1) 372 xscav_frac1(j,ks)=prob_rec(ks) 373 else 374 xmass1(j,ks)=0 375 xscav_frac1(j,ks)=0. 376 endif 377 endif 378 enddo 379 endif 380 381 if (WETBKDEP) then 382 do ks=1,nspec 383 if ((xscav_frac1(j,ks).lt.0)) then 384 call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav) 385 if (wetscav(ks).gt.0) then 386 xscav_frac1(j,ks)=wetscav(ks)* & 387 (zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1) 388 else 389 xmass1(j,ks)=0. 390 xscav_frac1(j,ks)=0. 391 endif 392 endif 393 enddo 394 endif 395 396 enddo 397 357 398 ! If we are exactly at the start or end of the concentration averaging interval, 358 399 ! give only half the weight to this sample … … 543 584 zold=ztra1(j) 544 585 545 546 ! RECEPTOR: dry/wet depovel547 !****************************548 ! Before the particle is moved549 ! the calculation of the scavenged mass shall only be done once after release550 ! xscav_frac1 was initialised with a negative value551 552 if (DRYBKDEP) then553 do ks=1,nspec554 if ((xscav_frac1(j,ks).lt.0)) then555 call get_vdep_prob(itime,xtra1(j),ytra1(j),ztra1(j),prob_rec)556 if (DRYDEPSPEC(ks)) then ! dry deposition557 xscav_frac1(j,ks)=prob_rec(ks)558 else559 xmass1(j,ks)=0560 xscav_frac1(j,ks)=0.561 endif562 endif563 enddo564 endif565 566 if (WETBKDEP) then567 do ks=1,nspec568 if ((xscav_frac1(j,ks).lt.0)) then569 call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)570 if (wetscav(ks).gt.0) then571 xscav_frac1(j,ks)=wetscav(ks)* &572 (zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1)573 else574 xmass1(j,ks)=0.575 xscav_frac1(j,ks)=0.576 endif577 endif578 enddo579 endif580 586 581 587 ! Integrate Lagevin equation for lsynctime seconds … … 588 594 endif 589 595 596 ! write (*,*) ' before advanced: ',j,prob(1),xmass1(j,1),ztra1(j) 590 597 call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), & 591 598 us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, & 592 599 cbt(j)) 593 ! write (*,*) 'advance: ',prob(1),xmass1(j,1),ztra1(j) 600 if (ztra1(j).lt.30) then 601 ! write (*,*) 'advanced: ',ztra1(j),j,xtra1(j),ytra1(j) 602 endif 594 603 595 604 ! Calculate the gross fluxes across layer interfaces
Note: See TracChangeset
for help on using the changeset viewer.