- Timestamp:
- Nov 18, 2016, 8:13:26 AM (7 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- c9cf570
- Parents:
- 0ee2193
- Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/advance_rec.f90
r0ee2193 rdeaac29 167 167 ! this formulation means that prob(n) = 1 - f(0)*...*f(n) 168 168 ! where f(n) is the exponential term 169 prob(ks)=1.+(prob(ks)-1.)* & 170 exp(-vdepo(ks)*abs(lsynctime)/(2.*href)) 169 prob(ks)=vdepo(ks) 170 ! prob(ks)=vdepo(ks)/2./href 171 ! instead of prob - return vdepo -> result kg/m2/s 171 172 endif 172 173 end do -
src/conccalc.f90
r657fa36 rdeaac29 196 196 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 197 197 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 198 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)198 xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks) 199 199 end do 200 200 else … … 238 238 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 239 239 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 240 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)240 xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks) 241 241 end do 242 242 else … … 255 255 gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 256 256 gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 257 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)257 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 258 258 end do 259 259 else … … 275 275 gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 276 276 gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 277 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)277 xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks) 278 278 end do 279 279 else … … 292 292 gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= & 293 293 gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 294 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)294 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 295 295 end do 296 296 else … … 333 333 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 334 334 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 335 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)335 xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks) 336 336 end do 337 337 else … … 375 375 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 376 376 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 377 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)377 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 378 378 end do 379 379 else … … 392 392 griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 393 393 griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 394 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)394 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 395 395 end do 396 396 else … … 412 412 griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 413 413 griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 414 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)414 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 415 415 end do 416 416 else … … 429 429 griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= & 430 430 griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 431 xmass1(i,ks)/ (1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)431 xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks) 432 432 end do 433 433 else -
src/timemanager.f90
r0ee2193 rdeaac29 560 560 endif 561 561 if (DRYDEPSPEC(ks)) then ! dry deposition 562 drydeposit(ks)=xmass1(j,ks)*prob_rec(ks)*decfact 563 xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* & 564 drydeposit(ks)/xmass1(j,ks) 562 xscav_frac1(j,ks)=prob_rec(ks) 565 563 else 566 564 xmass1(j,ks)=0 -
src/wetdepo.f90
rd4a4250 rdeaac29 439 439 firsttimerem=firsttimerem+1 440 440 endif 441 xscav_frac1(jpart,ks)=xscav_frac1(jpart,ks)*(-1.)* &442 wetdeposit(ks)/xmass1(jpart,ks)441 !xscav_frac1(jpart,ks)=wetdeposit(ks)/(xmass1(jpart,ks)+wetdeposit(ks)) 442 xscav_frac1(jpart,ks)=wetscav*(zpoint2(jpart)-zpoint1(jpart)) 443 443 ! write (*,*) 'paricle kept: ',jpart,ks,wetdeposit(ks),xscav_frac1(jpart,ks),xmass(jpart,ks) 444 444 endif
Note: See TracChangeset
for help on using the changeset viewer.