Skip to content

Commit

Permalink
release of V0520
Browse files Browse the repository at this point in the history
  • Loading branch information
@jagurs-admin
jagurs-admin authored Feb 2, 2024
1 parent 466e8b5 commit 67c59e6
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 102 deletions.
7 changes: 5 additions & 2 deletions src/HISTORY
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ Interpolation is NOT performed if one of the two referred coarse grids is "dry"
If you want the old version to work, specify "-DNONESTDEBUG" on Makefile and make again.

--------------------------------------------------------------------------------
2024.01.01 V0520
2024.01.31 V0520

- "nf"-format is supported as GMT netCDF format. Note that the format may vary across
different domains, but the file format for a single domain must be consistent.
Expand All @@ -608,8 +608,11 @@ If you want the old version to work, specify "-DNONESTDEBUG" on Makefile and mak

- The following DEBUGs are applied.

- Fixed a bug that values were not updated at the four corners of the root domain
(contributed by M.Minami @ MRI. Thanks!).

- A bug for the flow-rate to velocity conversion during linear calculation to
outputting velocity grid file is corrected.
outputting velocity grid file is corrected (contributed by H.Tsushima @ MRI. Thanks!).

- Typos are corrected (contributed by T.Miyashita @ Kyoto Univ. Thanks!).

Expand Down
48 changes: 24 additions & 24 deletions src/mod_fxy.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,1) = fx(i,1) - (0.5d0*(dz(i+1,1)+dz(i,1)))*gdtdss*(hz_old(i+1,1)-hz_old(i,1))
fy(i,1) = fy(i,1) - (0.5d0*(dz(i, 2)+dz(i,1)))*gdtds *(hz_old(i, 2)-hz_old(i,1))
#else
ddx_tmp = half*(hz(i+1,1) + hz(i,1) + dz(i+1,1) + dz(i,1))
ddx_tmp = half*(hz_old(i+1,1) + hz_old(i,1) + dz(i+1,1) + dz(i,1))
if(dz(i,1) > zap .AND. dz(i+1,1) > zap .AND. ddx_tmp > zap) then
fybar = half*(fy_old(i,1) + fy_old(i+1,1))
fx(i,1) = fx_old(i,1) - ddx_tmp*gdtdss*(hz_old(i+1,1)-hz_old(i,1))-crls*fybar
Expand All @@ -1012,7 +1012,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,1) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(i,2) + hz(i,1) + dz(i,2) + dz(i,1))
ddy_tmp = half*(hz_old(i,2) + hz_old(i,1) + dz(i,2) + dz(i,1))
if(dz(i,1) > zap .AND. dz(i,2) > zap .AND. ddy_tmp > zap) then
if (i > 1) then
fxbar = quart*(fx_old(i,1) + fx_old(i-1,1) + fx_old(i-1,2) + fx_old(i,2))
Expand Down Expand Up @@ -1080,7 +1080,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,2) = fx(i,2) - (0.5d0*(dz(i+1,2)+dz(i,2)))*gdtdss*(hz_old(i+1,2)-hz_old(i,2))
fy(i,2) = fy(i,2) - (0.5d0*(dz(i, 3)+dz(i,2)))*gdtds *(hz_old(i, 3)-hz_old(i,2))
#else
ddx_tmp = half*(hz(i+1,2) + hz(i,2) + dz(i+1,2) + dz(i,2))
ddx_tmp = half*(hz_old(i+1,2) + hz_old(i,2) + dz(i+1,2) + dz(i,2))
if(dz(i,2) > zap .AND. dz(i+1,2) > zap .AND. ddx_tmp > zap) then
fybar = quart*(fy_old(i,2) + fy_old(i+1,2) + fy_old(i,1) + fy_old(i+1,1))
fx(i,2) = fx_old(i,2) - ddx_tmp*gdtdss*(hz_old(i+1,2)-hz_old(i,2))-crls*fybar
Expand All @@ -1107,7 +1107,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,2) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(i,3) + hz(i,2) + dz(i,3) + dz(i,2))
ddy_tmp = half*(hz_old(i,3) + hz_old(i,2) + dz(i,3) + dz(i,2))
if(dz(i,2) > zap .AND. dz(i,3) > zap .AND. ddy_tmp > zap) then
if (i > 1) then
fxbar = quart*(fx_old(i,2) + fx_old(i-1,2) + fx_old(i-1,3) + fx_old(i,3))
Expand Down Expand Up @@ -1176,7 +1176,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,3) = fx(i,3) - (0.5d0*(dz(i+1,3)+dz(i,3)))*gdtdss*(hz_old(i+1,3)-hz_old(i,3))
fy(i,3) = fy(i,3) - (0.5d0*(dz(i, 4)+dz(i,3)))*gdtds *(hz_old(i, 4)-hz_old(i,3))
#else
ddx_tmp = half*(hz(i+1,3) + hz(i,3) + dz(i+1,3) + dz(i,3))
ddx_tmp = half*(hz_old(i+1,3) + hz_old(i,3) + dz(i+1,3) + dz(i,3))
if(dz(i,3) > zap .AND. dz(i+1,3) > zap .AND. ddx_tmp > zap) then
fybar = quart*(fy_old(i,3) + fy_old(i+1,3) + fy_old(i,2) + fy_old(i+1,2))
fx(i,3) = fx_old(i,3) - ddx_tmp*gdtdss*(hz_old(i+1,3)-hz_old(i,3))-crls*fybar
Expand All @@ -1201,7 +1201,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
else
fx(i,3) = zap
end if
ddy_tmp = half*(hz(i,4) + hz(i,3) + dz(i,4) + dz(i,3))
ddy_tmp = half*(hz_old(i,4) + hz_old(i,3) + dz(i,4) + dz(i,3))
if(dz(i,3) > zap .AND. dz(i,4) > zap .AND. ddy_tmp > zap) then
if (i > 1) then
fxbar = quart*(fx_old(i,3) + fx_old(i-1,3) + fx_old(i-1,4) + fx_old(i,4))
Expand Down Expand Up @@ -1276,7 +1276,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,nlat-1) = fx(i,nlat-1) - (0.5d0*(dz(i+1,nlat-1)+dz(i,nlat-1)))*gdtdss*(hz_old(i+1,nlat-1)-hz_old(i,nlat-1))
fy(i,nlat-1) = fy(i,nlat-1) - (0.5d0*(dz(i, nlat) +dz(i,nlat-1)))*gdtds *(hz_old(i, nlat) -hz_old(i,nlat-1))
#else
ddx_tmp = half*(hz(i+1,nlat-1) + hz(i,nlat-1) + dz(i+1,nlat-1) + dz(i,nlat-1))
ddx_tmp = half*(hz_old(i+1,nlat-1) + hz_old(i,nlat-1) + dz(i+1,nlat-1) + dz(i,nlat-1))
if(dz(i,nlat-1) > zap .AND. dz(i+1,nlat-1) > zap .AND. ddx_tmp > zap) then
fybar = quart*(fy_old(i,nlat-1) + fy_old(i+1,nlat-1) + fy_old(i,nlat-2) + fy_old(i+1,nlat-2))
fx(i,nlat-1) = fx_old(i,nlat-1) - ddx_tmp*gdtdss*(hz_old(i+1,nlat-1)-hz_old(i,nlat-1))-crls*fybar
Expand All @@ -1303,7 +1303,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,nlat-1) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(i,nlat) + hz(i,nlat-1) + dz(i,nlat) + dz(i,nlat-1))
ddy_tmp = half*(hz_old(i,nlat) + hz_old(i,nlat-1) + dz(i,nlat) + dz(i,nlat-1))
if(dz(i,nlat-1) > zap .AND. dz(i,nlat) > zap .AND. ddy_tmp > zap) then
if (i > 1) then
fxbar = quart*(fx_old(i,nlat-1) + fx_old(i-1,nlat-1) + fx_old(i-1,nlat) + fx_old(i,nlat))
Expand Down Expand Up @@ -1373,7 +1373,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,nlat-2) = fx(i,nlat-2) - (0.5d0*(dz(i+1,nlat-2)+dz(i,nlat-2)))*gdtdss*(hz_old(i+1,nlat-2)-hz_old(i,nlat-2))
fy(i,nlat-2) = fy(i,nlat-2) - (0.5d0*(dz(i, nlat-1)+dz(i,nlat-2)))*gdtds *(hz_old(i, nlat-1)-hz_old(i,nlat-2))
#else
ddx_tmp = half*(hz(i+1,nlat-2) + hz(i,nlat-2) + dz(i+1,nlat-2) + dz(i,nlat-2))
ddx_tmp = half*(hz_old(i+1,nlat-2) + hz_old(i,nlat-2) + dz(i+1,nlat-2) + dz(i,nlat-2))
if(dz(i,nlat-2) > zap .AND. dz(i+1,nlat-2) > zap .AND. ddx_tmp > zap) then
fybar = quart*(fy_old(i,nlat-2) + fy_old(i+1,nlat-2) + fy_old(i,nlat-3) + fy_old(i+1,nlat-3))
fx(i,nlat-2) = fx_old(i,nlat-2) - ddx_tmp*gdtdss*(hz_old(i+1,nlat-2)-hz_old(i,nlat-2))-crls*fybar
Expand All @@ -1400,7 +1400,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(i,nlat-2) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(i,nlat-1) + hz(i,nlat-2) + dz(i,nlat-1) + dz(i,nlat-2))
ddy_tmp = half*(hz_old(i,nlat-1) + hz_old(i,nlat-2) + dz(i,nlat-1) + dz(i,nlat-2))
if(dz(i,nlat-2) > zap .AND. dz(i,nlat-1) > zap .AND. ddy_tmp > zap) then
if (i > 1) then
fxbar = quart*(fx_old(i,nlat-2) + fx_old(i-1,nlat-2) + fx_old(i-1,nlat-1) + fx_old(i,nlat-1))
Expand Down Expand Up @@ -1440,7 +1440,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
#ifdef OLD_SCHEME
!$omp do private(theta, sint, gdtdss)
#else
!$omp do private(theta, sint, gdtdss, fxbar, fybar, cf, cf2, bcf, bcf2, fric, fric2, ddx_tmp, ddy_tmp)
!$omp do private(theta, sint, gdtdss, crls, fxbar, fybar, cf, cf2, bcf, bcf2, fric, fric2, ddx_tmp, ddy_tmp)
#endif
#ifndef UPWIND3
do j = 2, nlat-2
Expand Down Expand Up @@ -1481,7 +1481,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(nlon-1,j) = fx(nlon-1,j) - (0.5d0*(dz(nlon, j) +dz(nlon-1,j)))*gdtdss*(hz_old(nlon, j) -hz_old(nlon-1,j))
fy(nlon-1,j) = fy(nlon-1,j) - (0.5d0*(dz(nlon-1,j+1)+dz(nlon-1,j)))*gdtds *(hz_old(nlon-1,j+1)-hz_old(nlon-1,j))
#else
ddx_tmp = half*(hz(nlon,j) + hz(nlon-1,j) + dz(nlon,j) + dz(nlon-1,j))
ddx_tmp = half*(hz_old(nlon,j) + hz_old(nlon-1,j) + dz(nlon,j) + dz(nlon-1,j))
if(dz(nlon-1,j) > zap .AND. dz(nlon,j) > zap .AND. ddx_tmp > zap) then
if (j > 1) then
fybar = quart*(fy_old(nlon-1,j) + fy_old(nlon,j) + fy_old(nlon-1,j-1) + fy_old(nlon,j-1))
Expand Down Expand Up @@ -1512,7 +1512,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(nlon-1,j) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(nlon-1,j+1) + hz(nlon-1,j) + dz(nlon-1,j+1) + dz(nlon-1,j))
ddy_tmp = half*(hz_old(nlon-1,j+1) + hz_old(nlon-1,j) + dz(nlon-1,j+1) + dz(nlon-1,j))
if(dz(nlon-1,j) > zap .AND. dz(nlon-1,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = quart*(fx_old(nlon-1,j) + fx_old(nlon-2,j) + fx_old(nlon-2,j+1) + fx_old(nlon-1,j+1))
fy(nlon-1,j) = fy_old(nlon-1,j) - ddy_tmp*gdtds *(hz_old(nlon-1,j+1)-hz_old(nlon-1,j))+crls*fxbar
Expand Down Expand Up @@ -1574,7 +1574,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(1,j) = fx(1,j) - (0.5d0*(dz(2,j) +dz(1,j)))*gdtdss*(hz_old(2,j) -hz_old(1,j))
fy(1,j) = fy(1,j) - (0.5d0*(dz(1,j+1)+dz(1,j)))*gdtds *(hz_old(1,j+1)-hz_old(1,j))
#else
ddx_tmp = half*(hz(2,j) + hz(1,j) + dz(2,j) + dz(1,j))
ddx_tmp = half*(hz_old(2,j) + hz_old(1,j) + dz(2,j) + dz(1,j))
if(dz(1,j) > zap .AND. dz(2,j) > zap .AND. ddx_tmp > zap) then
if (j > 1) then
fybar = quart*(fy_old(1,j) + fy_old(2,j) + fy_old(1,j-1) + fy_old(2,j-1))
Expand Down Expand Up @@ -1605,7 +1605,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(1,j) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(1,j+1) + hz(1,j) + dz(1,j+1) + dz(1,j))
ddy_tmp = half*(hz_old(1,j+1) + hz_old(1,j) + dz(1,j+1) + dz(1,j))
if(dz(1,j) > zap .AND. dz(1,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = half*(fx_old(1,j) + fx_old(1,j+1))
fy(1,j) = fy_old(1,j) - ddy_tmp*gdtds *(hz_old(1,j+1)-hz_old(1,j))+crls*fxbar
Expand Down Expand Up @@ -1658,7 +1658,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(2,j) = fx(2,j) - (0.5d0*(dz(3,j) +dz(2,j)))*gdtdss*(hz_old(3,j) -hz_old(2,j))
fy(2,j) = fy(2,j) - (0.5d0*(dz(2,j+1)+dz(2,j)))*gdtds *(hz_old(2,j+1)-hz_old(2,j))
#else
ddx_tmp = half*(hz(3,j) + hz(2,j) + dz(3,j) + dz(2,j))
ddx_tmp = half*(hz_old(3,j) + hz_old(2,j) + dz(3,j) + dz(2,j))
if(dz(2,j) > zap .AND. dz(3,j) > zap .AND. ddx_tmp > zap) then
fybar = quart*(fy_old(2,j) + fy_old(3,j) + fy_old(2,j-1) + fy_old(3,j-1))
fx(2,j) = fx_old(2,j) - ddx_tmp*gdtdss*(hz_old(3,j)-hz_old(2,j))-crls*fybar
Expand All @@ -1685,7 +1685,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(2,j) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(2,j+1) + hz(2,j) + dz(2,j+1) + dz(2,j))
ddy_tmp = half*(hz_old(2,j+1) + hz_old(2,j) + dz(2,j+1) + dz(2,j))
if(dz(2,j) > zap .AND. dz(2,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = quart*(fx_old(2,j) + fx_old(1,j) + fx_old(1,j+1) + fx_old(2,j+1))
fy(2,j) = fy_old(2,j) - ddy_tmp*gdtds *(hz_old(2,j+1)-hz_old(2,j))+crls*fxbar
Expand Down Expand Up @@ -1748,7 +1748,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fy(2,j) = zap
end if
#else
ddx_tmp = half*(hz(3,j) + hz(2,j) + dz(3,j) + dz(2,j))
ddx_tmp = half*(hz_old(3,j) + hz_old(2,j) + dz(3,j) + dz(2,j))
if(dz(2,j) > zap .AND. dz(3,j) > zap .AND. ddx_tmp > zap) then
if (j > 1) then
fybar = quart*(fy_old(2,j) + fy_old(3,j) + fy_old(2,j-1) + fy_old(3,j-1))
Expand Down Expand Up @@ -1777,7 +1777,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
else
fx(2,j) = zap
end if
ddy_tmp = half*(hz(2,j+1) + hz(2,j) + dz(2,j+1) + dz(2,j))
ddy_tmp = half*(hz_old(2,j+1) + hz_old(2,j) + dz(2,j+1) + dz(2,j))
if(dz(2,j) > zap .AND. dz(2,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = quart*(fx_old(2,j) + fx_old(1,j) + fx_old(1,j+1) + fx_old(2,j+1))
fy(2,j) = fy_old(2,j) - ddy_tmp*gdtds *(hz_old(2,j+1)-hz_old(2,j))+crls*fxbar
Expand Down Expand Up @@ -1811,7 +1811,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
#ifdef OLD_SCHEME
!$omp do private(theta, sint, gdtdss)
#else
!$omp do private(theta, sint, gdtdss, fxbar, fybar, cf, cf2, bcf, bcf2, fric, fric2, ddx_tmp, ddy_tmp)
!$omp do private(theta, sint, gdtdss, crls, fxbar, fybar, cf, cf2, bcf, bcf2, fric, fric2, ddx_tmp, ddy_tmp)
#endif
do j = 4, nlat-3
theta = th0 + (j-1)*dth
Expand Down Expand Up @@ -1843,7 +1843,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(nlon-2,j) = fx(nlon-2,j) - (0.5d0*(dz(nlon-1,j) +dz(nlon-2,j)))*gdtdss*(hz_old(nlon-1,j) -hz_old(nlon-2,j))
fy(nlon-2,j) = fy(nlon-2,j) - (0.5d0*(dz(nlon-2,j+1)+dz(nlon-2,j)))*gdtds *(hz_old(nlon-2,j+1)-hz_old(nlon-2,j))
#else
ddx_tmp = half*(hz(nlon-1,j) + hz(nlon-2,j) + dz(nlon-1,j) + dz(nlon-2,j))
ddx_tmp = half*(hz_old(nlon-1,j) + hz_old(nlon-2,j) + dz(nlon-1,j) + dz(nlon-2,j))
if(dz(nlon-1,j) > zap .AND. dz(nlon-2,j) > zap .AND. ddx_tmp > zap) then
if (j > 1) then
fybar = quart*(fy_old(nlon-2,j) + fy_old(nlon-1,j) + fy_old(nlon-2,j-1) + fy_old(nlon-1,j-1))
Expand Down Expand Up @@ -1874,7 +1874,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(nlon-2,j) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(nlon-2,j+1) + hz(nlon-2,j) + dz(nlon-2,j+1) + dz(nlon-2,j))
ddy_tmp = half*(hz_old(nlon-2,j+1) + hz_old(nlon-2,j) + dz(nlon-2,j+1) + dz(nlon-2,j))
if(dz(nlon-2,j) > zap .AND. dz(nlon-2,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = quart*(fx_old(nlon-2,j) + fx_old(nlon-3,j) + fx_old(nlon-3,j+1) + fx_old(nlon-2,j+1))
fy(nlon-2,j) = fy_old(nlon-2,j) - ddy_tmp*gdtds *(hz_old(nlon-2,j+1)-hz_old(nlon-2,j))+crls*fxbar
Expand Down Expand Up @@ -1931,7 +1931,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(3,j) = fx(3,j) - (0.5d0*(dz(4,j) +dz(3,j)))*gdtdss*(hz_old(4,j) -hz_old(3,j))
fy(3,j) = fy(3,j) - (0.5d0*(dz(3,j+1)+dz(3,j)))*gdtds *(hz_old(3,j+1)-hz_old(3,j))
#else
ddx_tmp = half*(hz(4,j) + hz(3,j) + dz(4,j) + dz(3,j))
ddx_tmp = half*(hz_old(4,j) + hz_old(3,j) + dz(4,j) + dz(3,j))
if(dz(3,j) > zap .AND. dz(4,j) > zap .AND. ddx_tmp > zap) then
if (j > 1) then
fybar = quart*(fy_old(3,j) + fy_old(4,j) + fy_old(3,j-1) + fy_old(4,j-1))
Expand Down Expand Up @@ -1962,7 +1962,7 @@ subroutine fxynl_rwg(wfld,dfld,ffld,ifz,cfs,cfl,cflag,dt,th0,dth,joff,nlon,nlat,
fx(3,j) = zap
#ifndef OLD_SCHEME
end if
ddy_tmp = half*(hz(3,j+1) + hz(3,j) + dz(3,j+1) + dz(3,j))
ddy_tmp = half*(hz_old(3,j+1) + hz_old(3,j) + dz(3,j+1) + dz(3,j))
if(dz(3,j) > zap .AND. dz(3,j+1) > zap .AND. ddy_tmp > zap) then
fxbar = quart*(fx_old(3,j) + fx_old(2,j) + fx_old(2,j+1) + fx_old(3,j+1))
fy(3,j) = fy_old(3,j) - ddy_tmp*gdtds *(hz_old(3,j+1)-hz_old(3,j))+crls*fxbar
Expand Down
Loading

0 comments on commit 67c59e6

Please sign in to comment.