From 22104fb86700b9373a3e041840a7cfc7532b8237 Mon Sep 17 00:00:00 2001 From: Grzegorz Kowal Date: Mon, 7 Nov 2022 19:56:47 -0300 Subject: [PATCH] FORCING: Fix region of turbulence driving. Signed-off-by: Grzegorz Kowal --- sources/forcing.F90 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sources/forcing.F90 b/sources/forcing.F90 index e8424c2..c0129ff 100644 --- a/sources/forcing.F90 +++ b/sources/forcing.F90 @@ -1448,9 +1448,9 @@ module forcing real(kind=8) :: dvol 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 - real(kind=8), dimension(nn):: kz, snkz, cskz + real(kind=8), dimension(nn):: zk, kz, snkz, cskz #endif /* NDIMS == 3 */ real(kind=8), dimension(:,:,:,:), pointer, save :: acc @@ -1491,12 +1491,17 @@ module forcing k = 1 #endif /* NDIMS == 2 */ - x(:) = - pi2 * (pdata%meta%xmin + ax(pdata%meta%level,:)) - y(:) = - pi2 * (pdata%meta%ymin + ay(pdata%meta%level,:)) + x(:) = pdata%meta%xmin + ax(pdata%meta%level,:) + y(:) = pdata%meta%ymin + ay(pdata%meta%level,:) #if NDIMS == 3 - z(:) = - pi2 * (pdata%meta%zmin + az(pdata%meta%level,:)) + z(:) = pdata%meta%zmin + az(pdata%meta%level,:) #else /* NDIMS == 3 */ z(:) = 0.0d+00 +#endif /* NDIMS == 3 */ + xk(:) = - pi2 * x(:) + yk(:) = - pi2 * y(:) +#if NDIMS == 3 + zk(:) = - pi2 * z(:) #endif /* NDIMS == 3 */ dvol = advol(pdata%meta%level) @@ -1514,10 +1519,10 @@ module forcing if (fmodes(l) > fmin) then - kx(:) = kmodes(l,1) * x(:) - ky(:) = kmodes(l,2) * y(:) + kx(:) = kmodes(l,1) * xk(:) + ky(:) = kmodes(l,2) * yk(:) #if NDIMS == 3 - kz(:) = kmodes(l,3) * z(:) + kz(:) = kmodes(l,3) * zk(:) #endif /* NDIMS == 3 */ cskx(:) = cos(kx(:)) snkx(:) = sin(kx(:))