- Timestamp:
- Jan 27, 2017, 8:29:03 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:
- cea125d
- Parents:
- 420423c
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/conccalc.f90
r1c0d5e6 r88929bf 175 175 if (yl.lt.0.) jy=jy-1 176 176 177 ! if (i.eq.10000) write(*,*) itime,xtra1(i),ytra1(i),ztra1(i),xl,yl178 177 179 178 … … 193 192 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 194 193 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 195 xmass1(i,ks)/rhoi*weight* xscav_frac1(i,ks)194 xmass1(i,ks)/rhoi*weight*max(xscav_frac1(i,ks),0.0) 196 195 end do 197 196 else … … 235 234 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 236 235 gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 237 xmass1(i,ks)/rhoi*w*weight* xscav_frac1(i,ks)236 xmass1(i,ks)/rhoi*w*weight*max(xscav_frac1(i,ks),0.0) 238 237 end do 239 238 else … … 252 251 gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 253 252 gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 254 xmass1(i,ks)/rhoi*weight*w* xscav_frac1(i,ks)253 xmass1(i,ks)/rhoi*weight*w*max(xscav_frac1(i,ks),0.0) 255 254 end do 256 255 else … … 272 271 gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= & 273 272 gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ & 274 xmass1(i,ks)/rhoi*w*weight* xscav_frac1(i,ks)273 xmass1(i,ks)/rhoi*w*weight*max(xscav_frac1(i,ks),0.0) 275 274 end do 276 275 else … … 289 288 gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= & 290 289 gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 291 xmass1(i,ks)/rhoi*weight*w* xscav_frac1(i,ks)290 xmass1(i,ks)/rhoi*weight*w*max(xscav_frac1(i,ks),0.0) 292 291 end do 293 292 else … … 330 329 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 331 330 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 332 xmass1(i,ks)/rhoi*weight* xscav_frac1(i,ks)331 xmass1(i,ks)/rhoi*weight*max(xscav_frac1(i,ks),0.0) 333 332 end do 334 333 else … … 372 371 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= & 373 372 griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ & 374 xmass1(i,ks)/rhoi*weight*w* xscav_frac1(i,ks)373 xmass1(i,ks)/rhoi*weight*w*max(xscav_frac1(i,ks),0.0) 375 374 end do 376 375 else
Note: See TracChangeset
for help on using the changeset viewer.