gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2022-11-07 19:59:06 -03:00
commit 297bf14f9c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sources/forcing.F90
View File

@ -1448,9 +1448,9 @@ module forcing
real(kind=8) :: dvol real(kind=8) :: dvol
real(kind=8), dimension(nn):: x, y, z real(kind=8), dimension(nn):: x, y, z
real(kind=8), dimension(nn):: kx, ky, snkx, snky, cskx, csky real(kind=8), dimension(nn):: xk, yk, kx, ky, snkx, snky, cskx, csky
#if NDIMS == 3 #if NDIMS == 3
real(kind=8), dimension(nn):: kz, snkz, cskz real(kind=8), dimension(nn):: zk, kz, snkz, cskz
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
real(kind=8), dimension(:,:,:,:), pointer, save :: acc real(kind=8), dimension(:,:,:,:), pointer, save :: acc
@ -1491,12 +1491,17 @@ module forcing
k = 1 k = 1
#endif /* NDIMS == 2 */ #endif /* NDIMS == 2 */
x(:) = - pi2 * (pdata%meta%xmin + ax(pdata%meta%level,:)) x(:) = pdata%meta%xmin + ax(pdata%meta%level,:)
y(:) = - pi2 * (pdata%meta%ymin + ay(pdata%meta%level,:)) y(:) = pdata%meta%ymin + ay(pdata%meta%level,:)
#if NDIMS == 3 #if NDIMS == 3
z(:) = - pi2 * (pdata%meta%zmin + az(pdata%meta%level,:)) z(:) = pdata%meta%zmin + az(pdata%meta%level,:)
#else /* NDIMS == 3 */ #else /* NDIMS == 3 */
z(:) = 0.0d+00 z(:) = 0.0d+00
#endif /* NDIMS == 3 */
xk(:) = - pi2 * x(:)
yk(:) = - pi2 * y(:)
#if NDIMS == 3
zk(:) = - pi2 * z(:)
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
dvol = advol(pdata%meta%level) dvol = advol(pdata%meta%level)
@ -1514,10 +1519,10 @@ module forcing
if (fmodes(l) > fmin) then if (fmodes(l) > fmin) then
kx(:) = kmodes(l,1) * x(:) kx(:) = kmodes(l,1) * xk(:)
ky(:) = kmodes(l,2) * y(:) ky(:) = kmodes(l,2) * yk(:)
#if NDIMS == 3 #if NDIMS == 3
kz(:) = kmodes(l,3) * z(:) kz(:) = kmodes(l,3) * zk(:)
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
cskx(:) = cos(kx(:)) cskx(:) = cos(kx(:))
snkx(:) = sin(kx(:)) snkx(:) = sin(kx(:))