Changeset c7e771d in flexpart.git
- Timestamp:
- Mar 1, 2017, 1:06:56 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:
- 5f53d0e
- Parents:
- b85b020
- Location:
- src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/get_wetscav.f90
r0539b8f rc7e771d 123 123 endif 124 124 125 126 125 ! Interpolate large scale precipitation, convective precipitation and 127 126 ! total cloud cover 128 127 ! Note that interpolated time refers to itime-0.5*ltsample [PS] 129 128 !******************************************************************** 130 interp_time=nint(itime-0.5*ltsample) 129 interp_time=nint(itime-0.5*ltsample) 130 131 n=memind(2) 132 if (abs(memtime(1)-interp_time).lt.abs(memtime(2)-interp_time)) & 133 n=memind(1) 131 134 132 135 if (ngrid.eq.0) then 133 136 call interpol_rain(lsprec,convprec,tcc,nxmax,nymax, & 134 1,nx,ny, memind,real(xtra1(jpart)),real(ytra1(jpart)),1, &137 1,nx,ny,n,real(xtra1(jpart)),real(ytra1(jpart)),1, & 135 138 memtime(1),memtime(2),interp_time,lsp,convp,cc) 136 139 else 137 140 call interpol_rain_nests(lsprecn,convprecn,tccn, & 138 nxmaxn,nymaxn,1,maxnests,ngrid,nxn,nyn, memind,xtn,ytn,1, &141 nxmaxn,nymaxn,1,maxnests,ngrid,nxn,nyn,n,xtn,ytn,1, & 139 142 memtime(1),memtime(2),interp_time,lsp,convp,cc) 140 143 endif … … 153 156 !26 continue 154 157 155 n=memind(2)156 if (abs(memtime(1)-interp_time).lt.abs(memtime(2)-interp_time)) &157 n=memind(1)158 158 159 159 if (ngrid.eq.0) then … … 227 227 act_temp=tt(ix,jy,hz,n) 228 228 endif 229 230 229 231 230 !*********************** … … 339 338 endif !incloud 340 339 340 341 341 20 continue 342 342 -
src/interpol_rain.f90
r8a65cb0 rc7e771d 21 21 22 22 subroutine interpol_rain(yy1,yy2,yy3,nxmax,nymax,nzmax,nx, & 23 ny, memind,xt,yt,level,itime1,itime2,itime,yint1,yint2,yint3)23 ny,iwftouse,xt,yt,level,itime1,itime2,itime,yint1,yint2,yint3) 24 24 ! i i i i i i i 25 25 !i i i i i i i i o o o … … 77 77 real :: ddx,ddy,rddx,rddy,dt1,dt2,dt,y1(2),y2(2),y3(2) 78 78 real :: xt,yt,yint1,yint2,yint3,p1,p2,p3,p4 79 integer :: iwftouse 79 80 80 81 … … 113 114 !*********************** 114 115 115 do m=1,2116 indexh= memind(m)116 ! do m=1,2 117 indexh=iwftouse 117 118 118 119 y1(m)=p1*yy1(ix ,jy ,level,indexh) & 119 y1(1)=p1*yy1(ix ,jy ,level,indexh) & 120 120 + p2*yy1(ixp,jy ,level,indexh) & 121 121 + p3*yy1(ix ,jyp,level,indexh) & 122 122 + p4*yy1(ixp,jyp,level,indexh) 123 y2( m)=p1*yy2(ix ,jy ,level,indexh) &123 y2(1)=p1*yy2(ix ,jy ,level,indexh) & 124 124 + p2*yy2(ixp,jy ,level,indexh) & 125 125 + p3*yy2(ix ,jyp,level,indexh) & 126 126 + p4*yy2(ixp,jyp,level,indexh) 127 y3( m)=p1*yy3(ix ,jy ,level,indexh) &127 y3(1)=p1*yy3(ix ,jy ,level,indexh) & 128 128 + p2*yy3(ixp,jy ,level,indexh) & 129 129 + p3*yy3(ix ,jyp,level,indexh) & 130 130 + p4*yy3(ixp,jyp,level,indexh) 131 end do131 ! end do 132 132 133 133 134 134 !************************************ 135 ! 2.) Temporal interpolation (linear) 135 ! 2.) Temporal interpolation (linear) - skip to be consistent with clouds 136 136 !************************************ 137 137 138 dt1=real(itime-itime1)139 dt2=real(itime2-itime)140 dt=dt1+dt2138 ! dt1=real(itime-itime1) 139 ! dt2=real(itime2-itime) 140 ! dt=dt1+dt2 141 141 142 yint1=(y1(1)*dt2+y1(2)*dt1)/dt143 yint2=(y2(1)*dt2+y2(2)*dt1)/dt144 yint3=(y3(1)*dt2+y3(2)*dt1)/dt142 ! yint1=(y1(1)*dt2+y1(2)*dt1)/dt 143 ! yint2=(y2(1)*dt2+y2(2)*dt1)/dt 144 ! yint3=(y3(1)*dt2+y3(2)*dt1)/dt 145 145 146 yint1=y1(1) 147 yint2=y2(1) 148 yint3=y3(1) 146 149 147 150 end subroutine interpol_rain
Note: See TracChangeset
for help on using the changeset viewer.