diff options
| author | korobkin <korobkin@f69c4107-0314-4c4f-9ad4-17e986b73f4a> | 2008-04-28 22:09:07 +0000 |
|---|---|---|
| committer | korobkin <korobkin@f69c4107-0314-4c4f-9ad4-17e986b73f4a> | 2008-04-28 22:09:07 +0000 |
| commit | 53f63939c336f78e10f86feef033ebcff8250a9b (patch) | |
| tree | e0cefbe463a4584ad6a5eebe5ebc527d81a35dd2 | |
| parent | 6fdbf297784da5711d8801877103cd7b4f43f383 (diff) | |
(+) Added the capability to specify grid offsets in derivative and dissipation
operators, as set by boundary_shiftout* parameters of CoordBase.
Only first-order centered derivative operators are affected.
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/SummationByParts/trunk@105 f69c4107-0314-4c4f-9ad4-17e986b73f4a
24 files changed, 4374 insertions, 3969 deletions
diff --git a/src/Derivatives_2_1.F90 b/src/Derivatives_2_1.F90 index 489fc1d..df660cd 100644 --- a/src/Derivatives_2_1.F90 +++ b/src/Derivatives_2_1.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(3,2), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,22 +42,24 @@ subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(3,2) * var(3,:,:) ) * idel + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) ) * idel !$omp end parallel workshare - il = 3 + il = 3 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else + or = ni - offset(2) !$omp parallel workshare - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + & - q(3,2) * var(ni-2,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + & - q(2,1) * var(ni-1,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + & + q(3,2) * var(or-2,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + & + q(2,1) * var(or-1,:,:) ) * idel !$omp end parallel workshare - ir = ni - 2 + ir = or - 2 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -69,22 +72,24 @@ subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(3,2) * var(:,3,:) ) * idel + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(3,2) * var(:,3+ol,:) ) * idel !$omp end parallel workshare - jl = 3 + jl = 3 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else + or = nj - offset(2) !$omp parallel workshare - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + & - q(3,2) * var(:,nj-2,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + & - q(2,1) * var(:,nj-1,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + & + q(3,2) * var(:,or-2,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + & + q(2,1) * var(:,or-1,:) ) * idel !$omp end parallel workshare - jr = nj - 2 + jr = or - 2 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -99,22 +104,24 @@ subroutine deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(3,2) * var(:,:,3) ) * idel + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(3,2) * var(:,:,3+ol) ) * idel !$omp end parallel workshare - kl = 3 + kl = 3 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else + or = nk - offset(2) !$omp parallel workshare - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + & - q(3,2) * var(:,:,nk-2) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + & - q(2,1) * var(:,:,nk-1) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + & + q(3,2) * var(:,:,or-2) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + & + q(2,1) * var(:,:,or-1) ) * idel !$omp end parallel workshare - kr = nk - 2 + kr = or - 2 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -165,7 +172,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else -!$omp parallel workshare where ( up(1,:,:) < zero ) dvar(1,:,:) = ( q1(1,1) * var(1,:,:) + q1(2,1) * var(2,:,:) ) * idel elsewhere @@ -178,13 +184,11 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(2,:,:) = ( q2(1,2) * var(1,:,:) + q2(2,2) * var(2,:,:) + & q2(3,2) * var(3,:,:) ) * idel end where -!$omp end parallel workshare il = 3 end if if ( bb(2) == 0 ) then ir = ni - gsize else -!$omp parallel workshare where ( up(ni-1,:,:) < zero ) dvar(ni-1,:,:) = - ( q2(1,2) * var(ni,:,:) + & q2(2,2) * var(ni-1,:,:) + & @@ -201,11 +205,9 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(ni,:,:) = - ( q1(1,1) * var(ni,:,:) + & q1(2,1) * var(ni-1,:,:) ) * idel end where -!$omp end parallel workshare ir = ni - 2 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(il:ir,:,:) < zero ) dvar(il:ir,:,:) = ( a1(-1) * var(il-1:ir-1,:,:) + & a1(0) * var(il:ir,:,:) + & @@ -215,7 +217,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(0) * var(il:ir,:,:) + & a2(1) * var(il+1:ir+1,:,:) ) * idel end where -!$omp end parallel workshare case (1) direction if ( zero_derivs_y /= 0 ) then dvar = zero @@ -223,7 +224,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else -!$omp parallel workshare where ( up(:,1,:) < zero ) dvar(:,1,:) = ( q1(1,1) * var(:,1,:) + q1(2,1) * var(:,2,:) ) * idel elsewhere @@ -236,13 +236,11 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(:,2,:) = ( q2(1,2) * var(:,1,:) + q2(2,2) * var(:,2,:) + & q2(3,2) * var(:,3,:) ) * idel end where -!$omp end parallel workshare jl = 3 end if if ( bb(2) == 0 ) then jr = nj - gsize else -!$omp parallel workshare where ( up(:,nj-1,:) < zero ) dvar(:,nj-1,:) = - ( q2(1,2) * var(:,nj,:) + & q2(2,2) * var(:,nj-1,:) + & @@ -259,11 +257,9 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(:,nj,:) = - ( q1(1,1) * var(:,nj,:) + & q1(2,1) * var(:,nj-1,:) ) * idel end where -!$omp end parallel workshare jr = nj - 2 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(:,jl:jr,:) < zero ) dvar(:,jl:jr,:) = ( a1(-1) * var(:,jl-1:jr-1,:) + & a1(0) * var(:,jl:jr,:) + & @@ -273,7 +269,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(0) * var(:,jl:jr,:) + & a2(1) * var(:,jl+1:jr+1,:) ) * idel end where -!$omp end parallel workshare end if case (2) direction if ( zero_derivs_z /= 0 ) then @@ -282,7 +277,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else -!$omp parallel workshare where ( up(:,:,1) < zero ) dvar(:,:,1) = ( q1(1,1) * var(:,:,1) + q1(2,1) * var(:,:,2) ) * idel elsewhere @@ -295,13 +289,11 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(:,:,2) = ( q2(1,2) * var(:,:,1) + q2(2,2) * var(:,:,2) + & q2(3,2) * var(:,:,3) ) * idel end where -!$omp end parallel workshare kl = 3 end if if ( bb(2) == 0 ) then kr = nk - gsize else -!$omp parallel workshare where ( up(:,:,nk-1) < zero ) dvar(:,:,nk-1) = - ( q2(1,2) * var(:,:,nk) + & q2(2,2) * var(:,:,nk-1) + & @@ -318,11 +310,9 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) dvar(:,:,nk) = - ( q1(1,1) * var(:,:,nk) + & q1(2,1) * var(:,:,nk-1) ) * idel end where -!$omp end parallel workshare kr = nk - 2 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(:,:,kl:kr) < zero ) dvar(:,:,kl:kr) = ( a1(-1) * var(:,:,kl-1:kr-1) + & a1(0) * var(:,:,kl:kr) + & @@ -332,7 +322,6 @@ subroutine up_deriv_gf_2_1 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(0) * var(:,:,kl:kr) + & a2(1) * var(:,:,kl+1:kr+1) ) * idel end where -!$omp end parallel workshare end if end select direction end subroutine up_deriv_gf_2_1 diff --git a/src/Derivatives_4_2.F90 b/src/Derivatives_4_2.F90 index cc16ebd..6b78d5e 100644 --- a/src/Derivatives_4_2.F90 +++ b/src/Derivatives_4_2.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(6,4), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,33 +42,35 @@ subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(3,2) * var(3,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(4,3) * var(4,:,:) + q(5,3) * var(5,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(3,4) * var(3,:,:) + & - q(5,4) * var(5,:,:) + q(6,4) * var(6,:,:) ) * idel - il = 5 + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(3,4) * var(3+ol,:,:) + & + q(5,4) * var(5+ol,:,:) + q(6,4) * var(6+ol,:,:) ) * idel + il = 5 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + & - q(3,4) * var(ni-2,:,:) + & - q(5,4) * var(ni-4,:,:) + & - q(6,4) * var(ni-5,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + & - q(2,3) * var(ni-1,:,:) + & - q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + & - q(3,2) * var(ni-2,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + & - q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + & - q(4,1) * var(ni-3,:,:) ) * idel - ir = ni - 4 + or = ni - offset(2) + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + & + q(3,4) * var(or-2,:,:) + & + q(5,4) * var(or-4,:,:) + & + q(6,4) * var(or-5,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + & + q(2,3) * var(or-1,:,:) + & + q(4,3) * var(or-3,:,:) + & + q(5,3) * var(or-4,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + & + q(3,2) * var(or-2,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + & + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + & + q(4,1) * var(or-3,:,:) ) * idel + ir = or - 4 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -83,33 +86,35 @@ subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(3,2) * var(:,3,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(4,3) * var(:,4,:) + q(5,3) * var(:,5,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(3,4) * var(:,3,:) + & - q(5,4) * var(:,5,:) + q(6,4) * var(:,6,:) ) * idel - jl = 5 + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(3,2) * var(:,3+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(4,3) * var(:,4+ol,:) + q(5,3) * var(:,5+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(3,4) * var(:,3+ol,:) + & + q(5,4) * var(:,5+ol,:) + q(6,4) * var(:,6+ol,:) ) * idel + jl = 5 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + & - q(3,4) * var(:,nj-2,:) + & - q(5,4) * var(:,nj-4,:) + & - q(6,4) * var(:,nj-5,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + & - q(2,3) * var(:,nj-1,:) + & - q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + & - q(3,2) * var(:,nj-2,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + & - q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + & - q(4,1) * var(:,nj-3,:) ) * idel - jr = nj - 4 + or = nj - offset(2) + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + & + q(3,4) * var(:,or-2,:) + & + q(5,4) * var(:,or-4,:) + & + q(6,4) * var(:,or-5,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + & + q(2,3) * var(:,or-1,:) + & + q(4,3) * var(:,or-3,:) + & + q(5,3) * var(:,or-4,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + & + q(3,2) * var(:,or-2,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + & + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + & + q(4,1) * var(:,or-3,:) ) * idel + jr = or - 4 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -126,33 +131,35 @@ subroutine deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(3,2) * var(:,:,3) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(4,3) * var(:,:,4) + q(5,3) * var(:,:,5) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(3,4) * var(:,:,3) + & - q(5,4) * var(:,:,5) + q(6,4) * var(:,:,6) ) * idel - kl = 5 + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(3,2) * var(:,:,3+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(4,3) * var(:,:,4+ol) + q(5,3) * var(:,:,5+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(3,4) * var(:,:,3+ol) + & + q(5,4) * var(:,:,5+ol) + q(6,4) * var(:,:,6+ol) ) * idel + kl = 5 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + & - q(3,4) * var(:,:,nk-2) + & - q(5,4) * var(:,:,nk-4) + & - q(6,4) * var(:,:,nk-5) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + & - q(2,3) * var(:,:,nk-1) + & - q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + & - q(3,2) * var(:,:,nk-2) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + & - q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + & - q(4,1) * var(:,:,nk-3) ) * idel - kr = nk - 4 + or = nk - offset(2) + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + & + q(3,4) * var(:,:,or-2) + & + q(5,4) * var(:,:,or-4) + & + q(6,4) * var(:,:,or-5) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + & + q(2,3) * var(:,:,or-1) + & + q(4,3) * var(:,:,or-3) + & + q(5,3) * var(:,:,or-4) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + & + q(3,2) * var(:,:,or-2) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + & + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + & + q(4,1) * var(:,:,or-3) ) * idel + kr = or - 4 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -295,7 +302,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) ir = ni - 4 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(il:ir,:,:) < zero ) dvar(il:ir,:,:) = ( a1(-2) * var(il-2:ir-2,:,:) + & a1(-1) * var(il-1:ir-1,:,:) + & @@ -309,7 +315,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(1) * var(il+1:ir+1,:,:) + & a2(2) * var(il+2:ir+2,:,:) ) * idel end where -!$omp end parallel workshare case (1) direction if ( zero_derivs_y /= 0 ) then dvar = zero @@ -407,7 +412,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) jr = nj - 4 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(:,jl:jr,:) < zero ) dvar(:,jl:jr,:) = ( a1(-2) * var(:,jl-2:jr-2,:) + & a1(-1) * var(:,jl-1:jr-1,:) + & @@ -421,7 +425,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(1) * var(:,jl+1:jr+1,:) + & a2(2) * var(:,jl+2:jr+2,:) ) * idel end where -!$omp end parallel workshare end if case (2) direction if ( zero_derivs_z /= 0 ) then @@ -520,7 +523,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) kr = nk - 4 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") -!$omp parallel workshare where ( up(:,:,kl:kr) < zero ) dvar(:,:,kl:kr) = ( a1(-2) * var(:,:,kl-2:kr-2) + & a1(-1) * var(:,:,kl-1:kr-1) + & @@ -534,7 +536,6 @@ subroutine up_deriv_gf_4_2 ( var, ni, nj, nk, dir, bb, gsize, delta, up, dvar ) a2(1) * var(:,:,kl+1:kr+1) + & a2(2) * var(:,:,kl+2:kr+2) ) * idel end where -!$omp end parallel workshare end if end select direction end subroutine up_deriv_gf_4_2 diff --git a/src/Derivatives_4_3.F90 b/src/Derivatives_4_3.F90 index 1bc9734..dd88de7 100644 --- a/src/Derivatives_4_3.F90 +++ b/src/Derivatives_4_3.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(7,5), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,51 +42,53 @@ subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(2,2) * var(2,:,:) + & - q(3,2) * var(3,:,:) + q(4,2) * var(4,:,:) + & - q(5,2) * var(5,:,:) + q(6,2) * var(6,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(3,3) * var(3,:,:) + q(4,3) * var(4,:,:) + & - q(5,3) * var(5,:,:) + q(6,3) * var(6,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(4,4) * var(4,:,:) + & - q(5,4) * var(5,:,:) + q(6,4) * var(6,:,:) + & - q(7,4) * var(7,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(5,5) * var(5,:,:) + q(6,5) * var(6,:,:) + & - q(7,5) * var(7,:,:) ) * idel + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(2,2) * var(2+ol,:,:) + & + q(3,2) * var(3+ol,:,:) + q(4,2) * var(4+ol,:,:) + & + q(5,2) * var(5+ol,:,:) + q(6,2) * var(6+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(3,3) * var(3+ol,:,:) + q(4,3) * var(4+ol,:,:) + & + q(5,3) * var(5+ol,:,:) + q(6,3) * var(6+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(4,4) * var(4+ol,:,:) + & + q(5,4) * var(5+ol,:,:) + q(6,4) * var(6+ol,:,:) + & + q(7,4) * var(7+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(5,5) * var(5+ol,:,:) + q(6,5) * var(6+ol,:,:) + & + q(7,5) * var(7+ol,:,:) ) * idel !$omp end parallel workshare - il = 6 + il = 6 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else + or = ni - offset(2) !$omp parallel workshare - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(5,5) * var(ni-4,:,:) + q(6,5) * var(ni-5,:,:) + & - q(7,5) * var(ni-6,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(4,4) * var(ni-3,:,:) + & - q(5,4) * var(ni-4,:,:) + q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(3,3) * var(ni-2,:,:) + q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) + & - q(6,3) * var(ni-5,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(2,2) * var(ni-1,:,:) + & - q(3,2) * var(ni-2,:,:) + q(4,2) * var(ni-3,:,:) + & - q(5,2) * var(ni-4,:,:) + & - q(6,2) * var(ni-5,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + & - q(4,1) * var(ni-3,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(5,5) * var(or-4,:,:) + q(6,5) * var(or-5,:,:) + & + q(7,5) * var(or-6,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(4,4) * var(or-3,:,:) + & + q(5,4) * var(or-4,:,:) + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(3,3) * var(or-2,:,:) + q(4,3) * var(or-3,:,:) + & + q(5,3) * var(or-4,:,:) + & + q(6,3) * var(or-5,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(2,2) * var(or-1,:,:) + & + q(3,2) * var(or-2,:,:) + q(4,2) * var(or-3,:,:) + & + q(5,2) * var(or-4,:,:) + & + q(6,2) * var(or-5,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + & + q(4,1) * var(or-3,:,:) ) * idel !$omp end parallel workshare - ir = ni - 5 + ir = or - 5 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -101,51 +104,53 @@ subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(2,2) * var(:,2,:) + & - q(3,2) * var(:,3,:) + q(4,2) * var(:,4,:) + & - q(5,2) * var(:,5,:) + q(6,2) * var(:,6,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(3,3) * var(:,3,:) + q(4,3) * var(:,4,:) + & - q(5,3) * var(:,5,:) + q(6,3) * var(:,6,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(4,4) * var(:,4,:) + & - q(5,4) * var(:,5,:) + q(6,4) * var(:,6,:) + & - q(7,4) * var(:,7,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(5,5) * var(:,5,:) + q(6,5) * var(:,6,:) + & - q(7,5) * var(:,7,:) ) * idel + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(2,2) * var(:,2+ol,:) + & + q(3,2) * var(:,3+ol,:) + q(4,2) * var(:,4+ol,:) + & + q(5,2) * var(:,5+ol,:) + q(6,2) * var(:,6+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(3,3) * var(:,3+ol,:) + q(4,3) * var(:,4+ol,:) + & + q(5,3) * var(:,5+ol,:) + q(6,3) * var(:,6+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(4,4) * var(:,4+ol,:) + & + q(5,4) * var(:,5+ol,:) + q(6,4) * var(:,6+ol,:) + & + q(7,4) * var(:,7+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(5,5) * var(:,5+ol,:) + q(6,5) * var(:,6+ol,:) + & + q(7,5) * var(:,7+ol,:) ) * idel !$omp end parallel workshare - jl = 6 + jl = 6 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else + or = nj - offset(2) !$omp parallel workshare - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(5,5) * var(:,nj-4,:) + q(6,5) * var(:,nj-5,:) + & - q(7,5) * var(:,nj-6,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(4,4) * var(:,nj-3,:) + & - q(5,4) * var(:,nj-4,:) + q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(3,3) * var(:,nj-2,:) + q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) + & - q(6,3) * var(:,nj-5,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(2,2) * var(:,nj-1,:) + & - q(3,2) * var(:,nj-2,:) + q(4,2) * var(:,nj-3,:) + & - q(5,2) * var(:,nj-4,:) + & - q(6,2) * var(:,nj-5,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + & - q(4,1) * var(:,nj-3,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(5,5) * var(:,or-4,:) + q(6,5) * var(:,or-5,:) + & + q(7,5) * var(:,or-6,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(4,4) * var(:,or-3,:) + & + q(5,4) * var(:,or-4,:) + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(3,3) * var(:,or-2,:) + q(4,3) * var(:,or-3,:) + & + q(5,3) * var(:,or-4,:) + & + q(6,3) * var(:,or-5,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(2,2) * var(:,or-1,:) + & + q(3,2) * var(:,or-2,:) + q(4,2) * var(:,or-3,:) + & + q(5,2) * var(:,or-4,:) + & + q(6,2) * var(:,or-5,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + & + q(4,1) * var(:,or-3,:) ) * idel !$omp end parallel workshare - jr = nj - 5 + jr = or - 5 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -162,51 +167,53 @@ subroutine deriv_gf_4_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(2,2) * var(:,:,2) + & - q(3,2) * var(:,:,3) + q(4,2) * var(:,:,4) + & - q(5,2) * var(:,:,5) + q(6,2) * var(:,:,6) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(3,3) * var(:,:,3) + q(4,3) * var(:,:,4) + & - q(5,3) * var(:,:,5) + q(6,3) * var(:,:,6) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(4,4) * var(:,:,4) + & - q(5,4) * var(:,:,5) + q(6,4) * var(:,:,6) + & - q(7,4) * var(:,:,7) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(5,5) * var(:,:,5) + q(6,5) * var(:,:,6) + & - q(7,5) * var(:,:,7) ) * idel + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(2,2) * var(:,:,2+ol) + & + q(3,2) * var(:,:,3+ol) + q(4,2) * var(:,:,4+ol) + & + q(5,2) * var(:,:,5+ol) + q(6,2) * var(:,:,6+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(3,3) * var(:,:,3+ol) + q(4,3) * var(:,:,4+ol) + & + q(5,3) * var(:,:,5+ol) + q(6,3) * var(:,:,6+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(4,4) * var(:,:,4+ol) + & + q(5,4) * var(:,:,5+ol) + q(6,4) * var(:,:,6+ol) + & + q(7,4) * var(:,:,7+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(5,5) * var(:,:,5+ol) + q(6,5) * var(:,:,6+ol) + & + q(7,5) * var(:,:,7+ol) ) * idel !$omp end parallel workshare - kl = 6 + kl = 6 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else + or = nk - offset(2) !$omp parallel workshare - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(5,5) * var(:,:,nk-4) + q(6,5) * var(:,:,nk-5) + & - q(7,5) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(4,4) * var(:,:,nk-3) + & - q(5,4) * var(:,:,nk-4) + q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(3,3) * var(:,:,nk-2) + q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) + & - q(6,3) * var(:,:,nk-5) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(2,2) * var(:,:,nk-1) + & - q(3,2) * var(:,:,nk-2) + q(4,2) * var(:,:,nk-3) + & - q(5,2) * var(:,:,nk-4) + & - q(6,2) * var(:,:,nk-5) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + & - q(4,1) * var(:,:,nk-3) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(5,5) * var(:,:,or-4) + q(6,5) * var(:,:,or-5) + & + q(7,5) * var(:,:,or-6) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(4,4) * var(:,:,or-3) + & + q(5,4) * var(:,:,or-4) + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(3,3) * var(:,:,or-2) + q(4,3) * var(:,:,or-3) + & + q(5,3) * var(:,:,or-4) + & + q(6,3) * var(:,:,or-5) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(2,2) * var(:,:,or-1) + & + q(3,2) * var(:,:,or-2) + q(4,2) * var(:,:,or-3) + & + q(5,2) * var(:,:,or-4) + & + q(6,2) * var(:,:,or-5) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + & + q(4,1) * var(:,:,or-3) ) * idel !$omp end parallel workshare - kr = nk - 5 + kr = or - 5 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare diff --git a/src/Derivatives_4_3_min_err_coeff.F90 b/src/Derivatives_4_3_min_err_coeff.F90 index c5968ef..2f5ff22 100644 --- a/src/Derivatives_4_3_min_err_coeff.F90 +++ b/src/Derivatives_4_3_min_err_coeff.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(7,5), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,54 +42,56 @@ subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(2,2) * var(2,:,:) + & - q(3,2) * var(3,:,:) + q(4,2) * var(4,:,:) + & - q(5,2) * var(5,:,:) + q(6,2) * var(6,:,:) + & - q(7,2) * var(7,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(3,3) * var(3,:,:) + q(4,3) * var(4,:,:) + & - q(5,3) * var(5,:,:) + q(6,3) * var(6,:,:) + & - q(7,3) * var(7,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(4,4) * var(4,:,:) + & - q(5,4) * var(5,:,:) + q(6,4) * var(6,:,:) + & - q(7,4) * var(7,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(5,5) * var(5,:,:) + q(6,5) * var(6,:,:) + & - q(7,5) * var(7,:,:) ) * idel + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(2,2) * var(2+ol,:,:) + & + q(3,2) * var(3+ol,:,:) + q(4,2) * var(4+ol,:,:) + & + q(5,2) * var(5+ol,:,:) + q(6,2) * var(6+ol,:,:) + & + q(7,2) * var(7+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(3,3) * var(3+ol,:,:) + q(4,3) * var(4+ol,:,:) + & + q(5,3) * var(5+ol,:,:) + q(6,3) * var(6+ol,:,:) + & + q(7,3) * var(7+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(4,4) * var(4+ol,:,:) + & + q(5,4) * var(5+ol,:,:) + q(6,4) * var(6+ol,:,:) + & + q(7,4) * var(7+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(5,5) * var(5+ol,:,:) + q(6,5) * var(6+ol,:,:) + & + q(7,5) * var(7+ol,:,:) ) * idel !$omp end parallel workshare - il = 6 + il = 6 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else + or = ni - offset(2) !$omp parallel workshare - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(5,5) * var(ni-4,:,:) + q(6,5) * var(ni-5,:,:) + & - q(7,5) * var(ni-6,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(4,4) * var(ni-3,:,:) + & - q(5,4) * var(ni-4,:,:) + q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(3,3) * var(ni-2,:,:) + q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) + q(6,3) * var(ni-5,:,:) + & - q(7,3) * var(ni-6,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(2,2) * var(ni-1,:,:) + & - q(3,2) * var(ni-2,:,:) + q(4,2) * var(ni-3,:,:) + & - q(5,2) * var(ni-4,:,:) + q(6,2) * var(ni-5,:,:) + & - q(7,2) * var(ni-6,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(5,5) * var(or-4,:,:) + q(6,5) * var(or-5,:,:) + & + q(7,5) * var(or-6,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(4,4) * var(or-3,:,:) + & + q(5,4) * var(or-4,:,:) + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(3,3) * var(or-2,:,:) + q(4,3) * var(or-3,:,:) + & + q(5,3) * var(or-4,:,:) + q(6,3) * var(or-5,:,:) + & + q(7,3) * var(or-6,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(2,2) * var(or-1,:,:) + & + q(3,2) * var(or-2,:,:) + q(4,2) * var(or-3,:,:) + & + q(5,2) * var(or-4,:,:) + q(6,2) * var(or-5,:,:) + & + q(7,2) * var(or-6,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) ) * idel !$omp end parallel workshare - ir = ni - 5 + ir = or - 5 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare @@ -104,54 +107,56 @@ subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(2,2) * var(:,2,:) + & - q(3,2) * var(:,3,:) + q(4,2) * var(:,4,:) + & - q(5,2) * var(:,5,:) + q(6,2) * var(:,6,:) + & - q(7,2) * var(:,7,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(3,3) * var(:,3,:) + q(4,3) * var(:,4,:) + & - q(5,3) * var(:,5,:) + q(6,3) * var(:,6,:) + & - q(7,3) * var(:,7,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(4,4) * var(:,4,:) + & - q(5,4) * var(:,5,:) + q(6,4) * var(:,6,:) + & - q(7,4) * var(:,7,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(5,5) * var(:,5,:) + q(6,5) * var(:,6,:) + & - q(7,5) * var(:,7,:) ) * idel + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(2,2) * var(:,2+ol,:) + & + q(3,2) * var(:,3+ol,:) + q(4,2) * var(:,4+ol,:) + & + q(5,2) * var(:,5+ol,:) + q(6,2) * var(:,6+ol,:) + & + q(7,2) * var(:,7+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(3,3) * var(:,3+ol,:) + q(4,3) * var(:,4+ol,:) + & + q(5,3) * var(:,5+ol,:) + q(6,3) * var(:,6+ol,:) + & + q(7,3) * var(:,7+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(4,4) * var(:,4+ol,:) + & + q(5,4) * var(:,5+ol,:) + q(6,4) * var(:,6+ol,:) + & + q(7,4) * var(:,7+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(5,5) * var(:,5+ol,:) + q(6,5) * var(:,6+ol,:) + & + q(7,5) * var(:,7+ol,:) ) * idel !$omp end parallel workshare - jl = 6 + jl = 6 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else + or = nj - offset(2) !$omp parallel workshare - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(5,5) * var(:,nj-4,:) + q(6,5) * var(:,nj-5,:) + & - q(7,5) * var(:,nj-6,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(4,4) * var(:,nj-3,:) + & - q(5,4) * var(:,nj-4,:) + q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(3,3) * var(:,nj-2,:) + q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) + q(6,3) * var(:,nj-5,:) + & - q(7,3) * var(:,nj-6,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(2,2) * var(:,nj-1,:) + & - q(3,2) * var(:,nj-2,:) + q(4,2) * var(:,nj-3,:) + & - q(5,2) * var(:,nj-4,:) + q(6,2) * var(:,nj-5,:) + & - q(7,2) * var(:,nj-6,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(5,5) * var(:,or-4,:) + q(6,5) * var(:,or-5,:) + & + q(7,5) * var(:,or-6,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(4,4) * var(:,or-3,:) + & + q(5,4) * var(:,or-4,:) + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(3,3) * var(:,or-2,:) + q(4,3) * var(:,or-3,:) + & + q(5,3) * var(:,or-4,:) + q(6,3) * var(:,or-5,:) + & + q(7,3) * var(:,or-6,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(2,2) * var(:,or-1,:) + & + q(3,2) * var(:,or-2,:) + q(4,2) * var(:,or-3,:) + & + q(5,2) * var(:,or-4,:) + q(6,2) * var(:,or-5,:) + & + q(7,2) * var(:,or-6,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) ) * idel !$omp end parallel workshare - jr = nj - 5 + jr = or - 5 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -166,54 +171,56 @@ subroutine deriv_gf_4_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else + ol = offset(1) !$omp parallel workshare - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(2,2) * var(:,:,2) + & - q(3,2) * var(:,:,3) + q(4,2) * var(:,:,4) + & - q(5,2) * var(:,:,5) + q(6,2) * var(:,:,6) + & - q(7,2) * var(:,:,7) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(3,3) * var(:,:,3) + q(4,3) * var(:,:,4) + & - q(5,3) * var(:,:,5) + q(6,3) * var(:,:,6) + & - q(7,3) * var(:,:,7) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(4,4) * var(:,:,4) + & - q(5,4) * var(:,:,5) + q(6,4) * var(:,:,6) + & - q(7,4) * var(:,:,7) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(5,5) * var(:,:,5) + q(6,5) * var(:,:,6) + & - q(7,5) * var(:,:,7) ) * idel + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(2,2) * var(:,:,2+ol) + & + q(3,2) * var(:,:,3+ol) + q(4,2) * var(:,:,4+ol) + & + q(5,2) * var(:,:,5+ol) + q(6,2) * var(:,:,6+ol) + & + q(7,2) * var(:,:,7+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(3,3) * var(:,:,3+ol) + q(4,3) * var(:,:,4+ol) + & + q(5,3) * var(:,:,5+ol) + q(6,3) * var(:,:,6+ol) + & + q(7,3) * var(:,:,7+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(4,4) * var(:,:,4+ol) + & + q(5,4) * var(:,:,5+ol) + q(6,4) * var(:,:,6+ol) + & + q(7,4) * var(:,:,7+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(5,5) * var(:,:,5+ol) + q(6,5) * var(:,:,6+ol) + & + q(7,5) * var(:,:,7+ol) ) * idel !$omp end parallel workshare - kl = 6 + kl = 6 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else + or = nk - offset(2) !$omp parallel workshare - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(5,5) * var(:,:,nk-4) + q(6,5) * var(:,:,nk-5) + & - q(7,5) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(4,4) * var(:,:,nk-3) + & - q(5,4) * var(:,:,nk-4) + q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(3,3) * var(:,:,nk-2) + q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) + q(6,3) * var(:,:,nk-5) + & - q(7,3) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(2,2) * var(:,:,nk-1) + & - q(3,2) * var(:,:,nk-2) + q(4,2) * var(:,:,nk-3) + & - q(5,2) * var(:,:,nk-4) + q(6,2) * var(:,:,nk-5) + & - q(7,2) * var(:,:,nk-6) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(5,5) * var(:,:,or-4) + q(6,5) * var(:,:,or-5) + & + q(7,5) * var(:,:,or-6) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(4,4) * var(:,:,or-3) + & + q(5,4) * var(:,:,or-4) + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(3,3) * var(:,:,or-2) + q(4,3) * var(:,:,or-3) + & + q(5,3) * var(:,:,or-4) + q(6,3) * var(:,:,or-5) + & + q(7,3) * var(:,:,or-6) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(2,2) * var(:,:,or-1) + & + q(3,2) * var(:,:,or-2) + q(4,2) * var(:,:,or-3) + & + q(5,2) * var(:,:,or-4) + q(6,2) * var(:,:,or-5) + & + q(7,2) * var(:,:,or-6) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) ) * idel !$omp end parallel workshare - kr = nk - 5 + kr = or - 5 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") !$omp parallel workshare diff --git a/src/Derivatives_6_3.F90 b/src/Derivatives_6_3.F90 index e194482..e2faeba 100644 --- a/src/Derivatives_6_3.F90 +++ b/src/Derivatives_6_3.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(9,6), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,53 +42,55 @@ subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(3,2) * var(3,:,:) + & - q(4,2) * var(4,:,:) + q(5,2) * var(5,:,:) + & - q(6,2) * var(6,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(4,3) * var(4,:,:) + q(5,3) * var(5,:,:) + & - q(6,3) * var(6,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(5,4) * var(5,:,:) + & - q(6,4) * var(6,:,:) + q(7,4) * var(7,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(6,5) * var(6,:,:) + q(7,5) * var(7,:,:) + & - q(8,5) * var(8,:,:) ) * idel - dvar(6,:,:) = ( q(2,6) * var(2,:,:) + q(3,6) * var(3,:,:) + & - q(4,6) * var(4,:,:) + q(5,6) * var(5,:,:) + & - q(7,6) * var(7,:,:) + q(8,6) * var(8,:,:) + & - q(9,6) * var(9,:,:) ) * idel - il = 7 + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) + & + q(4,2) * var(4+ol,:,:) + q(5,2) * var(5+ol,:,:) + & + q(6,2) * var(6+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) + & + q(6,3) * var(6+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(5,4) * var(5+ol,:,:) + & + q(6,4) * var(6+ol,:,:) + q(7,4) * var(7+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(6,5) * var(6+ol,:,:) + q(7,5) * var(7+ol,:,:) + & + q(8,5) * var(8+ol,:,:) ) * idel + dvar(6+ol,:,:) = ( q(2,6) * var(2+ol,:,:) + q(3,6) * var(3+ol,:,:) + & + q(4,6) * var(4+ol,:,:) + q(5,6) * var(5+ol,:,:) + & + q(7,6) * var(7+ol,:,:) + q(8,6) * var(8+ol,:,:) + & + q(9,6) * var(9+ol,:,:) ) * idel + il = 7 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(3,2) * var(ni-2,:,:) + & - q(4,2) * var(ni-3,:,:) + q(5,2) * var(ni-4,:,:) + & - q(6,2) * var(ni-5,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(4,3) * var(ni-3,:,:) + q(5,3) * var(ni-4,:,:) + & - q(6,3) * var(ni-5,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(5,4) * var(ni-4,:,:) + & - q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) ) * idel - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(6,5) * var(ni-5,:,:) + q(7,5) * var(ni-6,:,:) + & - q(8,5) * var(ni-7,:,:) ) * idel - dvar(ni-5,:,:) = - ( q(2,6) * var(ni-1,:,:) + q(3,6) * var(ni-2,:,:) + & - q(4,6) * var(ni-3,:,:) + q(5,6) * var(ni-4,:,:) + & - q(7,6) * var(ni-6,:,:) + q(8,6) * var(ni-7,:,:) + & - q(9,6) * var(ni-8,:,:) ) * idel - ir = ni - 6 + or = ni - offset(2) + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(3,2) * var(or-2,:,:) + & + q(4,2) * var(or-3,:,:) + q(5,2) * var(or-4,:,:) + & + q(6,2) * var(or-5,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(4,3) * var(or-3,:,:) + q(5,3) * var(or-4,:,:) + & + q(6,3) * var(or-5,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(5,4) * var(or-4,:,:) + & + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(6,5) * var(or-5,:,:) + q(7,5) * var(or-6,:,:) + & + q(8,5) * var(or-7,:,:) ) * idel + dvar(or-5,:,:) = - ( q(2,6) * var(or-1,:,:) + q(3,6) * var(or-2,:,:) + & + q(4,6) * var(or-3,:,:) + q(5,6) * var(or-4,:,:) + & + q(7,6) * var(or-6,:,:) + q(8,6) * var(or-7,:,:) + & + q(9,6) * var(or-8,:,:) ) * idel + ir = or - 6 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -102,54 +105,56 @@ subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) else if ( bb(1) == 0 ) then jl = 1 + gsize - else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(3,2) * var(:,3,:) + & - q(4,2) * var(:,4,:) + q(5,2) * var(:,5,:) + & - q(6,2) * var(:,6,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(4,3) * var(:,4,:) + q(5,3) * var(:,5,:) + & - q(6,3) * var(:,6,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(5,4) * var(:,5,:) + & - q(6,4) * var(:,6,:) + q(7,4) * var(:,7,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(6,5) * var(:,6,:) + q(7,5) * var(:,7,:) + & - q(8,5) * var(:,8,:) ) * idel - dvar(:,6,:) = ( q(2,6) * var(:,2,:) + q(3,6) * var(:,3,:) + & - q(4,6) * var(:,4,:) + q(5,6) * var(:,5,:) + & - q(7,6) * var(:,7,:) + q(8,6) * var(:,8,:) + & - q(9,6) * var(:,9,:) ) * idel - jl = 7 + else + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(3,2) * var(:,3+ol,:) + & + q(4,2) * var(:,4+ol,:) + q(5,2) * var(:,5+ol,:) + & + q(6,2) * var(:,6+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(4,3) * var(:,4+ol,:) + q(5,3) * var(:,5+ol,:) + & + q(6,3) * var(:,6+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(5,4) * var(:,5+ol,:) + & + q(6,4) * var(:,6+ol,:) + q(7,4) * var(:,7+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(6,5) * var(:,6+ol,:) + q(7,5) * var(:,7+ol,:) + & + q(8,5) * var(:,8+ol,:) ) * idel + dvar(:,6+ol,:) = ( q(2,6) * var(:,2+ol,:) + q(3,6) * var(:,3+ol,:) + & + q(4,6) * var(:,4+ol,:) + q(5,6) * var(:,5+ol,:) + & + q(7,6) * var(:,7+ol,:) + q(8,6) * var(:,8+ol,:) + & + q(9,6) * var(:,9+ol,:) ) * idel + jl = 7 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(3,2) * var(:,nj-2,:) + & - q(4,2) * var(:,nj-3,:) + q(5,2) * var(:,nj-4,:) + & - q(6,2) * var(:,nj-5,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(4,3) * var(:,nj-3,:) + q(5,3) * var(:,nj-4,:) + & - q(6,3) * var(:,nj-5,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(5,4) * var(:,nj-4,:) + & - q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) ) * idel - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(6,5) * var(:,nj-5,:) + q(7,5) * var(:,nj-6,:) + & - q(8,5) * var(:,nj-7,:) ) * idel - dvar(:,nj-5,:) = - ( q(2,6) * var(:,nj-1,:) + q(3,6) * var(:,nj-2,:) + & - q(4,6) * var(:,nj-3,:) + q(5,6) * var(:,nj-4,:) + & - q(7,6) * var(:,nj-6,:) + q(8,6) * var(:,nj-7,:) + & - q(9,6) * var(:,nj-8,:) ) * idel - jr = nj - 6 + or = nj - offset(2) + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(3,2) * var(:,or-2,:) + & + q(4,2) * var(:,or-3,:) + q(5,2) * var(:,or-4,:) + & + q(6,2) * var(:,or-5,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(4,3) * var(:,or-3,:) + q(5,3) * var(:,or-4,:) + & + q(6,3) * var(:,or-5,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(5,4) * var(:,or-4,:) + & + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(6,5) * var(:,or-5,:) + q(7,5) * var(:,or-6,:) + & + q(8,5) * var(:,or-7,:) ) * idel + dvar(:,or-5,:) = - ( q(2,6) * var(:,or-1,:) + q(3,6) * var(:,or-2,:) + & + q(4,6) * var(:,or-3,:) + q(5,6) * var(:,or-4,:) + & + q(7,6) * var(:,or-6,:) + q(8,6) * var(:,or-7,:) + & + q(9,6) * var(:,or-8,:) ) * idel + jr = or - 6 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -166,53 +171,55 @@ subroutine deriv_gf_6_3 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(3,2) * var(:,:,3) + & - q(4,2) * var(:,:,4) + q(5,2) * var(:,:,5) + & - q(6,2) * var(:,:,6) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(4,3) * var(:,:,4) + q(5,3) * var(:,:,5) + & - q(6,3) * var(:,:,6) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(5,4) * var(:,:,5) + & - q(6,4) * var(:,:,6) + q(7,4) * var(:,:,7) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(6,5) * var(:,:,6) + q(7,5) * var(:,:,7) + & - q(8,5) * var(:,:,8) ) * idel - dvar(:,:,6) = ( q(2,6) * var(:,:,2) + q(3,6) * var(:,:,3) + & - q(4,6) * var(:,:,4) + q(5,6) * var(:,:,5) + & - q(7,6) * var(:,:,7) + q(8,6) * var(:,:,8) + & - q(9,6) * var(:,:,9) ) * idel - kl = 7 + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(3,2) * var(:,:,3+ol) + & + q(4,2) * var(:,:,4+ol) + q(5,2) * var(:,:,5+ol) + & + q(6,2) * var(:,:,6+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(4,3) * var(:,:,4+ol) + q(5,3) * var(:,:,5+ol) + & + q(6,3) * var(:,:,6+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(5,4) * var(:,:,5+ol) + & + q(6,4) * var(:,:,6+ol) + q(7,4) * var(:,:,7+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(6,5) * var(:,:,6+ol) + q(7,5) * var(:,:,7+ol) + & + q(8,5) * var(:,:,8+ol) ) * idel + dvar(:,:,6+ol) = ( q(2,6) * var(:,:,2+ol) + q(3,6) * var(:,:,3+ol) + & + q(4,6) * var(:,:,4+ol) + q(5,6) * var(:,:,5+ol) + & + q(7,6) * var(:,:,7+ol) + q(8,6) * var(:,:,8+ol) + & + q(9,6) * var(:,:,9+ol) ) * idel + kl = 7 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(3,2) * var(:,:,nk-2) + & - q(4,2) * var(:,:,nk-3) + q(5,2) * var(:,:,nk-4) + & - q(6,2) * var(:,:,nk-5) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(4,3) * var(:,:,nk-3) + q(5,3) * var(:,:,nk-4) + & - q(6,3) * var(:,:,nk-5) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(5,4) * var(:,:,nk-4) + & - q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(6,5) * var(:,:,nk-5) + q(7,5) * var(:,:,nk-6) + & - q(8,5) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-5) = - ( q(2,6) * var(:,:,nk-1) + q(3,6) * var(:,:,nk-2) + & - q(4,6) * var(:,:,nk-3) + q(5,6) * var(:,:,nk-4) + & - q(7,6) * var(:,:,nk-6) + q(8,6) * var(:,:,nk-7) + & - q(9,6) * var(:,:,nk-8) ) * idel - kr = nk - 6 + or = nk - offset(2) + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(3,2) * var(:,:,or-2) + & + q(4,2) * var(:,:,or-3) + q(5,2) * var(:,:,or-4) + & + q(6,2) * var(:,:,or-5) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(4,3) * var(:,:,or-3) + q(5,3) * var(:,:,or-4) + & + q(6,3) * var(:,:,or-5) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(5,4) * var(:,:,or-4) + & + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(6,5) * var(:,:,or-5) + q(7,5) * var(:,:,or-6) + & + q(8,5) * var(:,:,or-7) ) * idel + dvar(:,:,or-5) = - ( q(2,6) * var(:,:,or-1) + q(3,6) * var(:,:,or-2) + & + q(4,6) * var(:,:,or-3) + q(5,6) * var(:,:,or-4) + & + q(7,6) * var(:,:,or-6) + q(8,6) * var(:,:,or-7) + & + q(9,6) * var(:,:,or-8) ) * idel + kr = or - 6 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Derivatives_6_3_min_err_coeff.F90 b/src/Derivatives_6_3_min_err_coeff.F90 index bf8b8f2..6a49e24 100644 --- a/src/Derivatives_6_3_min_err_coeff.F90 +++ b/src/Derivatives_6_3_min_err_coeff.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(9,6), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,57 +42,59 @@ subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) + q(6,1) * var(6,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(3,2) * var(3,:,:) + & - q(4,2) * var(4,:,:) + q(5,2) * var(5,:,:) + & - q(6,2) * var(6,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(4,3) * var(4,:,:) + q(5,3) * var(5,:,:) + & - q(6,3) * var(6,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(5,4) * var(5,:,:) + & - q(6,4) * var(6,:,:) + q(7,4) * var(7,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(6,5) * var(6,:,:) + q(7,5) * var(7,:,:) + & - q(8,5) * var(8,:,:) ) * idel - dvar(6,:,:) = ( q(1,6) * var(1,:,:) + q(2,6) * var(2,:,:) + & - q(3,6) * var(3,:,:) + q(4,6) * var(4,:,:) + & - q(5,6) * var(5,:,:) + q(7,6) * var(7,:,:) + & - q(8,6) * var(8,:,:) + q(9,6) * var(9,:,:) ) * idel + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) + & + q(4,2) * var(4+ol,:,:) + q(5,2) * var(5+ol,:,:) + & + q(6,2) * var(6+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) + & + q(6,3) * var(6+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(5,4) * var(5+ol,:,:) + & + q(6,4) * var(6+ol,:,:) + q(7,4) * var(7+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(6,5) * var(6+ol,:,:) + q(7,5) * var(7+ol,:,:) + & + q(8,5) * var(8+ol,:,:) ) * idel + dvar(6+ol,:,:) = ( q(1,6) * var(1+ol,:,:) + q(2,6) * var(2+ol,:,:) + & + q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & + q(5,6) * var(5+ol,:,:) + q(7,6) * var(7+ol,:,:) + & + q(8,6) * var(8+ol,:,:) + q(9,6) * var(9+ol,:,:) ) * idel - il = 7 + il = 7 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni-5,:,:) = - ( q(1,6) * var(ni,:,:) + q(2,6) * var(ni-1,:,:) + & - q(3,6) * var(ni-2,:,:) + q(4,6) * var(ni-3,:,:) + & - q(5,6) * var(ni-4,:,:) + q(7,6) * var(ni-6,:,:) + & - q(8,6) * var(ni-7,:,:) + & - q(9,6) * var(ni-8,:,:) ) * idel - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(6,5) * var(ni-5,:,:) + q(7,5) * var(ni-6,:,:) + & - q(8,5) * var(ni-7,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(5,4) * var(ni-4,:,:) + & - q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(4,3) * var(ni-3,:,:) + q(5,3) * var(ni-4,:,:) + & - q(6,3) * var(ni-5,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(3,2) * var(ni-2,:,:) + & - q(4,2) * var(ni-3,:,:) + q(5,2) * var(ni-4,:,:) + & - q(6,2) * var(ni-5,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) + & - q(6,1) * var(ni-5,:,:) ) * idel + or = ni - offset(2) + dvar(or-5,:,:) = - ( q(1,6) * var(or,:,:) + q(2,6) * var(or-1,:,:) + & + q(3,6) * var(or-2,:,:) + q(4,6) * var(or-3,:,:) + & + q(5,6) * var(or-4,:,:) + q(7,6) * var(or-6,:,:) + & + q(8,6) * var(or-7,:,:) + & + q(9,6) * var(or-8,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(6,5) * var(or-5,:,:) + q(7,5) * var(or-6,:,:) + & + q(8,5) * var(or-7,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(5,4) * var(or-4,:,:) + & + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(4,3) * var(or-3,:,:) + q(5,3) * var(or-4,:,:) + & + q(6,3) * var(or-5,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(3,2) * var(or-2,:,:) + & + q(4,2) * var(or-3,:,:) + q(5,2) * var(or-4,:,:) + & + q(6,2) * var(or-5,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) + & + q(6,1) * var(or-5,:,:) ) * idel - ir = ni - 6 + ir = or - 6 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -107,57 +110,59 @@ subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) + q(6,1) * var(:,6,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(3,2) * var(:,3,:) + & - q(4,2) * var(:,4,:) + q(5,2) * var(:,5,:) + & - q(6,2) * var(:,6,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(4,3) * var(:,4,:) + q(5,3) * var(:,5,:) + & - q(6,3) * var(:,6,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(5,4) * var(:,5,:) + & - q(6,4) * var(:,6,:) + q(7,4) * var(:,7,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(6,5) * var(:,6,:) + q(7,5) * var(:,7,:) + & - q(8,5) * var(:,8,:) ) * idel - dvar(:,6,:) = ( q(1,6) * var(:,1,:) + q(2,6) * var(:,2,:) + & - q(3,6) * var(:,3,:) + q(4,6) * var(:,4,:) + & - q(5,6) * var(:,5,:) + q(7,6) * var(:,7,:) + & - q(8,6) * var(:,8,:) + q(9,6) * var(:,9,:) ) * idel + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) + q(6,1) * var(:,6+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(3,2) * var(:,3+ol,:) + & + q(4,2) * var(:,4+ol,:) + q(5,2) * var(:,5+ol,:) + & + q(6,2) * var(:,6+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(4,3) * var(:,4+ol,:) + q(5,3) * var(:,5+ol,:) + & + q(6,3) * var(:,6+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(5,4) * var(:,5+ol,:) + & + q(6,4) * var(:,6+ol,:) + q(7,4) * var(:,7+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(6,5) * var(:,6+ol,:) + q(7,5) * var(:,7+ol,:) + & + q(8,5) * var(:,8+ol,:) ) * idel + dvar(:,6+ol,:) = ( q(1,6) * var(:,1+ol,:) + q(2,6) * var(:,2+ol,:) + & + q(3,6) * var(:,3+ol,:) + q(4,6) * var(:,4+ol,:) + & + q(5,6) * var(:,5+ol,:) + q(7,6) * var(:,7+ol,:) + & + q(8,6) * var(:,8+ol,:) + q(9,6) * var(:,9+ol,:) ) * idel - jl = 7 + jl = 7 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj-5,:) = - ( q(1,6) * var(:,nj,:) + q(2,6) * var(:,nj-1,:) + & - q(3,6) * var(:,nj-2,:) + q(4,6) * var(:,nj-3,:) + & - q(5,6) * var(:,nj-4,:) + q(7,6) * var(:,nj-6,:) + & - q(8,6) * var(:,nj-7,:) + & - q(9,6) * var(:,nj-8,:) ) * idel - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(6,5) * var(:,nj-5,:) + q(7,5) * var(:,nj-6,:) + & - q(8,5) * var(:,nj-7,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(5,4) * var(:,nj-4,:) + & - q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(4,3) * var(:,nj-3,:) + q(5,3) * var(:,nj-4,:) + & - q(6,3) * var(:,nj-5,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(3,2) * var(:,nj-2,:) + & - q(4,2) * var(:,nj-3,:) + q(5,2) * var(:,nj-4,:) + & - q(6,2) * var(:,nj-5,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) + & - q(6,1) * var(:,nj-5,:) ) * idel + or = nj - offset(2) + dvar(:,or-5,:) = - ( q(1,6) * var(:,or,:) + q(2,6) * var(:,or-1,:) + & + q(3,6) * var(:,or-2,:) + q(4,6) * var(:,or-3,:) + & + q(5,6) * var(:,or-4,:) + q(7,6) * var(:,or-6,:) + & + q(8,6) * var(:,or-7,:) + & + q(9,6) * var(:,or-8,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(6,5) * var(:,or-5,:) + q(7,5) * var(:,or-6,:) + & + q(8,5) * var(:,or-7,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(5,4) * var(:,or-4,:) + & + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(4,3) * var(:,or-3,:) + q(5,3) * var(:,or-4,:) + & + q(6,3) * var(:,or-5,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(3,2) * var(:,or-2,:) + & + q(4,2) * var(:,or-3,:) + q(5,2) * var(:,or-4,:) + & + q(6,2) * var(:,or-5,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) + & + q(6,1) * var(:,or-5,:) ) * idel - jr = nj - 6 + jr = or - 6 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -174,57 +179,59 @@ subroutine deriv_gf_6_3_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) + q(6,1) * var(:,:,6) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(3,2) * var(:,:,3) + & - q(4,2) * var(:,:,4) + q(5,2) * var(:,:,5) + & - q(6,2) * var(:,:,6) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(4,3) * var(:,:,4) + q(5,3) * var(:,:,5) + & - q(6,3) * var(:,:,6) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(5,4) * var(:,:,5) + & - q(6,4) * var(:,:,6) + q(7,4) * var(:,:,7) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(6,5) * var(:,:,6) + q(7,5) * var(:,:,7) + & - q(8,5) * var(:,:,8) ) * idel - dvar(:,:,6) = ( q(1,6) * var(:,:,1) + q(2,6) * var(:,:,2) + & - q(3,6) * var(:,:,3) + q(4,6) * var(:,:,4) + & - q(5,6) * var(:,:,5) + q(7,6) * var(:,:,7) + & - q(8,6) * var(:,:,8) + q(9,6) * var(:,:,9) ) * idel + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) + q(6,1) * var(:,:,6+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(3,2) * var(:,:,3+ol) + & + q(4,2) * var(:,:,4+ol) + q(5,2) * var(:,:,5+ol) + & + q(6,2) * var(:,:,6+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(4,3) * var(:,:,4+ol) + q(5,3) * var(:,:,5+ol) + & + q(6,3) * var(:,:,6+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(5,4) * var(:,:,5+ol) + & + q(6,4) * var(:,:,6+ol) + q(7,4) * var(:,:,7+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(6,5) * var(:,:,6+ol) + q(7,5) * var(:,:,7+ol) + & + q(8,5) * var(:,:,8+ol) ) * idel + dvar(:,:,6+ol) = ( q(1,6) * var(:,:,1+ol) + q(2,6) * var(:,:,2+ol) + & + q(3,6) * var(:,:,3+ol) + q(4,6) * var(:,:,4+ol) + & + q(5,6) * var(:,:,5+ol) + q(7,6) * var(:,:,7+ol) + & + q(8,6) * var(:,:,8+ol) + q(9,6) * var(:,:,9+ol) ) * idel - kl = 7 + kl = 7 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk-5) = - ( q(1,6) * var(:,:,nk) + q(2,6) * var(:,:,nk-1) + & - q(3,6) * var(:,:,nk-2) + q(4,6) * var(:,:,nk-3) + & - q(5,6) * var(:,:,nk-4) + q(7,6) * var(:,:,nk-6) + & - q(8,6) * var(:,:,nk-7) + & - q(9,6) * var(:,:,nk-8) ) * idel - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(6,5) * var(:,:,nk-5) + q(7,5) * var(:,:,nk-6) + & - q(8,5) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(5,4) * var(:,:,nk-4) + & - q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(4,3) * var(:,:,nk-3) + q(5,3) * var(:,:,nk-4) + & - q(6,3) * var(:,:,nk-5) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(3,2) * var(:,:,nk-2) + & - q(4,2) * var(:,:,nk-3) + q(5,2) * var(:,:,nk-4) + & - q(6,2) * var(:,:,nk-5) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) + & - q(6,1) * var(:,:,nk-5) ) * idel + or = nk - offset(2) + dvar(:,:,or-5) = - ( q(1,6) * var(:,:,or) + q(2,6) * var(:,:,or-1) + & + q(3,6) * var(:,:,or-2) + q(4,6) * var(:,:,or-3) + & + q(5,6) * var(:,:,or-4) + q(7,6) * var(:,:,or-6) + & + q(8,6) * var(:,:,or-7) + & + q(9,6) * var(:,:,or-8) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(6,5) * var(:,:,or-5) + q(7,5) * var(:,:,or-6) + & + q(8,5) * var(:,:,or-7) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(5,4) * var(:,:,or-4) + & + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(4,3) * var(:,:,or-3) + q(5,3) * var(:,:,or-4) + & + q(6,3) * var(:,:,or-5) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(3,2) * var(:,:,or-2) + & + q(4,2) * var(:,:,or-3) + q(5,2) * var(:,:,or-4) + & + q(6,2) * var(:,:,or-5) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) + & + q(6,1) * var(:,:,or-5) ) * idel - kr = nk - 6 + kr = or - 6 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Derivatives_6_5.F90 b/src/Derivatives_6_5.F90 index 81acac7..ba5efed 100644 --- a/src/Derivatives_6_5.F90 +++ b/src/Derivatives_6_5.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(10,7), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,82 +42,84 @@ subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) + q(6,1) * var(6,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(2,2) * var(2,:,:) + & - q(3,2) * var(3,:,:) + q(4,2) * var(4,:,:) + & - q(5,2) * var(5,:,:) + q(6,2) * var(6,:,:) + & - q(7,2) * var(7,:,:) + q(8,2) * var(8,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(3,3) * var(3,:,:) + q(4,3) * var(4,:,:) + & - q(5,3) * var(5,:,:) + q(6,3) * var(6,:,:) + & - q(7,3) * var(7,:,:) + q(8,3) * var(8,:,:) + & - q(9,3) * var(9,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(4,4) * var(4,:,:) + & - q(5,4) * var(5,:,:) + q(6,4) * var(6,:,:) + & - q(7,4) * var(7,:,:) + q(8,4) * var(8,:,:) + & - q(9,4) * var(9,:,:) + q(10,4) * var(10,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(5,5) * var(5,:,:) + q(6,5) * var(6,:,:) + & - q(7,5) * var(7,:,:) + q(8,5) * var(8,:,:) + & - q(9,5) * var(9,:,:) + q(10,5) * var(10,:,:) ) * idel - dvar(6,:,:) = ( q(1,6) * var(1,:,:) + q(2,6) * var(2,:,:) + & - q(3,6) * var(3,:,:) + q(4,6) * var(4,:,:) + & - q(5,6) * var(5,:,:) + q(6,6) * var(6,:,:) + & - q(7,6) * var(7,:,:) + q(8,6) * var(8,:,:) + & - q(9,6) * var(9,:,:) + q(10,6) * var(10,:,:) ) * idel - dvar(7,:,:) = ( q(1,7) * var(1,:,:) + q(2,7) * var(2,:,:) + & - q(3,7) * var(3,:,:) + q(4,7) * var(4,:,:) + & - q(5,7) * var(5,:,:) + q(6,7) * var(6,:,:) + & - q(7,7) * var(7,:,:) + q(8,7) * var(8,:,:) + & - q(9,7) * var(9,:,:) + q(10,7) * var(10,:,:) ) * idel - il = 8 + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(2,2) * var(2+ol,:,:) + & + q(3,2) * var(3+ol,:,:) + q(4,2) * var(4+ol,:,:) + & + q(5,2) * var(5+ol,:,:) + q(6,2) * var(6+ol,:,:) + & + q(7,2) * var(7+ol,:,:) + q(8,2) * var(8+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(3,3) * var(3+ol,:,:) + q(4,3) * var(4+ol,:,:) + & + q(5,3) * var(5+ol,:,:) + q(6,3) * var(6+ol,:,:) + & + q(7,3) * var(7+ol,:,:) + q(8,3) * var(8+ol,:,:) + & + q(9,3) * var(9+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(4,4) * var(4+ol,:,:) + & + q(5,4) * var(5+ol,:,:) + q(6,4) * var(6+ol,:,:) + & + q(7,4) * var(7+ol,:,:) + q(8,4) * var(8+ol,:,:) + & + q(9,4) * var(9+ol,:,:) + q(10,4) * var(10+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(5,5) * var(5+ol,:,:) + q(6,5) * var(6+ol,:,:) + & + q(7,5) * var(7+ol,:,:) + q(8,5) * var(8+ol,:,:) + & + q(9,5) * var(9+ol,:,:) + q(10,5) * var(10+ol,:,:) ) * idel + dvar(6+ol,:,:) = ( q(1,6) * var(1+ol,:,:) + q(2,6) * var(2+ol,:,:) + & + q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & + q(5,6) * var(5+ol,:,:) + q(6,6) * var(6+ol,:,:) + & + q(7,6) * var(7+ol,:,:) + q(8,6) * var(8+ol,:,:) + & + q(9,6) * var(9+ol,:,:) + q(10,6) * var(10+ol,:,:) ) * idel + dvar(7+ol,:,:) = ( q(1,7) * var(1+ol,:,:) + q(2,7) * var(2+ol,:,:) + & + q(3,7) * var(3+ol,:,:) + q(4,7) * var(4+ol,:,:) + & + q(5,7) * var(5+ol,:,:) + q(6,7) * var(6+ol,:,:) + & + q(7,7) * var(7+ol,:,:) + q(8,7) * var(8+ol,:,:) + & + q(9,7) * var(9+ol,:,:) + q(10,7) * var(10+ol,:,:) ) * idel + il = 8 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni-6,:,:) = - ( q(1,7) * var(ni,:,:) + q(2,7) * var(ni-1,:,:) + & - q(3,7) * var(ni-2,:,:) + q(4,7) * var(ni-3,:,:) + & - q(5,7) * var(ni-4,:,:) + q(6,7) * var(ni-5,:,:) + & - q(7,7) * var(ni-6,:,:) + q(8,7) * var(ni-7,:,:) + & - q(9,7) * var(ni-8,:,:) + & - q(10,7) * var(ni-9,:,:) ) * idel - dvar(ni-5,:,:) = - ( q(1,6) * var(ni,:,:) + q(2,6) * var(ni-1,:,:) + & - q(3,6) * var(ni-2,:,:) + q(4,6) * var(ni-3,:,:) + & - q(5,6) * var(ni-4,:,:) + q(6,6) * var(ni-5,:,:) + & - q(7,6) * var(ni-6,:,:) + q(8,6) * var(ni-7,:,:) + & - q(9,6) * var(ni-8,:,:) + & - q(10,6) * var(ni-9,:,:) ) * idel - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(5,5) * var(ni-4,:,:) + q(6,5) * var(ni-5,:,:) + & - q(7,5) * var(ni-6,:,:) + q(8,5) * var(ni-7,:,:) + & - q(9,5) * var(ni-8,:,:) + & - q(10,5) * var(ni-9,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(4,4) * var(ni-3,:,:) + & - q(5,4) * var(ni-4,:,:) + q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) + q(8,4) * var(ni-7,:,:) + & - q(9,4) * var(ni-8,:,:) + & - q(10,4) * var(ni-9,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(3,3) * var(ni-2,:,:) + q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) + q(6,3) * var(ni-5,:,:) + & - q(7,3) * var(ni-6,:,:) + q(8,3) * var(ni-7,:,:) + & - q(9,3) * var(ni-8,:,:)) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(2,2) * var(ni-1,:,:) + & - q(3,2) * var(ni-2,:,:) + q(4,2) * var(ni-3,:,:) + & - q(5,2) * var(ni-4,:,:) + q(6,2) * var(ni-5,:,:) + & - q(7,2) * var(ni-6,:,:) + & - q(8,2) * var(ni-7,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) + & - q(6,1) * var(ni-5,:,:) ) * idel - ir = ni - 7 + or = ni - offset(2) + dvar(or-6,:,:) = - ( q(1,7) * var(or,:,:) + q(2,7) * var(or-1,:,:) + & + q(3,7) * var(or-2,:,:) + q(4,7) * var(or-3,:,:) + & + q(5,7) * var(or-4,:,:) + q(6,7) * var(or-5,:,:) + & + q(7,7) * var(or-6,:,:) + q(8,7) * var(or-7,:,:) + & + q(9,7) * var(or-8,:,:) + & + q(10,7) * var(or-9,:,:) ) * idel + dvar(or-5,:,:) = - ( q(1,6) * var(or,:,:) + q(2,6) * var(or-1,:,:) + & + q(3,6) * var(or-2,:,:) + q(4,6) * var(or-3,:,:) + & + q(5,6) * var(or-4,:,:) + q(6,6) * var(or-5,:,:) + & + q(7,6) * var(or-6,:,:) + q(8,6) * var(or-7,:,:) + & + q(9,6) * var(or-8,:,:) + & + q(10,6) * var(or-9,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(5,5) * var(or-4,:,:) + q(6,5) * var(or-5,:,:) + & + q(7,5) * var(or-6,:,:) + q(8,5) * var(or-7,:,:) + & + q(9,5) * var(or-8,:,:) + & + q(10,5) * var(or-9,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(4,4) * var(or-3,:,:) + & + q(5,4) * var(or-4,:,:) + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) + q(8,4) * var(or-7,:,:) + & + q(9,4) * var(or-8,:,:) + & + q(10,4) * var(or-9,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(3,3) * var(or-2,:,:) + q(4,3) * var(or-3,:,:) + & + q(5,3) * var(or-4,:,:) + q(6,3) * var(or-5,:,:) + & + q(7,3) * var(or-6,:,:) + q(8,3) * var(or-7,:,:) + & + q(9,3) * var(or-8,:,:)) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(2,2) * var(or-1,:,:) + & + q(3,2) * var(or-2,:,:) + q(4,2) * var(or-3,:,:) + & + q(5,2) * var(or-4,:,:) + q(6,2) * var(or-5,:,:) + & + q(7,2) * var(or-6,:,:) + & + q(8,2) * var(or-7,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) + & + q(6,1) * var(or-5,:,:) ) * idel + ir = or - 7 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -132,82 +135,84 @@ subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) + q(6,1) * var(:,6,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(2,2) * var(:,2,:) + & - q(3,2) * var(:,3,:) + q(4,2) * var(:,4,:) + & - q(5,2) * var(:,5,:) + q(6,2) * var(:,6,:) + & - q(7,2) * var(:,7,:) + q(8,2) * var(:,8,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(3,3) * var(:,3,:) + q(4,3) * var(:,4,:) + & - q(5,3) * var(:,5,:) + q(6,3) * var(:,6,:) + & - q(7,3) * var(:,7,:) + q(8,3) * var(:,8,:) + & - q(9,3) * var(:,9,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(4,4) * var(:,4,:) + & - q(5,4) * var(:,5,:) + q(6,4) * var(:,6,:) + & - q(7,4) * var(:,7,:) + q(8,4) * var(:,8,:) + & - q(9,4) * var(:,9,:) + q(10,4) * var(:,10,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(5,5) * var(:,5,:) + q(6,5) * var(:,6,:) + & - q(7,5) * var(:,7,:) + q(8,5) * var(:,8,:) + & - q(9,5) * var(:,9,:) + q(10,5) * var(:,10,:) ) * idel - dvar(:,6,:) = ( q(1,6) * var(:,1,:) + q(2,6) * var(:,2,:) + & - q(3,6) * var(:,3,:) + q(4,6) * var(:,4,:) + & - q(5,6) * var(:,5,:) + q(6,6) * var(:,6,:) + & - q(7,6) * var(:,7,:) + q(8,6) * var(:,8,:) + & - q(9,6) * var(:,9,:) + q(10,6) * var(:,10,:) ) * idel - dvar(:,7,:) = ( q(1,7) * var(:,1,:) + q(2,7) * var(:,2,:) + & - q(3,7) * var(:,3,:) + q(4,7) * var(:,4,:) + & - q(5,7) * var(:,5,:) + q(6,7) * var(:,6,:) + & - q(7,7) * var(:,7,:) + q(8,7) * var(:,8,:) + & - q(9,7) * var(:,9,:) + q(10,7) * var(:,10,:) ) * idel - jl = 8 + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) + q(6,1) * var(:,6+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(2,2) * var(:,2+ol,:) + & + q(3,2) * var(:,3+ol,:) + q(4,2) * var(:,4+ol,:) + & + q(5,2) * var(:,5+ol,:) + q(6,2) * var(:,6+ol,:) + & + q(7,2) * var(:,7+ol,:) + q(8,2) * var(:,8+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(3,3) * var(:,3+ol,:) + q(4,3) * var(:,4+ol,:) + & + q(5,3) * var(:,5+ol,:) + q(6,3) * var(:,6+ol,:) + & + q(7,3) * var(:,7+ol,:) + q(8,3) * var(:,8+ol,:) + & + q(9,3) * var(:,9+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(4,4) * var(:,4+ol,:) + & + q(5,4) * var(:,5+ol,:) + q(6,4) * var(:,6+ol,:) + & + q(7,4) * var(:,7+ol,:) + q(8,4) * var(:,8+ol,:) + & + q(9,4) * var(:,9+ol,:) + q(10,4) * var(:,10+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(5,5) * var(:,5+ol,:) + q(6,5) * var(:,6+ol,:) + & + q(7,5) * var(:,7+ol,:) + q(8,5) * var(:,8+ol,:) + & + q(9,5) * var(:,9+ol,:) + q(10,5) * var(:,10+ol,:) ) * idel + dvar(:,6+ol,:) = ( q(1,6) * var(:,1+ol,:) + q(2,6) * var(:,2+ol,:) + & + q(3,6) * var(:,3+ol,:) + q(4,6) * var(:,4+ol,:) + & + q(5,6) * var(:,5+ol,:) + q(6,6) * var(:,6+ol,:) + & + q(7,6) * var(:,7+ol,:) + q(8,6) * var(:,8+ol,:) + & + q(9,6) * var(:,9+ol,:) + q(10,6) * var(:,10+ol,:) ) * idel + dvar(:,7+ol,:) = ( q(1,7) * var(:,1+ol,:) + q(2,7) * var(:,2+ol,:) + & + q(3,7) * var(:,3+ol,:) + q(4,7) * var(:,4+ol,:) + & + q(5,7) * var(:,5+ol,:) + q(6,7) * var(:,6+ol,:) + & + q(7,7) * var(:,7+ol,:) + q(8,7) * var(:,8+ol,:) + & + q(9,7) * var(:,9+ol,:) + q(10,7) * var(:,10+ol,:) ) * idel + jl = 8 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj-6,:) = - ( q(1,7) * var(:,nj,:) + q(2,7) * var(:,nj-1,:) + & - q(3,7) * var(:,nj-2,:) + q(4,7) * var(:,nj-3,:) + & - q(5,7) * var(:,nj-4,:) + q(6,7) * var(:,nj-5,:) + & - q(7,7) * var(:,nj-6,:) + q(8,7) * var(:,nj-7,:) + & - q(9,7) * var(:,nj-8,:) + & - q(10,7) * var(:,nj-9,:) ) * idel - dvar(:,nj-5,:) = - ( q(1,6) * var(:,nj,:) + q(2,6) * var(:,nj-1,:) + & - q(3,6) * var(:,nj-2,:) + q(4,6) * var(:,nj-3,:) + & - q(5,6) * var(:,nj-4,:) + q(6,6) * var(:,nj-5,:) + & - q(7,6) * var(:,nj-6,:) + q(8,6) * var(:,nj-7,:) + & - q(9,6) * var(:,nj-8,:) + & - q(10,6) * var(:,nj-9,:) ) * idel - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(5,5) * var(:,nj-4,:) + q(6,5) * var(:,nj-5,:) + & - q(7,5) * var(:,nj-6,:) + q(8,5) * var(:,nj-7,:) + & - q(9,5) * var(:,nj-8,:) + & - q(10,5) * var(:,nj-9,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(4,4) * var(:,nj-3,:) + & - q(5,4) * var(:,nj-4,:) + q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) + q(8,4) * var(:,nj-7,:) + & - q(9,4) * var(:,nj-8,:) + & - q(10,4) * var(:,nj-9,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(3,3) * var(:,nj-2,:) + q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) + q(6,3) * var(:,nj-5,:) + & - q(7,3) * var(:,nj-6,:) + q(8,3) * var(:,nj-7,:) + & - q(9,3) * var(:,nj-8,:)) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(2,2) * var(:,nj-1,:) + & - q(3,2) * var(:,nj-2,:) + q(4,2) * var(:,nj-3,:) + & - q(5,2) * var(:,nj-4,:) + q(6,2) * var(:,nj-5,:) + & - q(7,2) * var(:,nj-6,:) + & - q(8,2) * var(:,nj-7,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) + & - q(6,1) * var(:,nj-5,:) ) * idel - jr = nj - 7 + or = nj - offset(2) + dvar(:,or-6,:) = - ( q(1,7) * var(:,or,:) + q(2,7) * var(:,or-1,:) + & + q(3,7) * var(:,or-2,:) + q(4,7) * var(:,or-3,:) + & + q(5,7) * var(:,or-4,:) + q(6,7) * var(:,or-5,:) + & + q(7,7) * var(:,or-6,:) + q(8,7) * var(:,or-7,:) + & + q(9,7) * var(:,or-8,:) + & + q(10,7) * var(:,or-9,:) ) * idel + dvar(:,or-5,:) = - ( q(1,6) * var(:,or,:) + q(2,6) * var(:,or-1,:) + & + q(3,6) * var(:,or-2,:) + q(4,6) * var(:,or-3,:) + & + q(5,6) * var(:,or-4,:) + q(6,6) * var(:,or-5,:) + & + q(7,6) * var(:,or-6,:) + q(8,6) * var(:,or-7,:) + & + q(9,6) * var(:,or-8,:) + & + q(10,6) * var(:,or-9,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(5,5) * var(:,or-4,:) + q(6,5) * var(:,or-5,:) + & + q(7,5) * var(:,or-6,:) + q(8,5) * var(:,or-7,:) + & + q(9,5) * var(:,or-8,:) + & + q(10,5) * var(:,or-9,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(4,4) * var(:,or-3,:) + & + q(5,4) * var(:,or-4,:) + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) + q(8,4) * var(:,or-7,:) + & + q(9,4) * var(:,or-8,:) + & + q(10,4) * var(:,or-9,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(3,3) * var(:,or-2,:) + q(4,3) * var(:,or-3,:) + & + q(5,3) * var(:,or-4,:) + q(6,3) * var(:,or-5,:) + & + q(7,3) * var(:,or-6,:) + q(8,3) * var(:,or-7,:) + & + q(9,3) * var(:,or-8,:)) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(2,2) * var(:,or-1,:) + & + q(3,2) * var(:,or-2,:) + q(4,2) * var(:,or-3,:) + & + q(5,2) * var(:,or-4,:) + q(6,2) * var(:,or-5,:) + & + q(7,2) * var(:,or-6,:) + & + q(8,2) * var(:,or-7,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) + & + q(6,1) * var(:,or-5,:) ) * idel + jr = or - 7 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -224,82 +229,84 @@ subroutine deriv_gf_6_5 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) + q(6,1) * var(:,:,6) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(2,2) * var(:,:,2) + & - q(3,2) * var(:,:,3) + q(4,2) * var(:,:,4) + & - q(5,2) * var(:,:,5) + q(6,2) * var(:,:,6) + & - q(7,2) * var(:,:,7) + q(8,2) * var(:,:,8) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(3,3) * var(:,:,3) + q(4,3) * var(:,:,4) + & - q(5,3) * var(:,:,5) + q(6,3) * var(:,:,6) + & - q(7,3) * var(:,:,7) + q(8,3) * var(:,:,8) + & - q(9,3) * var(:,:,9) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(4,4) * var(:,:,4) + & - q(5,4) * var(:,:,5) + q(6,4) * var(:,:,6) + & - q(7,4) * var(:,:,7) + q(8,4) * var(:,:,8) + & - q(9,4) * var(:,:,9) + q(10,4) * var(:,:,10) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(5,5) * var(:,:,5) + q(6,5) * var(:,:,6) + & - q(7,5) * var(:,:,7) + q(8,5) * var(:,:,8) + & - q(9,5) * var(:,:,9) + q(10,5) * var(:,:,10) ) * idel - dvar(:,:,6) = ( q(1,6) * var(:,:,1) + q(2,6) * var(:,:,2) + & - q(3,6) * var(:,:,3) + q(4,6) * var(:,:,4) + & - q(5,6) * var(:,:,5) + q(6,6) * var(:,:,6) + & - q(7,6) * var(:,:,7) + q(8,6) * var(:,:,8) + & - q(9,6) * var(:,:,9) + q(10,6) * var(:,:,10) ) * idel - dvar(:,:,7) = ( q(1,7) * var(:,:,1) + q(2,7) * var(:,:,2) + & - q(3,7) * var(:,:,3) + q(4,7) * var(:,:,4) + & - q(5,7) * var(:,:,5) + q(6,7) * var(:,:,6) + & - q(7,7) * var(:,:,7) + q(8,7) * var(:,:,8) + & - q(9,7) * var(:,:,9) + q(10,7) * var(:,:,10) ) * idel - kl = 8 + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) + q(6,1) * var(:,:,6+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(2,2) * var(:,:,2+ol) + & + q(3,2) * var(:,:,3+ol) + q(4,2) * var(:,:,4+ol) + & + q(5,2) * var(:,:,5+ol) + q(6,2) * var(:,:,6+ol) + & + q(7,2) * var(:,:,7+ol) + q(8,2) * var(:,:,8+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(3,3) * var(:,:,3+ol) + q(4,3) * var(:,:,4+ol) + & + q(5,3) * var(:,:,5+ol) + q(6,3) * var(:,:,6+ol) + & + q(7,3) * var(:,:,7+ol) + q(8,3) * var(:,:,8+ol) + & + q(9,3) * var(:,:,9+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(4,4) * var(:,:,4+ol) + & + q(5,4) * var(:,:,5+ol) + q(6,4) * var(:,:,6+ol) + & + q(7,4) * var(:,:,7+ol) + q(8,4) * var(:,:,8+ol) + & + q(9,4) * var(:,:,9+ol) + q(10,4) * var(:,:,10+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(5,5) * var(:,:,5+ol) + q(6,5) * var(:,:,6+ol) + & + q(7,5) * var(:,:,7+ol) + q(8,5) * var(:,:,8+ol) + & + q(9,5) * var(:,:,9+ol) + q(10,5) * var(:,:,10+ol) ) * idel + dvar(:,:,6+ol) = ( q(1,6) * var(:,:,1+ol) + q(2,6) * var(:,:,2+ol) + & + q(3,6) * var(:,:,3+ol) + q(4,6) * var(:,:,4+ol) + & + q(5,6) * var(:,:,5+ol) + q(6,6) * var(:,:,6+ol) + & + q(7,6) * var(:,:,7+ol) + q(8,6) * var(:,:,8+ol) + & + q(9,6) * var(:,:,9+ol) + q(10,6) * var(:,:,10+ol) ) * idel + dvar(:,:,7+ol) = ( q(1,7) * var(:,:,1+ol) + q(2,7) * var(:,:,2+ol) + & + q(3,7) * var(:,:,3+ol) + q(4,7) * var(:,:,4+ol) + & + q(5,7) * var(:,:,5+ol) + q(6,7) * var(:,:,6+ol) + & + q(7,7) * var(:,:,7+ol) + q(8,7) * var(:,:,8+ol) + & + q(9,7) * var(:,:,9+ol) + q(10,7) * var(:,:,10+ol) ) * idel + kl = 8 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk-6) = - ( q(1,7) * var(:,:,nk) + q(2,7) * var(:,:,nk-1) + & - q(3,7) * var(:,:,nk-2) + q(4,7) * var(:,:,nk-3) + & - q(5,7) * var(:,:,nk-4) + q(6,7) * var(:,:,nk-5) + & - q(7,7) * var(:,:,nk-6) + q(8,7) * var(:,:,nk-7) + & - q(9,7) * var(:,:,nk-8) + & - q(10,7) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-5) = - ( q(1,6) * var(:,:,nk) + q(2,6) * var(:,:,nk-1) + & - q(3,6) * var(:,:,nk-2) + q(4,6) * var(:,:,nk-3) + & - q(5,6) * var(:,:,nk-4) + q(6,6) * var(:,:,nk-5) + & - q(7,6) * var(:,:,nk-6) + q(8,6) * var(:,:,nk-7) + & - q(9,6) * var(:,:,nk-8) + & - q(10,6) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(5,5) * var(:,:,nk-4) + q(6,5) * var(:,:,nk-5) + & - q(7,5) * var(:,:,nk-6) + q(8,5) * var(:,:,nk-7) + & - q(9,5) * var(:,:,nk-8) + & - q(10,5) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(4,4) * var(:,:,nk-3) + & - q(5,4) * var(:,:,nk-4) + q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) + q(8,4) * var(:,:,nk-7) + & - q(9,4) * var(:,:,nk-8) + & - q(10,4) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(3,3) * var(:,:,nk-2) + q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) + q(6,3) * var(:,:,nk-5) + & - q(7,3) * var(:,:,nk-6) + q(8,3) * var(:,:,nk-7) + & - q(9,3) * var(:,:,nk-8)) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(2,2) * var(:,:,nk-1) + & - q(3,2) * var(:,:,nk-2) + q(4,2) * var(:,:,nk-3) + & - q(5,2) * var(:,:,nk-4) + q(6,2) * var(:,:,nk-5) + & - q(7,2) * var(:,:,nk-6) + & - q(8,2) * var(:,:,nk-7) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) + & - q(6,1) * var(:,:,nk-5) ) * idel - kr = nk - 7 + or = nk - offset(2) + dvar(:,:,or-6) = - ( q(1,7) * var(:,:,or) + q(2,7) * var(:,:,or-1) + & + q(3,7) * var(:,:,or-2) + q(4,7) * var(:,:,or-3) + & + q(5,7) * var(:,:,or-4) + q(6,7) * var(:,:,or-5) + & + q(7,7) * var(:,:,or-6) + q(8,7) * var(:,:,or-7) + & + q(9,7) * var(:,:,or-8) + & + q(10,7) * var(:,:,or-9) ) * idel + dvar(:,:,or-5) = - ( q(1,6) * var(:,:,or) + q(2,6) * var(:,:,or-1) + & + q(3,6) * var(:,:,or-2) + q(4,6) * var(:,:,or-3) + & + q(5,6) * var(:,:,or-4) + q(6,6) * var(:,:,or-5) + & + q(7,6) * var(:,:,or-6) + q(8,6) * var(:,:,or-7) + & + q(9,6) * var(:,:,or-8) + & + q(10,6) * var(:,:,or-9) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(5,5) * var(:,:,or-4) + q(6,5) * var(:,:,or-5) + & + q(7,5) * var(:,:,or-6) + q(8,5) * var(:,:,or-7) + & + q(9,5) * var(:,:,or-8) + & + q(10,5) * var(:,:,or-9) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(4,4) * var(:,:,or-3) + & + q(5,4) * var(:,:,or-4) + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) + q(8,4) * var(:,:,or-7) + & + q(9,4) * var(:,:,or-8) + & + q(10,4) * var(:,:,or-9) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(3,3) * var(:,:,or-2) + q(4,3) * var(:,:,or-3) + & + q(5,3) * var(:,:,or-4) + q(6,3) * var(:,:,or-5) + & + q(7,3) * var(:,:,or-6) + q(8,3) * var(:,:,or-7) + & + q(9,3) * var(:,:,or-8)) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(2,2) * var(:,:,or-1) + & + q(3,2) * var(:,:,or-2) + q(4,2) * var(:,:,or-3) + & + q(5,2) * var(:,:,or-4) + q(6,2) * var(:,:,or-5) + & + q(7,2) * var(:,:,or-6) + & + q(8,2) * var(:,:,or-7) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) + & + q(6,1) * var(:,:,or-5) ) * idel + kr = or - 7 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Derivatives_6_5_min_err_coeff.F90 b/src/Derivatives_6_5_min_err_coeff.F90 index 7f9e209..1571dd0 100644 --- a/src/Derivatives_6_5_min_err_coeff.F90 +++ b/src/Derivatives_6_5_min_err_coeff.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(10,7), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,86 +42,88 @@ subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) + q(6,1) * var(6,:,:) + & - q(7,1) * var(7,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(2,2) * var(2,:,:) + & - q(3,2) * var(3,:,:) + q(4,2) * var(4,:,:) + & - q(5,2) * var(5,:,:) + q(6,2) * var(6,:,:) + & - q(7,2) * var(7,:,:) + q(8,2) * var(8,:,:) + & - q(9,2) * var(9,:,:) + q(10,2) * var(10,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(3,3) * var(3,:,:) + q(4,3) * var(4,:,:) + & - q(5,3) * var(5,:,:) + q(6,3) * var(6,:,:) + & - q(7,3) * var(7,:,:) + q(8,3) * var(8,:,:) + & - q(9,3) * var(9,:,:) + q(10,3) * var(10,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(4,4) * var(4,:,:) + & - q(5,4) * var(5,:,:) + q(6,4) * var(6,:,:) + & - q(7,4) * var(7,:,:) + q(8,4) * var(8,:,:) + & - q(9,4) * var(9,:,:) + q(10,4) * var(10,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(5,5) * var(5,:,:) + q(6,5) * var(6,:,:) + & - q(7,5) * var(7,:,:) + q(8,5) * var(8,:,:) + & - q(9,5) * var(9,:,:) + q(10,5) * var(10,:,:) ) * idel - dvar(6,:,:) = ( q(1,6) * var(1,:,:) + q(2,6) * var(2,:,:) + & - q(3,6) * var(3,:,:) + q(4,6) * var(4,:,:) + & - q(5,6) * var(5,:,:) + q(6,6) * var(6,:,:) + & - q(7,6) * var(7,:,:) + q(8,6) * var(8,:,:) + & - q(9,6) * var(9,:,:) + q(10,6) * var(10,:,:) ) * idel - dvar(7,:,:) = ( q(1,7) * var(1,:,:) + q(2,7) * var(2,:,:) + & - q(3,7) * var(3,:,:) + q(4,7) * var(4,:,:) + & - q(5,7) * var(5,:,:) + q(6,7) * var(6,:,:) + & - q(7,7) * var(7,:,:) + q(8,7) * var(8,:,:) + & - q(9,7) * var(9,:,:) + q(10,7) * var(10,:,:) ) * idel - il = 8 + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) + & + q(7,1) * var(7+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(2,2) * var(2+ol,:,:) + & + q(3,2) * var(3+ol,:,:) + q(4,2) * var(4+ol,:,:) + & + q(5,2) * var(5+ol,:,:) + q(6,2) * var(6+ol,:,:) + & + q(7,2) * var(7+ol,:,:) + q(8,2) * var(8+ol,:,:) + & + q(9,2) * var(9+ol,:,:) + q(10,2) * var(10+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(3,3) * var(3+ol,:,:) + q(4,3) * var(4+ol,:,:) + & + q(5,3) * var(5+ol,:,:) + q(6,3) * var(6+ol,:,:) + & + q(7,3) * var(7+ol,:,:) + q(8,3) * var(8+ol,:,:) + & + q(9,3) * var(9+ol,:,:) + q(10,3) * var(10+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(4,4) * var(4+ol,:,:) + & + q(5,4) * var(5+ol,:,:) + q(6,4) * var(6+ol,:,:) + & + q(7,4) * var(7+ol,:,:) + q(8,4) * var(8+ol,:,:) + & + q(9,4) * var(9+ol,:,:) + q(10,4) * var(10+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(5,5) * var(5+ol,:,:) + q(6,5) * var(6+ol,:,:) + & + q(7,5) * var(7+ol,:,:) + q(8,5) * var(8+ol,:,:) + & + q(9,5) * var(9+ol,:,:) + q(10,5) * var(10+ol,:,:) ) * idel + dvar(6+ol,:,:) = ( q(1,6) * var(1+ol,:,:) + q(2,6) * var(2+ol,:,:) + & + q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & + q(5,6) * var(5+ol,:,:) + q(6,6) * var(6+ol,:,:) + & + q(7,6) * var(7+ol,:,:) + q(8,6) * var(8+ol,:,:) + & + q(9,6) * var(9+ol,:,:) + q(10,6) * var(10+ol,:,:) ) * idel + dvar(7+ol,:,:) = ( q(1,7) * var(1+ol,:,:) + q(2,7) * var(2+ol,:,:) + & + q(3,7) * var(3+ol,:,:) + q(4,7) * var(4+ol,:,:) + & + q(5,7) * var(5+ol,:,:) + q(6,7) * var(6+ol,:,:) + & + q(7,7) * var(7+ol,:,:) + q(8,7) * var(8+ol,:,:) + & + q(9,7) * var(9+ol,:,:) + q(10,7) * var(10+ol,:,:) ) * idel + il = 8 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni-6,:,:) = - ( q(1,7) * var(ni,:,:) + q(2,7) * var(ni-1,:,:) + & - q(3,7) * var(ni-2,:,:) + q(4,7) * var(ni-3,:,:) + & - q(5,7) * var(ni-4,:,:) + q(6,7) * var(ni-5,:,:) + & - q(7,7) * var(ni-6,:,:) + q(8,7) * var(ni-7,:,:) + & - q(9,7) * var(ni-8,:,:) + & - q(10,7) * var(ni-9,:,:) ) * idel - dvar(ni-5,:,:) = - ( q(1,6) * var(ni,:,:) + q(2,6) * var(ni-1,:,:) + & - q(3,6) * var(ni-2,:,:) + q(4,6) * var(ni-3,:,:) + & - q(5,6) * var(ni-4,:,:) + q(6,6) * var(ni-5,:,:) + & - q(7,6) * var(ni-6,:,:) + q(8,6) * var(ni-7,:,:) + & - q(9,6) * var(ni-8,:,:) + & - q(10,6) * var(ni-9,:,:) ) * idel - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(5,5) * var(ni-4,:,:) + q(6,5) * var(ni-5,:,:) + & - q(7,5) * var(ni-6,:,:) + q(8,5) * var(ni-7,:,:) + & - q(9,5) * var(ni-8,:,:) + & - q(10,5) * var(ni-9,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(4,4) * var(ni-3,:,:) + & - q(5,4) * var(ni-4,:,:) + q(6,4) * var(ni-5,:,:) + & - q(7,4) * var(ni-6,:,:) + q(8,4) * var(ni-7,:,:) + & - q(9,4) * var(ni-8,:,:) + & - q(10,4) * var(ni-9,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(3,3) * var(ni-2,:,:) + q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) + q(6,3) * var(ni-5,:,:) + & - q(7,3) * var(ni-6,:,:) + q(8,3) * var(ni-7,:,:) + & - q(9,3) * var(ni-8,:,:) + & - q(10,3) * var(ni-9,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(2,2) * var(ni-1,:,:) + & - q(3,2) * var(ni-2,:,:) + q(4,2) * var(ni-3,:,:) + & - q(5,2) * var(ni-4,:,:) + q(6,2) * var(ni-5,:,:) + & - q(7,2) * var(ni-6,:,:) + q(8,2) * var(ni-7,:,:) + & - q(9,2) * var(ni-8,:,:) + & - q(10,2) * var(ni-9,:,:) ) * idel - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) + q(6,1) * var(ni-5,:,:) + & - q(7,1) * var(ni-6,:,:) ) * idel - ir = ni - 7 + or = ni - offset(2) + dvar(or-6,:,:) = - ( q(1,7) * var(or,:,:) + q(2,7) * var(or-1,:,:) + & + q(3,7) * var(or-2,:,:) + q(4,7) * var(or-3,:,:) + & + q(5,7) * var(or-4,:,:) + q(6,7) * var(or-5,:,:) + & + q(7,7) * var(or-6,:,:) + q(8,7) * var(or-7,:,:) + & + q(9,7) * var(or-8,:,:) + & + q(10,7) * var(or-9,:,:) ) * idel + dvar(or-5,:,:) = - ( q(1,6) * var(or,:,:) + q(2,6) * var(or-1,:,:) + & + q(3,6) * var(or-2,:,:) + q(4,6) * var(or-3,:,:) + & + q(5,6) * var(or-4,:,:) + q(6,6) * var(or-5,:,:) + & + q(7,6) * var(or-6,:,:) + q(8,6) * var(or-7,:,:) + & + q(9,6) * var(or-8,:,:) + & + q(10,6) * var(or-9,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(5,5) * var(or-4,:,:) + q(6,5) * var(or-5,:,:) + & + q(7,5) * var(or-6,:,:) + q(8,5) * var(or-7,:,:) + & + q(9,5) * var(or-8,:,:) + & + q(10,5) * var(or-9,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(4,4) * var(or-3,:,:) + & + q(5,4) * var(or-4,:,:) + q(6,4) * var(or-5,:,:) + & + q(7,4) * var(or-6,:,:) + q(8,4) * var(or-7,:,:) + & + q(9,4) * var(or-8,:,:) + & + q(10,4) * var(or-9,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(3,3) * var(or-2,:,:) + q(4,3) * var(or-3,:,:) + & + q(5,3) * var(or-4,:,:) + q(6,3) * var(or-5,:,:) + & + q(7,3) * var(or-6,:,:) + q(8,3) * var(or-7,:,:) + & + q(9,3) * var(or-8,:,:) + & + q(10,3) * var(or-9,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(2,2) * var(or-1,:,:) + & + q(3,2) * var(or-2,:,:) + q(4,2) * var(or-3,:,:) + & + q(5,2) * var(or-4,:,:) + q(6,2) * var(or-5,:,:) + & + q(7,2) * var(or-6,:,:) + q(8,2) * var(or-7,:,:) + & + q(9,2) * var(or-8,:,:) + & + q(10,2) * var(or-9,:,:) ) * idel + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) + q(6,1) * var(or-5,:,:) + & + q(7,1) * var(or-6,:,:) ) * idel + ir = or - 7 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -136,86 +139,88 @@ subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) + q(6,1) * var(:,6,:) + & - q(7,1) * var(:,7,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(2,2) * var(:,2,:) + & - q(3,2) * var(:,3,:) + q(4,2) * var(:,4,:) + & - q(5,2) * var(:,5,:) + q(6,2) * var(:,6,:) + & - q(7,2) * var(:,7,:) + q(8,2) * var(:,8,:) + & - q(9,2) * var(:,9,:) + q(10,2) * var(:,10,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(3,3) * var(:,3,:) + q(4,3) * var(:,4,:) + & - q(5,3) * var(:,5,:) + q(6,3) * var(:,6,:) + & - q(7,3) * var(:,7,:) + q(8,3) * var(:,8,:) + & - q(9,3) * var(:,9,:) + q(10,3) * var(:,10,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(4,4) * var(:,4,:) + & - q(5,4) * var(:,5,:) + q(6,4) * var(:,6,:) + & - q(7,4) * var(:,7,:) + q(8,4) * var(:,8,:) + & - q(9,4) * var(:,9,:) + q(10,4) * var(:,10,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(5,5) * var(:,5,:) + q(6,5) * var(:,6,:) + & - q(7,5) * var(:,7,:) + q(8,5) * var(:,8,:) + & - q(9,5) * var(:,9,:) + q(10,5) * var(:,10,:) ) * idel - dvar(:,6,:) = ( q(1,6) * var(:,1,:) + q(2,6) * var(:,2,:) + & - q(3,6) * var(:,3,:) + q(4,6) * var(:,4,:) + & - q(5,6) * var(:,5,:) + q(6,6) * var(:,6,:) + & - q(7,6) * var(:,7,:) + q(8,6) * var(:,8,:) + & - q(9,6) * var(:,9,:) + q(10,6) * var(:,10,:) ) * idel - dvar(:,7,:) = ( q(1,7) * var(:,1,:) + q(2,7) * var(:,2,:) + & - q(3,7) * var(:,3,:) + q(4,7) * var(:,4,:) + & - q(5,7) * var(:,5,:) + q(6,7) * var(:,6,:) + & - q(7,7) * var(:,7,:) + q(8,7) * var(:,8,:) + & - q(9,7) * var(:,9,:) + q(10,7) * var(:,10,:) ) * idel - jl = 8 + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) + q(6,1) * var(:,6+ol,:) + & + q(7,1) * var(:,7+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(2,2) * var(:,2+ol,:) + & + q(3,2) * var(:,3+ol,:) + q(4,2) * var(:,4+ol,:) + & + q(5,2) * var(:,5+ol,:) + q(6,2) * var(:,6+ol,:) + & + q(7,2) * var(:,7+ol,:) + q(8,2) * var(:,8+ol,:) + & + q(9,2) * var(:,9+ol,:) + q(10,2) * var(:,10+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(3,3) * var(:,3+ol,:) + q(4,3) * var(:,4+ol,:) + & + q(5,3) * var(:,5+ol,:) + q(6,3) * var(:,6+ol,:) + & + q(7,3) * var(:,7+ol,:) + q(8,3) * var(:,8+ol,:) + & + q(9,3) * var(:,9+ol,:) + q(10,3) * var(:,10+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(4,4) * var(:,4+ol,:) + & + q(5,4) * var(:,5+ol,:) + q(6,4) * var(:,6+ol,:) + & + q(7,4) * var(:,7+ol,:) + q(8,4) * var(:,8+ol,:) + & + q(9,4) * var(:,9+ol,:) + q(10,4) * var(:,10+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(5,5) * var(:,5+ol,:) + q(6,5) * var(:,6+ol,:) + & + q(7,5) * var(:,7+ol,:) + q(8,5) * var(:,8+ol,:) + & + q(9,5) * var(:,9+ol,:) + q(10,5) * var(:,10+ol,:) ) * idel + dvar(:,6+ol,:) = ( q(1,6) * var(:,1+ol,:) + q(2,6) * var(:,2+ol,:) + & + q(3,6) * var(:,3+ol,:) + q(4,6) * var(:,4+ol,:) + & + q(5,6) * var(:,5+ol,:) + q(6,6) * var(:,6+ol,:) + & + q(7,6) * var(:,7+ol,:) + q(8,6) * var(:,8+ol,:) + & + q(9,6) * var(:,9+ol,:) + q(10,6) * var(:,10+ol,:) ) * idel + dvar(:,7+ol,:) = ( q(1,7) * var(:,1+ol,:) + q(2,7) * var(:,2+ol,:) + & + q(3,7) * var(:,3+ol,:) + q(4,7) * var(:,4+ol,:) + & + q(5,7) * var(:,5+ol,:) + q(6,7) * var(:,6+ol,:) + & + q(7,7) * var(:,7+ol,:) + q(8,7) * var(:,8+ol,:) + & + q(9,7) * var(:,9+ol,:) + q(10,7) * var(:,10+ol,:) ) * idel + jl = 8 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj-6,:) = - ( q(1,7) * var(:,nj,:) + q(2,7) * var(:,nj-1,:) + & - q(3,7) * var(:,nj-2,:) + q(4,7) * var(:,nj-3,:) + & - q(5,7) * var(:,nj-4,:) + q(6,7) * var(:,nj-5,:) + & - q(7,7) * var(:,nj-6,:) + q(8,7) * var(:,nj-7,:) + & - q(9,7) * var(:,nj-8,:) + & - q(10,7) * var(:,nj-9,:) ) * idel - dvar(:,nj-5,:) = - ( q(1,6) * var(:,nj,:) + q(2,6) * var(:,nj-1,:) + & - q(3,6) * var(:,nj-2,:) + q(4,6) * var(:,nj-3,:) + & - q(5,6) * var(:,nj-4,:) + q(6,6) * var(:,nj-5,:) + & - q(7,6) * var(:,nj-6,:) + q(8,6) * var(:,nj-7,:) + & - q(9,6) * var(:,nj-8,:) + & - q(10,6) * var(:,nj-9,:) ) * idel - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(5,5) * var(:,nj-4,:) + q(6,5) * var(:,nj-5,:) + & - q(7,5) * var(:,nj-6,:) + q(8,5) * var(:,nj-7,:) + & - q(9,5) * var(:,nj-8,:) + & - q(10,5) * var(:,nj-9,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(4,4) * var(:,nj-3,:) + & - q(5,4) * var(:,nj-4,:) + q(6,4) * var(:,nj-5,:) + & - q(7,4) * var(:,nj-6,:) + q(8,4) * var(:,nj-7,:) + & - q(9,4) * var(:,nj-8,:) + & - q(10,4) * var(:,nj-9,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(3,3) * var(:,nj-2,:) + q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) + q(6,3) * var(:,nj-5,:) + & - q(7,3) * var(:,nj-6,:) + q(8,3) * var(:,nj-7,:) + & - q(9,3) * var(:,nj-8,:) + & - q(10,3) * var(:,nj-9,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(2,2) * var(:,nj-1,:) + & - q(3,2) * var(:,nj-2,:) + q(4,2) * var(:,nj-3,:) + & - q(5,2) * var(:,nj-4,:) + q(6,2) * var(:,nj-5,:) + & - q(7,2) * var(:,nj-6,:) + q(8,2) * var(:,nj-7,:) + & - q(9,2) * var(:,nj-8,:) + & - q(10,2) * var(:,nj-9,:) ) * idel - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) + q(6,1) * var(:,nj-5,:) + & - q(7,1) * var(:,nj-6,:) ) * idel - jr = nj - 7 + or = nj - offset(2) + dvar(:,or-6,:) = - ( q(1,7) * var(:,or,:) + q(2,7) * var(:,or-1,:) + & + q(3,7) * var(:,or-2,:) + q(4,7) * var(:,or-3,:) + & + q(5,7) * var(:,or-4,:) + q(6,7) * var(:,or-5,:) + & + q(7,7) * var(:,or-6,:) + q(8,7) * var(:,or-7,:) + & + q(9,7) * var(:,or-8,:) + & + q(10,7) * var(:,or-9,:) ) * idel + dvar(:,or-5,:) = - ( q(1,6) * var(:,or,:) + q(2,6) * var(:,or-1,:) + & + q(3,6) * var(:,or-2,:) + q(4,6) * var(:,or-3,:) + & + q(5,6) * var(:,or-4,:) + q(6,6) * var(:,or-5,:) + & + q(7,6) * var(:,or-6,:) + q(8,6) * var(:,or-7,:) + & + q(9,6) * var(:,or-8,:) + & + q(10,6) * var(:,or-9,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(5,5) * var(:,or-4,:) + q(6,5) * var(:,or-5,:) + & + q(7,5) * var(:,or-6,:) + q(8,5) * var(:,or-7,:) + & + q(9,5) * var(:,or-8,:) + & + q(10,5) * var(:,or-9,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(4,4) * var(:,or-3,:) + & + q(5,4) * var(:,or-4,:) + q(6,4) * var(:,or-5,:) + & + q(7,4) * var(:,or-6,:) + q(8,4) * var(:,or-7,:) + & + q(9,4) * var(:,or-8,:) + & + q(10,4) * var(:,or-9,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(3,3) * var(:,or-2,:) + q(4,3) * var(:,or-3,:) + & + q(5,3) * var(:,or-4,:) + q(6,3) * var(:,or-5,:) + & + q(7,3) * var(:,or-6,:) + q(8,3) * var(:,or-7,:) + & + q(9,3) * var(:,or-8,:) + & + q(10,3) * var(:,or-9,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(2,2) * var(:,or-1,:) + & + q(3,2) * var(:,or-2,:) + q(4,2) * var(:,or-3,:) + & + q(5,2) * var(:,or-4,:) + q(6,2) * var(:,or-5,:) + & + q(7,2) * var(:,or-6,:) + q(8,2) * var(:,or-7,:) + & + q(9,2) * var(:,or-8,:) + & + q(10,2) * var(:,or-9,:) ) * idel + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) + q(6,1) * var(:,or-5,:) + & + q(7,1) * var(:,or-6,:) ) * idel + jr = or - 7 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -232,86 +237,88 @@ subroutine deriv_gf_6_5_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) + q(6,1) * var(:,:,6) + & - q(7,1) * var(:,:,7) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(2,2) * var(:,:,2) + & - q(3,2) * var(:,:,3) + q(4,2) * var(:,:,4) + & - q(5,2) * var(:,:,5) + q(6,2) * var(:,:,6) + & - q(7,2) * var(:,:,7) + q(8,2) * var(:,:,8) + & - q(9,2) * var(:,:,9) + q(10,2) * var(:,:,10) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(3,3) * var(:,:,3) + q(4,3) * var(:,:,4) + & - q(5,3) * var(:,:,5) + q(6,3) * var(:,:,6) + & - q(7,3) * var(:,:,7) + q(8,3) * var(:,:,8) + & - q(9,3) * var(:,:,9) + q(10,3) * var(:,:,10) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(4,4) * var(:,:,4) + & - q(5,4) * var(:,:,5) + q(6,4) * var(:,:,6) + & - q(7,4) * var(:,:,7) + q(8,4) * var(:,:,8) + & - q(9,4) * var(:,:,9) + q(10,4) * var(:,:,10) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(5,5) * var(:,:,5) + q(6,5) * var(:,:,6) + & - q(7,5) * var(:,:,7) + q(8,5) * var(:,:,8) + & - q(9,5) * var(:,:,9) + q(10,5) * var(:,:,10) ) * idel - dvar(:,:,6) = ( q(1,6) * var(:,:,1) + q(2,6) * var(:,:,2) + & - q(3,6) * var(:,:,3) + q(4,6) * var(:,:,4) + & - q(5,6) * var(:,:,5) + q(6,6) * var(:,:,6) + & - q(7,6) * var(:,:,7) + q(8,6) * var(:,:,8) + & - q(9,6) * var(:,:,9) + q(10,6) * var(:,:,10) ) * idel - dvar(:,:,7) = ( q(1,7) * var(:,:,1) + q(2,7) * var(:,:,2) + & - q(3,7) * var(:,:,3) + q(4,7) * var(:,:,4) + & - q(5,7) * var(:,:,5) + q(6,7) * var(:,:,6) + & - q(7,7) * var(:,:,7) + q(8,7) * var(:,:,8) + & - q(9,7) * var(:,:,9) + q(10,7) * var(:,:,10) ) * idel - kl = 8 + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) + q(6,1) * var(:,:,6+ol) + & + q(7,1) * var(:,:,7+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(2,2) * var(:,:,2+ol) + & + q(3,2) * var(:,:,3+ol) + q(4,2) * var(:,:,4+ol) + & + q(5,2) * var(:,:,5+ol) + q(6,2) * var(:,:,6+ol) + & + q(7,2) * var(:,:,7+ol) + q(8,2) * var(:,:,8+ol) + & + q(9,2) * var(:,:,9+ol) + q(10,2) * var(:,:,10+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(3,3) * var(:,:,3+ol) + q(4,3) * var(:,:,4+ol) + & + q(5,3) * var(:,:,5+ol) + q(6,3) * var(:,:,6+ol) + & + q(7,3) * var(:,:,7+ol) + q(8,3) * var(:,:,8+ol) + & + q(9,3) * var(:,:,9+ol) + q(10,3) * var(:,:,10+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(4,4) * var(:,:,4+ol) + & + q(5,4) * var(:,:,5+ol) + q(6,4) * var(:,:,6+ol) + & + q(7,4) * var(:,:,7+ol) + q(8,4) * var(:,:,8+ol) + & + q(9,4) * var(:,:,9+ol) + q(10,4) * var(:,:,10+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(5,5) * var(:,:,5+ol) + q(6,5) * var(:,:,6+ol) + & + q(7,5) * var(:,:,7+ol) + q(8,5) * var(:,:,8+ol) + & + q(9,5) * var(:,:,9+ol) + q(10,5) * var(:,:,10+ol) ) * idel + dvar(:,:,6+ol) = ( q(1,6) * var(:,:,1+ol) + q(2,6) * var(:,:,2+ol) + & + q(3,6) * var(:,:,3+ol) + q(4,6) * var(:,:,4+ol) + & + q(5,6) * var(:,:,5+ol) + q(6,6) * var(:,:,6+ol) + & + q(7,6) * var(:,:,7+ol) + q(8,6) * var(:,:,8+ol) + & + q(9,6) * var(:,:,9+ol) + q(10,6) * var(:,:,10+ol) ) * idel + dvar(:,:,7+ol) = ( q(1,7) * var(:,:,1+ol) + q(2,7) * var(:,:,2+ol) + & + q(3,7) * var(:,:,3+ol) + q(4,7) * var(:,:,4+ol) + & + q(5,7) * var(:,:,5+ol) + q(6,7) * var(:,:,6+ol) + & + q(7,7) * var(:,:,7+ol) + q(8,7) * var(:,:,8+ol) + & + q(9,7) * var(:,:,9+ol) + q(10,7) * var(:,:,10+ol) ) * idel + kl = 8 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk-6) = - ( q(1,7) * var(:,:,nk) + q(2,7) * var(:,:,nk-1) + & - q(3,7) * var(:,:,nk-2) + q(4,7) * var(:,:,nk-3) + & - q(5,7) * var(:,:,nk-4) + q(6,7) * var(:,:,nk-5) + & - q(7,7) * var(:,:,nk-6) + q(8,7) * var(:,:,nk-7) + & - q(9,7) * var(:,:,nk-8) + & - q(10,7) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-5) = - ( q(1,6) * var(:,:,nk) + q(2,6) * var(:,:,nk-1) + & - q(3,6) * var(:,:,nk-2) + q(4,6) * var(:,:,nk-3) + & - q(5,6) * var(:,:,nk-4) + q(6,6) * var(:,:,nk-5) + & - q(7,6) * var(:,:,nk-6) + q(8,6) * var(:,:,nk-7) + & - q(9,6) * var(:,:,nk-8) + & - q(10,6) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(5,5) * var(:,:,nk-4) + q(6,5) * var(:,:,nk-5) + & - q(7,5) * var(:,:,nk-6) + q(8,5) * var(:,:,nk-7) + & - q(9,5) * var(:,:,nk-8) + & - q(10,5) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(4,4) * var(:,:,nk-3) + & - q(5,4) * var(:,:,nk-4) + q(6,4) * var(:,:,nk-5) + & - q(7,4) * var(:,:,nk-6) + q(8,4) * var(:,:,nk-7) + & - q(9,4) * var(:,:,nk-8) + & - q(10,4) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(3,3) * var(:,:,nk-2) + q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) + q(6,3) * var(:,:,nk-5) + & - q(7,3) * var(:,:,nk-6) + q(8,3) * var(:,:,nk-7) + & - q(9,3) * var(:,:,nk-8) + & - q(10,3) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(2,2) * var(:,:,nk-1) + & - q(3,2) * var(:,:,nk-2) + q(4,2) * var(:,:,nk-3) + & - q(5,2) * var(:,:,nk-4) + q(6,2) * var(:,:,nk-5) + & - q(7,2) * var(:,:,nk-6) + q(8,2) * var(:,:,nk-7) + & - q(9,2) * var(:,:,nk-8) + & - q(10,2) * var(:,:,nk-9) ) * idel - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) + q(6,1) * var(:,:,nk-5) + & - q(7,1) * var(:,:,nk-6) ) * idel - kr = nk - 7 + or = nk - offset(2) + dvar(:,:,or-6) = - ( q(1,7) * var(:,:,or) + q(2,7) * var(:,:,or-1) + & + q(3,7) * var(:,:,or-2) + q(4,7) * var(:,:,or-3) + & + q(5,7) * var(:,:,or-4) + q(6,7) * var(:,:,or-5) + & + q(7,7) * var(:,:,or-6) + q(8,7) * var(:,:,or-7) + & + q(9,7) * var(:,:,or-8) + & + q(10,7) * var(:,:,or-9) ) * idel + dvar(:,:,or-5) = - ( q(1,6) * var(:,:,or) + q(2,6) * var(:,:,or-1) + & + q(3,6) * var(:,:,or-2) + q(4,6) * var(:,:,or-3) + & + q(5,6) * var(:,:,or-4) + q(6,6) * var(:,:,or-5) + & + q(7,6) * var(:,:,or-6) + q(8,6) * var(:,:,or-7) + & + q(9,6) * var(:,:,or-8) + & + q(10,6) * var(:,:,or-9) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(5,5) * var(:,:,or-4) + q(6,5) * var(:,:,or-5) + & + q(7,5) * var(:,:,or-6) + q(8,5) * var(:,:,or-7) + & + q(9,5) * var(:,:,or-8) + & + q(10,5) * var(:,:,or-9) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(4,4) * var(:,:,or-3) + & + q(5,4) * var(:,:,or-4) + q(6,4) * var(:,:,or-5) + & + q(7,4) * var(:,:,or-6) + q(8,4) * var(:,:,or-7) + & + q(9,4) * var(:,:,or-8) + & + q(10,4) * var(:,:,or-9) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(3,3) * var(:,:,or-2) + q(4,3) * var(:,:,or-3) + & + q(5,3) * var(:,:,or-4) + q(6,3) * var(:,:,or-5) + & + q(7,3) * var(:,:,or-6) + q(8,3) * var(:,:,or-7) + & + q(9,3) * var(:,:,or-8) + & + q(10,3) * var(:,:,or-9) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(2,2) * var(:,:,or-1) + & + q(3,2) * var(:,:,or-2) + q(4,2) * var(:,:,or-3) + & + q(5,2) * var(:,:,or-4) + q(6,2) * var(:,:,or-5) + & + q(7,2) * var(:,:,or-6) + q(8,2) * var(:,:,or-7) + & + q(9,2) * var(:,:,or-8) + & + q(10,2) * var(:,:,or-9) ) * idel + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) + q(6,1) * var(:,:,or-5) + & + q(7,1) * var(:,:,or-6) ) * idel + kr = or - 7 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Derivatives_8_4.F90 b/src/Derivatives_8_4.F90 index 9b74e48..ea843ff 100644 --- a/src/Derivatives_8_4.F90 +++ b/src/Derivatives_8_4.F90 @@ -2,7 +2,7 @@ #include "cctk_Functions.h" #include "cctk_Parameters.h" -subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) +subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dvar ) use All_Coeffs_mod @@ -16,6 +16,7 @@ subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_INT, intent(IN) :: dir CCTK_INT, intent(IN) :: bb(2) CCTK_INT, intent(IN) :: gsize + CCTK_INT, intent(IN) :: offset(2) CCTK_REAL, intent(IN) :: delta CCTK_REAL, dimension(ni,nj,nk), intent(OUT) :: dvar @@ -23,7 +24,7 @@ subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) CCTK_REAL, dimension(12,8), save :: q CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or logical, save :: first = .true. @@ -41,88 +42,90 @@ subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then il = 1 + gsize else - dvar(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & - q(5,1) * var(5,:,:) + q(6,1) * var(6,:,:) + & - q(7,1) * var(7,:,:) + q(8,1) * var(8,:,:) ) * idel - dvar(2,:,:) = ( q(1,2) * var(1,:,:) + q(3,2) * var(3,:,:) + & - q(4,2) * var(4,:,:) + q(5,2) * var(5,:,:) + & - q(6,2) * var(6,:,:) + q(7,2) * var(7,:,:) + & - q(8,2) * var(8,:,:) ) * idel - dvar(3,:,:) = ( q(1,3) * var(1,:,:) + q(2,3) * var(2,:,:) + & - q(4,3) * var(4,:,:) + q(5,3) * var(5,:,:) + & - q(6,3) * var(6,:,:) + q(7,3) * var(7,:,:) + & - q(8,3) * var(8,:,:) ) * idel - dvar(4,:,:) = ( q(1,4) * var(1,:,:) + q(2,4) * var(2,:,:) + & - q(3,4) * var(3,:,:) + q(5,4) * var(5,:,:) + & - q(6,4) * var(6,:,:) + q(7,4) * var(7,:,:) + & - q(8,4) * var(8,:,:) ) * idel - dvar(5,:,:) = ( q(1,5) * var(1,:,:) + q(2,5) * var(2,:,:) + & - q(3,5) * var(3,:,:) + q(4,5) * var(4,:,:) + & - q(6,5) * var(6,:,:) + q(7,5) * var(7,:,:) + & - q(8,5) * var(8,:,:) + q(9,5) * var(9,:,:) ) * idel - dvar(6,:,:) = ( q(1,6) * var(1,:,:) + q(2,6) * var(2,:,:) + & - q(3,6) * var(3,:,:) + q(4,6) * var(4,:,:) + & - q(5,6) * var(5,:,:) + q(7,6) * var(7,:,:) + & - q(8,6) * var(8,:,:) + q(9,6) * var(9,:,:) + & - q(10,6) * var(10,:,:) ) * idel - dvar(7,:,:) = ( q(1,7) * var(1,:,:) + q(2,7) * var(2,:,:) + & - q(3,7) * var(3,:,:) + q(4,7) * var(4,:,:) + & - q(5,7) * var(5,:,:) + q(6,7) * var(6,:,:) + & - q(8,7) * var(8,:,:) + q(9,7) * var(9,:,:) + & - q(10,7) * var(10,:,:) + q(11,7) * var(11,:,:) ) * idel - dvar(8,:,:) = ( q(1,8) * var(1,:,:) + q(2,8) * var(2,:,:) + & - q(3,8) * var(3,:,:) + q(4,8) * var(4,:,:) + & - q(5,8) * var(5,:,:) + q(6,8) * var(6,:,:) + & - q(7,8) * var(7,:,:) + q(9,8) * var(9,:,:) + & - q(10,8) * var(10,:,:) + q(11,8) * var(11,:,:) + & - q(12,8) * var(12,:,:) ) * idel - il = 9 + ol = offset(1) + dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) + & + q(7,1) * var(7+ol,:,:) + q(8,1) * var(8+ol,:,:) ) * idel + dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) + & + q(4,2) * var(4+ol,:,:) + q(5,2) * var(5+ol,:,:) + & + q(6,2) * var(6+ol,:,:) + q(7,2) * var(7+ol,:,:) + & + q(8,2) * var(8+ol,:,:) ) * idel + dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & + q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) + & + q(6,3) * var(6+ol,:,:) + q(7,3) * var(7+ol,:,:) + & + q(8,3) * var(8+ol,:,:) ) * idel + dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & + q(3,4) * var(3+ol,:,:) + q(5,4) * var(5+ol,:,:) + & + q(6,4) * var(6+ol,:,:) + q(7,4) * var(7+ol,:,:) + & + q(8,4) * var(8+ol,:,:) ) * idel + dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(6,5) * var(6+ol,:,:) + q(7,5) * var(7+ol,:,:) + & + q(8,5) * var(8+ol,:,:) + q(9,5) * var(9+ol,:,:) ) * idel + dvar(6+ol,:,:) = ( q(1,6) * var(1+ol,:,:) + q(2,6) * var(2+ol,:,:) + & + q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & + q(5,6) * var(5+ol,:,:) + q(7,6) * var(7+ol,:,:) + & + q(8,6) * var(8+ol,:,:) + q(9,6) * var(9+ol,:,:) + & + q(10,6) * var(10+ol,:,:) ) * idel + dvar(7+ol,:,:) = ( q(1,7) * var(1+ol,:,:) + q(2,7) * var(2+ol,:,:) + & + q(3,7) * var(3+ol,:,:) + q(4,7) * var(4+ol,:,:) + & + q(5,7) * var(5+ol,:,:) + q(6,7) * var(6+ol,:,:) + & + q(8,7) * var(8+ol,:,:) + q(9,7) * var(9+ol,:,:) + & + q(10,7) * var(10+ol,:,:) + q(11,7) * var(11+ol,:,:) ) * idel + dvar(8+ol,:,:) = ( q(1,8) * var(1+ol,:,:) + q(2,8) * var(2+ol,:,:) + & + q(3,8) * var(3+ol,:,:) + q(4,8) * var(4+ol,:,:) + & + q(5,8) * var(5+ol,:,:) + q(6,8) * var(6+ol,:,:) + & + q(7,8) * var(7+ol,:,:) + q(9,8) * var(9+ol,:,:) + & + q(10,8) * var(10+ol,:,:) + q(11,8) * var(11+ol,:,:) + & + q(12,8) * var(12+ol,:,:) ) * idel + il = 9 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni,:,:) = - ( q(1,1) * var(ni,:,:) + q(2,1) * var(ni-1,:,:) + & - q(3,1) * var(ni-2,:,:) + q(4,1) * var(ni-3,:,:) + & - q(5,1) * var(ni-4,:,:) + q(6,1) * var(ni-5,:,:) + & - q(7,1) * var(ni-6,:,:) + & - q(8,1) * var(ni-7,:,:) ) * idel - dvar(ni-1,:,:) = - ( q(1,2) * var(ni,:,:) + q(3,2) * var(ni-2,:,:) + & - q(4,2) * var(ni-3,:,:) + q(5,2) * var(ni-4,:,:) + & - q(6,2) * var(ni-5,:,:) + q(7,2) * var(ni-6,:,:) + & - q(8,2) * var(ni-7,:,:) ) * idel - dvar(ni-2,:,:) = - ( q(1,3) * var(ni,:,:) + q(2,3) * var(ni-1,:,:) + & - q(4,3) * var(ni-3,:,:) + q(5,3) * var(ni-4,:,:) + & - q(6,3) * var(ni-5,:,:) + q(7,3) * var(ni-6,:,:) + & - q(8,3) * var(ni-7,:,:) ) * idel - dvar(ni-3,:,:) = - ( q(1,4) * var(ni,:,:) + q(2,4) * var(ni-1,:,:) + & - q(3,4) * var(ni-2,:,:) + q(5,4) * var(ni-4,:,:) + & - q(6,4) * var(ni-5,:,:) + q(7,4) * var(ni-6,:,:) + & - q(8,4) * var(ni-7,:,:) ) * idel - dvar(ni-4,:,:) = - ( q(1,5) * var(ni,:,:) + q(2,5) * var(ni-1,:,:) + & - q(3,5) * var(ni-2,:,:) + q(4,5) * var(ni-3,:,:) + & - q(6,5) * var(ni-5,:,:) + q(7,5) * var(ni-6,:,:) + & - q(8,5) * var(ni-7,:,:) + & - q(9,5) * var(ni-8,:,:) ) * idel - dvar(ni-5,:,:) = - ( q(1,6) * var(ni,:,:) + q(2,6) * var(ni-1,:,:) + & - q(3,6) * var(ni-2,:,:) + q(4,6) * var(ni-3,:,:) + & - q(5,6) * var(ni-4,:,:) + q(7,6) * var(ni-6,:,:) + & - q(8,6) * var(ni-7,:,:) + q(9,6) * var(ni-8,:,:) + & - q(10,6) * var(ni-9,:,:) ) * idel - dvar(ni-6,:,:) = - ( q(1,7) * var(ni,:,:) + q(2,7) * var(ni-1,:,:) + & - q(3,7) * var(ni-2,:,:) + q(4,7) * var(ni-3,:,:) + & - q(5,7) * var(ni-4,:,:) + q(6,7) * var(ni-5,:,:) + & - q(8,7) * var(ni-7,:,:) + q(9,7) * var(ni-8,:,:) + & - q(10,7) * var(ni-9,:,:) + & - q(11,7) * var(ni-10,:,:) ) * idel - dvar(ni-7,:,:) = - ( q(1,8) * var(ni,:,:) + q(2,8) * var(ni-1,:,:) + & - q(3,8) * var(ni-2,:,:) + q(4,8) * var(ni-3,:,:) + & - q(5,8) * var(ni-4,:,:) + q(6,8) * var(ni-5,:,:) + & - q(7,8) * var(ni-6,:,:) + q(9,8) * var(ni-8,:,:) + & - q(10,8) * var(ni-9,:,:) + & - q(11,8) * var(ni-10,:,:) + & - q(12,8) * var(ni-11,:,:) ) * idel - ir = ni - 8 + or = ni - offset(2) + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) + q(6,1) * var(or-5,:,:) + & + q(7,1) * var(or-6,:,:) + & + q(8,1) * var(or-7,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(3,2) * var(or-2,:,:) + & + q(4,2) * var(or-3,:,:) + q(5,2) * var(or-4,:,:) + & + q(6,2) * var(or-5,:,:) + q(7,2) * var(or-6,:,:) + & + q(8,2) * var(or-7,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(4,3) * var(or-3,:,:) + q(5,3) * var(or-4,:,:) + & + q(6,3) * var(or-5,:,:) + q(7,3) * var(or-6,:,:) + & + q(8,3) * var(or-7,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(5,4) * var(or-4,:,:) + & + q(6,4) * var(or-5,:,:) + q(7,4) * var(or-6,:,:) + & + q(8,4) * var(or-7,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(6,5) * var(or-5,:,:) + q(7,5) * var(or-6,:,:) + & + q(8,5) * var(or-7,:,:) + & + q(9,5) * var(or-8,:,:) ) * idel + dvar(or-5,:,:) = - ( q(1,6) * var(or,:,:) + q(2,6) * var(or-1,:,:) + & + q(3,6) * var(or-2,:,:) + q(4,6) * var(or-3,:,:) + & + q(5,6) * var(or-4,:,:) + q(7,6) * var(or-6,:,:) + & + q(8,6) * var(or-7,:,:) + q(9,6) * var(or-8,:,:) + & + q(10,6) * var(or-9,:,:) ) * idel + dvar(or-6,:,:) = - ( q(1,7) * var(or,:,:) + q(2,7) * var(or-1,:,:) + & + q(3,7) * var(or-2,:,:) + q(4,7) * var(or-3,:,:) + & + q(5,7) * var(or-4,:,:) + q(6,7) * var(or-5,:,:) + & + q(8,7) * var(or-7,:,:) + q(9,7) * var(or-8,:,:) + & + q(10,7) * var(or-9,:,:) + & + q(11,7) * var(or-10,:,:) ) * idel + dvar(or-7,:,:) = - ( q(1,8) * var(or,:,:) + q(2,8) * var(or-1,:,:) + & + q(3,8) * var(or-2,:,:) + q(4,8) * var(or-3,:,:) + & + q(5,8) * var(or-4,:,:) + q(6,8) * var(or-5,:,:) + & + q(7,8) * var(or-6,:,:) + q(9,8) * var(or-8,:,:) + & + q(10,8) * var(or-9,:,:) + & + q(11,8) * var(or-10,:,:) + & + q(12,8) * var(or-11,:,:) ) * idel + ir = or - 8 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -140,88 +143,90 @@ subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then jl = 1 + gsize else - dvar(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & - q(5,1) * var(:,5,:) + q(6,1) * var(:,6,:) + & - q(7,1) * var(:,7,:) + q(8,1) * var(:,8,:) ) * idel - dvar(:,2,:) = ( q(1,2) * var(:,1,:) + q(3,2) * var(:,3,:) + & - q(4,2) * var(:,4,:) + q(5,2) * var(:,5,:) + & - q(6,2) * var(:,6,:) + q(7,2) * var(:,7,:) + & - q(8,2) * var(:,8,:) ) * idel - dvar(:,3,:) = ( q(1,3) * var(:,1,:) + q(2,3) * var(:,2,:) + & - q(4,3) * var(:,4,:) + q(5,3) * var(:,5,:) + & - q(6,3) * var(:,6,:) + q(7,3) * var(:,7,:) + & - q(8,3) * var(:,8,:) ) * idel - dvar(:,4,:) = ( q(1,4) * var(:,1,:) + q(2,4) * var(:,2,:) + & - q(3,4) * var(:,3,:) + q(5,4) * var(:,5,:) + & - q(6,4) * var(:,6,:) + q(7,4) * var(:,7,:) + & - q(8,4) * var(:,8,:) ) * idel - dvar(:,5,:) = ( q(1,5) * var(:,1,:) + q(2,5) * var(:,2,:) + & - q(3,5) * var(:,3,:) + q(4,5) * var(:,4,:) + & - q(6,5) * var(:,6,:) + q(7,5) * var(:,7,:) + & - q(8,5) * var(:,8,:) + q(9,5) * var(:,9,:) ) * idel - dvar(:,6,:) = ( q(1,6) * var(:,1,:) + q(2,6) * var(:,2,:) + & - q(3,6) * var(:,3,:) + q(4,6) * var(:,4,:) + & - q(5,6) * var(:,5,:) + q(7,6) * var(:,7,:) + & - q(8,6) * var(:,8,:) + q(9,6) * var(:,9,:) + & - q(10,6) * var(:,10,:) ) * idel - dvar(:,7,:) = ( q(1,7) * var(:,1,:) + q(2,7) * var(:,2,:) + & - q(3,7) * var(:,3,:) + q(4,7) * var(:,4,:) + & - q(5,7) * var(:,5,:) + q(6,7) * var(:,6,:) + & - q(8,7) * var(:,8,:) + q(9,7) * var(:,9,:) + & - q(10,7) * var(:,10,:) + q(11,7) * var(:,11,:) ) * idel - dvar(:,8,:) = ( q(1,8) * var(:,1,:) + q(2,8) * var(:,2,:) + & - q(3,8) * var(:,3,:) + q(4,8) * var(:,4,:) + & - q(5,8) * var(:,5,:) + q(6,8) * var(:,6,:) + & - q(7,8) * var(:,7,:) + q(9,8) * var(:,9,:) + & - q(10,8) * var(:,10,:) + q(11,8) * var(:,11,:) + & - q(12,8) * var(:,12,:) ) * idel - jl = 9 + ol = offset(1) + dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & + q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & + q(5,1) * var(:,5+ol,:) + q(6,1) * var(:,6+ol,:) + & + q(7,1) * var(:,7+ol,:) + q(8,1) * var(:,8+ol,:) ) * idel + dvar(:,2+ol,:) = ( q(1,2) * var(:,1+ol,:) + q(3,2) * var(:,3+ol,:) + & + q(4,2) * var(:,4+ol,:) + q(5,2) * var(:,5+ol,:) + & + q(6,2) * var(:,6+ol,:) + q(7,2) * var(:,7+ol,:) + & + q(8,2) * var(:,8+ol,:) ) * idel + dvar(:,3+ol,:) = ( q(1,3) * var(:,1+ol,:) + q(2,3) * var(:,2+ol,:) + & + q(4,3) * var(:,4+ol,:) + q(5,3) * var(:,5+ol,:) + & + q(6,3) * var(:,6+ol,:) + q(7,3) * var(:,7+ol,:) + & + q(8,3) * var(:,8+ol,:) ) * idel + dvar(:,4+ol,:) = ( q(1,4) * var(:,1+ol,:) + q(2,4) * var(:,2+ol,:) + & + q(3,4) * var(:,3+ol,:) + q(5,4) * var(:,5+ol,:) + & + q(6,4) * var(:,6+ol,:) + q(7,4) * var(:,7+ol,:) + & + q(8,4) * var(:,8+ol,:) ) * idel + dvar(:,5+ol,:) = ( q(1,5) * var(:,1+ol,:) + q(2,5) * var(:,2+ol,:) + & + q(3,5) * var(:,3+ol,:) + q(4,5) * var(:,4+ol,:) + & + q(6,5) * var(:,6+ol,:) + q(7,5) * var(:,7+ol,:) + & + q(8,5) * var(:,8+ol,:) + q(9,5) * var(:,9+ol,:) ) * idel + dvar(:,6+ol,:) = ( q(1,6) * var(:,1+ol,:) + q(2,6) * var(:,2+ol,:) + & + q(3,6) * var(:,3+ol,:) + q(4,6) * var(:,4+ol,:) + & + q(5,6) * var(:,5+ol,:) + q(7,6) * var(:,7+ol,:) + & + q(8,6) * var(:,8+ol,:) + q(9,6) * var(:,9+ol,:) + & + q(10,6) * var(:,10+ol,:) ) * idel + dvar(:,7+ol,:) = ( q(1,7) * var(:,1+ol,:) + q(2,7) * var(:,2+ol,:) + & + q(3,7) * var(:,3+ol,:) + q(4,7) * var(:,4+ol,:) + & + q(5,7) * var(:,5+ol,:) + q(6,7) * var(:,6+ol,:) + & + q(8,7) * var(:,8+ol,:) + q(9,7) * var(:,9+ol,:) + & + q(10,7) * var(:,10+ol,:) + q(11,7) * var(:,11+ol,:) ) * idel + dvar(:,8+ol,:) = ( q(1,8) * var(:,1+ol,:) + q(2,8) * var(:,2+ol,:) + & + q(3,8) * var(:,3+ol,:) + q(4,8) * var(:,4+ol,:) + & + q(5,8) * var(:,5+ol,:) + q(6,8) * var(:,6+ol,:) + & + q(7,8) * var(:,7+ol,:) + q(9,8) * var(:,9+ol,:) + & + q(10,8) * var(:,10+ol,:) + q(11,8) * var(:,11+ol,:) + & + q(12,8) * var(:,12+ol,:) ) * idel + jl = 9 + ol end if if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj,:) = - ( q(1,1) * var(:,nj,:) + q(2,1) * var(:,nj-1,:) + & - q(3,1) * var(:,nj-2,:) + q(4,1) * var(:,nj-3,:) + & - q(5,1) * var(:,nj-4,:) + q(6,1) * var(:,nj-5,:) + & - q(7,1) * var(:,nj-6,:) + & - q(8,1) * var(:,nj-7,:) ) * idel - dvar(:,nj-1,:) = - ( q(1,2) * var(:,nj,:) + q(3,2) * var(:,nj-2,:) + & - q(4,2) * var(:,nj-3,:) + q(5,2) * var(:,nj-4,:) + & - q(6,2) * var(:,nj-5,:) + q(7,2) * var(:,nj-6,:) + & - q(8,2) * var(:,nj-7,:) ) * idel - dvar(:,nj-2,:) = - ( q(1,3) * var(:,nj,:) + q(2,3) * var(:,nj-1,:) + & - q(4,3) * var(:,nj-3,:) + q(5,3) * var(:,nj-4,:) + & - q(6,3) * var(:,nj-5,:) + q(7,3) * var(:,nj-6,:) + & - q(8,3) * var(:,nj-7,:) ) * idel - dvar(:,nj-3,:) = - ( q(1,4) * var(:,nj,:) + q(2,4) * var(:,nj-1,:) + & - q(3,4) * var(:,nj-2,:) + q(5,4) * var(:,nj-4,:) + & - q(6,4) * var(:,nj-5,:) + q(7,4) * var(:,nj-6,:) + & - q(8,4) * var(:,nj-7,:) ) * idel - dvar(:,nj-4,:) = - ( q(1,5) * var(:,nj,:) + q(2,5) * var(:,nj-1,:) + & - q(3,5) * var(:,nj-2,:) + q(4,5) * var(:,nj-3,:) + & - q(6,5) * var(:,nj-5,:) + q(7,5) * var(:,nj-6,:) + & - q(8,5) * var(:,nj-7,:) + & - q(9,5) * var(:,nj-8,:) ) * idel - dvar(:,nj-5,:) = - ( q(1,6) * var(:,nj,:) + q(2,6) * var(:,nj-1,:) + & - q(3,6) * var(:,nj-2,:) + q(4,6) * var(:,nj-3,:) + & - q(5,6) * var(:,nj-4,:) + q(7,6) * var(:,nj-6,:) + & - q(8,6) * var(:,nj-7,:) + q(9,6) * var(:,nj-8,:) + & - q(10,6) * var(:,nj-9,:) ) * idel - dvar(:,nj-6,:) = - ( q(1,7) * var(:,nj,:) + q(2,7) * var(:,nj-1,:) + & - q(3,7) * var(:,nj-2,:) + q(4,7) * var(:,nj-3,:) + & - q(5,7) * var(:,nj-4,:) + q(6,7) * var(:,nj-5,:) + & - q(8,7) * var(:,nj-7,:) + q(9,7) * var(:,nj-8,:) + & - q(10,7) * var(:,nj-9,:) + & - q(11,7) * var(:,nj-10,:) ) * idel - dvar(:,nj-7,:) = - ( q(1,8) * var(:,nj,:) + q(2,8) * var(:,nj-1,:) + & - q(3,8) * var(:,nj-2,:) + q(4,8) * var(:,nj-3,:) + & - q(5,8) * var(:,nj-4,:) + q(6,8) * var(:,nj-5,:) + & - q(7,8) * var(:,nj-6,:) + q(9,8) * var(:,nj-8,:) + & - q(10,8) * var(:,nj-9,:) + & - q(11,8) * var(:,nj-10,:) + & - q(12,8) * var(:,nj-11,:) ) * idel - jr = nj - 8 + or = nj - offset(2) + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) + q(6,1) * var(:,or-5,:) + & + q(7,1) * var(:,or-6,:) + & + q(8,1) * var(:,or-7,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(3,2) * var(:,or-2,:) + & + q(4,2) * var(:,or-3,:) + q(5,2) * var(:,or-4,:) + & + q(6,2) * var(:,or-5,:) + q(7,2) * var(:,or-6,:) + & + q(8,2) * var(:,or-7,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(4,3) * var(:,or-3,:) + q(5,3) * var(:,or-4,:) + & + q(6,3) * var(:,or-5,:) + q(7,3) * var(:,or-6,:) + & + q(8,3) * var(:,or-7,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(5,4) * var(:,or-4,:) + & + q(6,4) * var(:,or-5,:) + q(7,4) * var(:,or-6,:) + & + q(8,4) * var(:,or-7,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(6,5) * var(:,or-5,:) + q(7,5) * var(:,or-6,:) + & + q(8,5) * var(:,or-7,:) + & + q(9,5) * var(:,or-8,:) ) * idel + dvar(:,or-5,:) = - ( q(1,6) * var(:,or,:) + q(2,6) * var(:,or-1,:) + & + q(3,6) * var(:,or-2,:) + q(4,6) * var(:,or-3,:) + & + q(5,6) * var(:,or-4,:) + q(7,6) * var(:,or-6,:) + & + q(8,6) * var(:,or-7,:) + q(9,6) * var(:,or-8,:) + & + q(10,6) * var(:,or-9,:) ) * idel + dvar(:,or-6,:) = - ( q(1,7) * var(:,or,:) + q(2,7) * var(:,or-1,:) + & + q(3,7) * var(:,or-2,:) + q(4,7) * var(:,or-3,:) + & + q(5,7) * var(:,or-4,:) + q(6,7) * var(:,or-5,:) + & + q(8,7) * var(:,or-7,:) + q(9,7) * var(:,or-8,:) + & + q(10,7) * var(:,or-9,:) + & + q(11,7) * var(:,or-10,:) ) * idel + dvar(:,or-7,:) = - ( q(1,8) * var(:,or,:) + q(2,8) * var(:,or-1,:) + & + q(3,8) * var(:,or-2,:) + q(4,8) * var(:,or-3,:) + & + q(5,8) * var(:,or-4,:) + q(6,8) * var(:,or-5,:) + & + q(7,8) * var(:,or-6,:) + q(9,8) * var(:,or-8,:) + & + q(10,8) * var(:,or-9,:) + & + q(11,8) * var(:,or-10,:) + & + q(12,8) * var(:,or-11,:) ) * idel + jr = or - 8 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -240,88 +245,90 @@ subroutine deriv_gf_8_4 ( var, ni, nj, nk, dir, bb, gsize, delta, dvar ) if ( bb(1) == 0 ) then kl = 1 + gsize else - dvar(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & - q(5,1) * var(:,:,5) + q(6,1) * var(:,:,6) + & - q(7,1) * var(:,:,7) + q(8,1) * var(:,:,8) ) * idel - dvar(:,:,2) = ( q(1,2) * var(:,:,1) + q(3,2) * var(:,:,3) + & - q(4,2) * var(:,:,4) + q(5,2) * var(:,:,5) + & - q(6,2) * var(:,:,6) + q(7,2) * var(:,:,7) + & - q(8,2) * var(:,:,8) ) * idel - dvar(:,:,3) = ( q(1,3) * var(:,:,1) + q(2,3) * var(:,:,2) + & - q(4,3) * var(:,:,4) + q(5,3) * var(:,:,5) + & - q(6,3) * var(:,:,6) + q(7,3) * var(:,:,7) + & - q(8,3) * var(:,:,8) ) * idel - dvar(:,:,4) = ( q(1,4) * var(:,:,1) + q(2,4) * var(:,:,2) + & - q(3,4) * var(:,:,3) + q(5,4) * var(:,:,5) + & - q(6,4) * var(:,:,6) + q(7,4) * var(:,:,7) + & - q(8,4) * var(:,:,8) ) * idel - dvar(:,:,5) = ( q(1,5) * var(:,:,1) + q(2,5) * var(:,:,2) + & - q(3,5) * var(:,:,3) + q(4,5) * var(:,:,4) + & - q(6,5) * var(:,:,6) + q(7,5) * var(:,:,7) + & - q(8,5) * var(:,:,8) + q(9,5) * var(:,:,9) ) * idel - dvar(:,:,6) = ( q(1,6) * var(:,:,1) + q(2,6) * var(:,:,2) + & - q(3,6) * var(:,:,3) + q(4,6) * var(:,:,4) + & - q(5,6) * var(:,:,5) + q(7,6) * var(:,:,7) + & - q(8,6) * var(:,:,8) + q(9,6) * var(:,:,9) + & - q(10,6) * var(:,:,10) ) * idel - dvar(:,:,7) = ( q(1,7) * var(:,:,1) + q(2,7) * var(:,:,2) + & - q(3,7) * var(:,:,3) + q(4,7) * var(:,:,4) + & - q(5,7) * var(:,:,5) + q(6,7) * var(:,:,6) + & - q(8,7) * var(:,:,8) + q(9,7) * var(:,:,9) + & - q(10,7) * var(:,:,10) + q(11,7) * var(:,:,11) ) * idel - dvar(:,:,8) = ( q(1,8) * var(:,:,1) + q(2,8) * var(:,:,2) + & - q(3,8) * var(:,:,3) + q(4,8) * var(:,:,4) + & - q(5,8) * var(:,:,5) + q(6,8) * var(:,:,6) + & - q(7,8) * var(:,:,7) + q(9,8) * var(:,:,9) + & - q(10,8) * var(:,:,10) + q(11,8) * var(:,:,11) + & - q(12,8) * var(:,:,12) ) * idel - kl = 9 + ol = offset(1) + dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & + q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & + q(5,1) * var(:,:,5+ol) + q(6,1) * var(:,:,6+ol) + & + q(7,1) * var(:,:,7+ol) + q(8,1) * var(:,:,8+ol) ) * idel + dvar(:,:,2+ol) = ( q(1,2) * var(:,:,1+ol) + q(3,2) * var(:,:,3+ol) + & + q(4,2) * var(:,:,4+ol) + q(5,2) * var(:,:,5+ol) + & + q(6,2) * var(:,:,6+ol) + q(7,2) * var(:,:,7+ol) + & + q(8,2) * var(:,:,8+ol) ) * idel + dvar(:,:,3+ol) = ( q(1,3) * var(:,:,1+ol) + q(2,3) * var(:,:,2+ol) + & + q(4,3) * var(:,:,4+ol) + q(5,3) * var(:,:,5+ol) + & + q(6,3) * var(:,:,6+ol) + q(7,3) * var(:,:,7+ol) + & + q(8,3) * var(:,:,8+ol) ) * idel + dvar(:,:,4+ol) = ( q(1,4) * var(:,:,1+ol) + q(2,4) * var(:,:,2+ol) + & + q(3,4) * var(:,:,3+ol) + q(5,4) * var(:,:,5+ol) + & + q(6,4) * var(:,:,6+ol) + q(7,4) * var(:,:,7+ol) + & + q(8,4) * var(:,:,8+ol) ) * idel + dvar(:,:,5+ol) = ( q(1,5) * var(:,:,1+ol) + q(2,5) * var(:,:,2+ol) + & + q(3,5) * var(:,:,3+ol) + q(4,5) * var(:,:,4+ol) + & + q(6,5) * var(:,:,6+ol) + q(7,5) * var(:,:,7+ol) + & + q(8,5) * var(:,:,8+ol) + q(9,5) * var(:,:,9+ol) ) * idel + dvar(:,:,6+ol) = ( q(1,6) * var(:,:,1+ol) + q(2,6) * var(:,:,2+ol) + & + q(3,6) * var(:,:,3+ol) + q(4,6) * var(:,:,4+ol) + & + q(5,6) * var(:,:,5+ol) + q(7,6) * var(:,:,7+ol) + & + q(8,6) * var(:,:,8+ol) + q(9,6) * var(:,:,9+ol) + & + q(10,6) * var(:,:,10+ol) ) * idel + dvar(:,:,7+ol) = ( q(1,7) * var(:,:,1+ol) + q(2,7) * var(:,:,2+ol) + & + q(3,7) * var(:,:,3+ol) + q(4,7) * var(:,:,4+ol) + & + q(5,7) * var(:,:,5+ol) + q(6,7) * var(:,:,6+ol) + & + q(8,7) * var(:,:,8+ol) + q(9,7) * var(:,:,9+ol) + & + q(10,7) * var(:,:,10+ol) + q(11,7) * var(:,:,11+ol) ) * idel + dvar(:,:,8+ol) = ( q(1,8) * var(:,:,1+ol) + q(2,8) * var(:,:,2+ol) + & + q(3,8) * var(:,:,3+ol) + q(4,8) * var(:,:,4+ol) + & + q(5,8) * var(:,:,5+ol) + q(6,8) * var(:,:,6+ol) + & + q(7,8) * var(:,:,7+ol) + q(9,8) * var(:,:,9+ol) + & + q(10,8) * var(:,:,10+ol) + q(11,8) * var(:,:,11+ol) + & + q(12,8) * var(:,:,12+ol) ) * idel + kl = 9 + ol end if if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk) = - ( q(1,1) * var(:,:,nk) + q(2,1) * var(:,:,nk-1) + & - q(3,1) * var(:,:,nk-2) + q(4,1) * var(:,:,nk-3) + & - q(5,1) * var(:,:,nk-4) + q(6,1) * var(:,:,nk-5) + & - q(7,1) * var(:,:,nk-6) + & - q(8,1) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-1) = - ( q(1,2) * var(:,:,nk) + q(3,2) * var(:,:,nk-2) + & - q(4,2) * var(:,:,nk-3) + q(5,2) * var(:,:,nk-4) + & - q(6,2) * var(:,:,nk-5) + q(7,2) * var(:,:,nk-6) + & - q(8,2) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-2) = - ( q(1,3) * var(:,:,nk) + q(2,3) * var(:,:,nk-1) + & - q(4,3) * var(:,:,nk-3) + q(5,3) * var(:,:,nk-4) + & - q(6,3) * var(:,:,nk-5) + q(7,3) * var(:,:,nk-6) + & - q(8,3) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-3) = - ( q(1,4) * var(:,:,nk) + q(2,4) * var(:,:,nk-1) + & - q(3,4) * var(:,:,nk-2) + q(5,4) * var(:,:,nk-4) + & - q(6,4) * var(:,:,nk-5) + q(7,4) * var(:,:,nk-6) + & - q(8,4) * var(:,:,nk-7) ) * idel - dvar(:,:,nk-4) = - ( q(1,5) * var(:,:,nk) + q(2,5) * var(:,:,nk-1) + & - q(3,5) * var(:,:,nk-2) + q(4,5) * var(:,:,nk-3) + & - q(6,5) * var(:,:,nk-5) + q(7,5) * var(:,:,nk-6) + & - q(8,5) * var(:,:,nk-7) + & - q(9,5) * var(:,:,nk-8) ) * idel - dvar(:,:,nk-5) = - ( q(1,6) * var(:,:,nk) + q(2,6) * var(:,:,nk-1) + & - q(3,6) * var(:,:,nk-2) + q(4,6) * var(:,:,nk-3) + & - q(5,6) * var(:,:,nk-4) + q(7,6) * var(:,:,nk-6) + & - q(8,6) * var(:,:,nk-7) + q(9,6) * var(:,:,nk-8) + & - q(10,6) * var(:,:,nk-9) ) * idel - dvar(:,:,nk-6) = - ( q(1,7) * var(:,:,nk) + q(2,7) * var(:,:,nk-1) + & - q(3,7) * var(:,:,nk-2) + q(4,7) * var(:,:,nk-3) + & - q(5,7) * var(:,:,nk-4) + q(6,7) * var(:,:,nk-5) + & - q(8,7) * var(:,:,nk-7) + q(9,7) * var(:,:,nk-8) + & - q(10,7) * var(:,:,nk-9) + & - q(11,7) * var(:,:,nk-10) ) * idel - dvar(:,:,nk-7) = - ( q(1,8) * var(:,:,nk) + q(2,8) * var(:,:,nk-1) + & - q(3,8) * var(:,:,nk-2) + q(4,8) * var(:,:,nk-3) + & - q(5,8) * var(:,:,nk-4) + q(6,8) * var(:,:,nk-5) + & - q(7,8) * var(:,:,nk-6) + q(9,8) * var(:,:,nk-8) + & - q(10,8) * var(:,:,nk-9) + & - q(11,8) * var(:,:,nk-10) + & - q(12,8) * var(:,:,nk-11) ) * idel - kr = nk - 8 + or = nk - offset(2) + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) + q(6,1) * var(:,:,or-5) + & + q(7,1) * var(:,:,or-6) + & + q(8,1) * var(:,:,or-7) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(3,2) * var(:,:,or-2) + & + q(4,2) * var(:,:,or-3) + q(5,2) * var(:,:,or-4) + & + q(6,2) * var(:,:,or-5) + q(7,2) * var(:,:,or-6) + & + q(8,2) * var(:,:,or-7) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(4,3) * var(:,:,or-3) + q(5,3) * var(:,:,or-4) + & + q(6,3) * var(:,:,or-5) + q(7,3) * var(:,:,or-6) + & + q(8,3) * var(:,:,or-7) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(5,4) * var(:,:,or-4) + & + q(6,4) * var(:,:,or-5) + q(7,4) * var(:,:,or-6) + & + q(8,4) * var(:,:,or-7) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(6,5) * var(:,:,or-5) + q(7,5) * var(:,:,or-6) + & + q(8,5) * var(:,:,or-7) + & + q(9,5) * var(:,:,or-8) ) * idel + dvar(:,:,or-5) = - ( q(1,6) * var(:,:,or) + q(2,6) * var(:,:,or-1) + & + q(3,6) * var(:,:,or-2) + q(4,6) * var(:,:,or-3) + & + q(5,6) * var(:,:,or-4) + q(7,6) * var(:,:,or-6) + & + q(8,6) * var(:,:,or-7) + q(9,6) * var(:,:,or-8) + & + q(10,6) * var(:,:,or-9) ) * idel + dvar(:,:,or-6) = - ( q(1,7) * var(:,:,or) + q(2,7) * var(:,:,or-1) + & + q(3,7) * var(:,:,or-2) + q(4,7) * var(:,:,or-3) + & + q(5,7) * var(:,:,or-4) + q(6,7) * var(:,:,or-5) + & + q(8,7) * var(:,:,or-7) + q(9,7) * var(:,:,or-8) + & + q(10,7) * var(:,:,or-9) + & + q(11,7) * var(:,:,or-10) ) * idel + dvar(:,:,or-7) = - ( q(1,8) * var(:,:,or) + q(2,8) * var(:,:,or-1) + & + q(3,8) * var(:,:,or-2) + q(4,8) * var(:,:,or-3) + & + q(5,8) * var(:,:,or-4) + q(6,8) * var(:,:,or-5) + & + q(7,8) * var(:,:,or-6) + q(9,8) * var(:,:,or-8) + & + q(10,8) * var(:,:,or-9) + & + q(11,8) * var(:,:,or-10) + & + q(12,8) * var(:,:,or-11) ) * idel + kr = or - 8 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Derivatives_8_4_min_err_coeff.F90 b/src/Derivatives_8_4_min_err_coeff.F90 index 930da74..835d338 100644 --- a/src/Derivatives_8_4_min_err_coeff.F90 +++ b/src/Derivatives_8_4_min_err_coeff.F90 @@ -39,92 +39,93 @@ subroutine deriv_gf_8_4_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dv direction: select case (dir) case (0) direction - ol = offset(1); or = offset(2) if ( bb(1) == 0 ) then il = 1 + gsize else + ol = offset(1) dvar(1+ol,:,:) = ( q(1,1) * var(1+ol,:,:) + q(2,1) * var(2+ol,:,:) + & - q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & - q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) + & - q(7,1) * var(7+ol,:,:) + q(8,1) * var(8+ol,:,:) ) * idel + q(3,1) * var(3+ol,:,:) + q(4,1) * var(4+ol,:,:) + & + q(5,1) * var(5+ol,:,:) + q(6,1) * var(6+ol,:,:) + & + q(7,1) * var(7+ol,:,:) + q(8,1) * var(8+ol,:,:) ) * idel dvar(2+ol,:,:) = ( q(1,2) * var(1+ol,:,:) + q(3,2) * var(3+ol,:,:) + & - q(4,2) * var(4+ol,:,:) + q(5,2) * var(5+ol,:,:) + & - q(6,2) * var(6+ol,:,:) + q(7,2) * var(7+ol,:,:) + & - q(8,2) * var(8+ol,:,:) ) * idel + q(4,2) * var(4+ol,:,:) + q(5,2) * var(5+ol,:,:) + & + q(6,2) * var(6+ol,:,:) + q(7,2) * var(7+ol,:,:) + & + q(8,2) * var(8+ol,:,:) ) * idel dvar(3+ol,:,:) = ( q(1,3) * var(1+ol,:,:) + q(2,3) * var(2+ol,:,:) + & - q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) + & - q(6,3) * var(6+ol,:,:) + q(7,3) * var(7+ol,:,:) + & - q(8,3) * var(8+ol,:,:) ) * idel + q(4,3) * var(4+ol,:,:) + q(5,3) * var(5+ol,:,:) + & + q(6,3) * var(6+ol,:,:) + q(7,3) * var(7+ol,:,:) + & + q(8,3) * var(8+ol,:,:) ) * idel dvar(4+ol,:,:) = ( q(1,4) * var(1+ol,:,:) + q(2,4) * var(2+ol,:,:) + & - q(3,4) * var(3+ol,:,:) + q(5,4) * var(5+ol,:,:) + & - q(6,4) * var(6+ol,:,:) + q(7,4) * var(7+ol,:,:) + & - q(8,4) * var(8+ol,:,:) ) * idel + q(3,4) * var(3+ol,:,:) + q(5,4) * var(5+ol,:,:) + & + q(6,4) * var(6+ol,:,:) + q(7,4) * var(7+ol,:,:) + & + q(8,4) * var(8+ol,:,:) ) * idel dvar(5+ol,:,:) = ( q(1,5) * var(1+ol,:,:) + q(2,5) * var(2+ol,:,:) + & - q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & - q(6,5) * var(6+ol,:,:) + q(7,5) * var(7+ol,:,:) + & - q(8,5) * var(8+ol,:,:) + q(9,5) * var(9+ol,:,:) ) * idel + q(3,5) * var(3+ol,:,:) + q(4,5) * var(4+ol,:,:) + & + q(6,5) * var(6+ol,:,:) + q(7,5) * var(7+ol,:,:) + & + q(8,5) * var(8+ol,:,:) + q(9,5) * var(9+ol,:,:) ) * idel dvar(6+ol,:,:) = ( q(1,6) * var(1+ol,:,:) + q(2,6) * var(2+ol,:,:) + & - q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & - q(5,6) * var(5+ol,:,:) + q(7,6) * var(7+ol,:,:) + & - q(8,6) * var(8+ol,:,:) + q(9,6) * var(9+ol,:,:) + & - q(10,6) * var(10+ol,:,:) ) * idel + q(3,6) * var(3+ol,:,:) + q(4,6) * var(4+ol,:,:) + & + q(5,6) * var(5+ol,:,:) + q(7,6) * var(7+ol,:,:) + & + q(8,6) * var(8+ol,:,:) + q(9,6) * var(9+ol,:,:) + & + q(10,6) * var(10+ol,:,:) ) * idel dvar(7+ol,:,:) = ( q(1,7) * var(1+ol,:,:) + q(2,7) * var(2+ol,:,:) + & - q(3,7) * var(3+ol,:,:) + q(4,7) * var(4+ol,:,:) + & - q(5,7) * var(5+ol,:,:) + q(6,7) * var(6+ol,:,:) + & - q(8,7) * var(8+ol,:,:) + q(9,7) * var(9+ol,:,:) + & - q(10,7) * var(10+ol,:,:) + q(11,7) * var(11+ol,:,:) ) * idel + q(3,7) * var(3+ol,:,:) + q(4,7) * var(4+ol,:,:) + & + q(5,7) * var(5+ol,:,:) + q(6,7) * var(6+ol,:,:) + & + q(8,7) * var(8+ol,:,:) + q(9,7) * var(9+ol,:,:) + & + q(10,7) * var(10+ol,:,:) + q(11,7) * var(11+ol,:,:) ) * idel dvar(8+ol,:,:) = ( q(1,8) * var(1+ol,:,:) + q(2,8) * var(2+ol,:,:) + & - q(3,8) * var(3+ol,:,:) + q(4,8) * var(4+ol,:,:) + & - q(5,8) * var(5+ol,:,:) + q(6,8) * var(6+ol,:,:) + & - q(7,8) * var(7+ol,:,:) + q(9,8) * var(9+ol,:,:) + & - q(10,8) * var(10+ol,:,:) + q(11,8) * var(11+ol,:,:) + & - q(12,8) * var(12+ol,:,:) ) * idel + q(3,8) * var(3+ol,:,:) + q(4,8) * var(4+ol,:,:) + & + q(5,8) * var(5+ol,:,:) + q(6,8) * var(6+ol,:,:) + & + q(7,8) * var(7+ol,:,:) + q(9,8) * var(9+ol,:,:) + & + q(10,8) * var(10+ol,:,:) + q(11,8) * var(11+ol,:,:) + & + q(12,8) * var(12+ol,:,:) ) * idel il = 9 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize else - dvar(ni-or,:,:) = - ( q(1,1) * var(ni-or,:,:) + q(2,1) * var(ni-1-or,:,:) + & - q(3,1) * var(ni-2-or,:,:) + q(4,1) * var(ni-3-or,:,:) + & - q(5,1) * var(ni-4-or,:,:) + q(6,1) * var(ni-5-or,:,:) + & - q(7,1) * var(ni-6-or,:,:) + & - q(8,1) * var(ni-7-or,:,:) ) * idel - dvar(ni-1-or,:,:) = - ( q(1,2) * var(ni-or,:,:) + q(3,2) * var(ni-2-or,:,:) + & - q(4,2) * var(ni-3-or,:,:) + q(5,2) * var(ni-4-or,:,:) + & - q(6,2) * var(ni-5-or,:,:) + q(7,2) * var(ni-6-or,:,:) + & - q(8,2) * var(ni-7-or,:,:) ) * idel - dvar(ni-2-or,:,:) = - ( q(1,3) * var(ni-or,:,:) + q(2,3) * var(ni-1-or,:,:) + & - q(4,3) * var(ni-3-or,:,:) + q(5,3) * var(ni-4-or,:,:) + & - q(6,3) * var(ni-5-or,:,:) + q(7,3) * var(ni-6-or,:,:) + & - q(8,3) * var(ni-7-or,:,:) ) * idel - dvar(ni-3-or,:,:) = - ( q(1,4) * var(ni-or,:,:) + q(2,4) * var(ni-1-or,:,:) + & - q(3,4) * var(ni-2-or,:,:) + q(5,4) * var(ni-4-or,:,:) + & - q(6,4) * var(ni-5-or,:,:) + q(7,4) * var(ni-6-or,:,:) + & - q(8,4) * var(ni-7-or,:,:) ) * idel - dvar(ni-4-or,:,:) = - ( q(1,5) * var(ni-or,:,:) + q(2,5) * var(ni-1-or,:,:) + & - q(3,5) * var(ni-2-or,:,:) + q(4,5) * var(ni-3-or,:,:) + & - q(6,5) * var(ni-5-or,:,:) + q(7,5) * var(ni-6-or,:,:) + & - q(8,5) * var(ni-7-or,:,:) + & - q(9,5) * var(ni-8-or,:,:) ) * idel - dvar(ni-5-or,:,:) = - ( q(1,6) * var(ni-or,:,:) + q(2,6) * var(ni-1-or,:,:) + & - q(3,6) * var(ni-2-or,:,:) + q(4,6) * var(ni-3-or,:,:) + & - q(5,6) * var(ni-4-or,:,:) + q(7,6) * var(ni-6-or,:,:) + & - q(8,6) * var(ni-7-or,:,:) + q(9,6) * var(ni-8-or,:,:) + & - q(10,6) * var(ni-9-or,:,:) ) * idel - dvar(ni-6-or,:,:) = - ( q(1,7) * var(ni-or,:,:) + q(2,7) * var(ni-1-or,:,:) + & - q(3,7) * var(ni-2-or,:,:) + q(4,7) * var(ni-3-or,:,:) + & - q(5,7) * var(ni-4-or,:,:) + q(6,7) * var(ni-5-or,:,:) + & - q(8,7) * var(ni-7-or,:,:) + q(9,7) * var(ni-8-or,:,:) + & - q(10,7) * var(ni-9-or,:,:) + & - q(11,7) * var(ni-10-or,:,:) ) * idel - dvar(ni-7-or,:,:) = - ( q(1,8) * var(ni-or,:,:) + q(2,8) * var(ni-1-or,:,:) + & - q(3,8) * var(ni-2-or,:,:) + q(4,8) * var(ni-3-or,:,:) + & - q(5,8) * var(ni-4-or,:,:) + q(6,8) * var(ni-5-or,:,:) + & - q(7,8) * var(ni-6-or,:,:) + q(9,8) * var(ni-8-or,:,:) + & - q(10,8) * var(ni-9-or,:,:) + & - q(11,8) * var(ni-10-or,:,:) + & - q(12,8) * var(ni-11-or,:,:) ) * idel - ir = ni - 8 - or + or = ni - offset(2) + dvar(or,:,:) = - ( q(1,1) * var(or,:,:) + q(2,1) * var(or-1,:,:) + & + q(3,1) * var(or-2,:,:) + q(4,1) * var(or-3,:,:) + & + q(5,1) * var(or-4,:,:) + q(6,1) * var(or-5,:,:) + & + q(7,1) * var(or-6,:,:) + & + q(8,1) * var(or-7,:,:) ) * idel + dvar(or-1,:,:) = - ( q(1,2) * var(or,:,:) + q(3,2) * var(or-2,:,:) + & + q(4,2) * var(or-3,:,:) + q(5,2) * var(or-4,:,:) + & + q(6,2) * var(or-5,:,:) + q(7,2) * var(or-6,:,:) + & + q(8,2) * var(or-7,:,:) ) * idel + dvar(or-2,:,:) = - ( q(1,3) * var(or,:,:) + q(2,3) * var(or-1,:,:) + & + q(4,3) * var(or-3,:,:) + q(5,3) * var(or-4,:,:) + & + q(6,3) * var(or-5,:,:) + q(7,3) * var(or-6,:,:) + & + q(8,3) * var(or-7,:,:) ) * idel + dvar(or-3,:,:) = - ( q(1,4) * var(or,:,:) + q(2,4) * var(or-1,:,:) + & + q(3,4) * var(or-2,:,:) + q(5,4) * var(or-4,:,:) + & + q(6,4) * var(or-5,:,:) + q(7,4) * var(or-6,:,:) + & + q(8,4) * var(or-7,:,:) ) * idel + dvar(or-4,:,:) = - ( q(1,5) * var(or,:,:) + q(2,5) * var(or-1,:,:) + & + q(3,5) * var(or-2,:,:) + q(4,5) * var(or-3,:,:) + & + q(6,5) * var(or-5,:,:) + q(7,5) * var(or-6,:,:) + & + q(8,5) * var(or-7,:,:) + & + q(9,5) * var(or-8,:,:) ) * idel + dvar(or-5,:,:) = - ( q(1,6) * var(or,:,:) + q(2,6) * var(or-1,:,:) + & + q(3,6) * var(or-2,:,:) + q(4,6) * var(or-3,:,:) + & + q(5,6) * var(or-4,:,:) + q(7,6) * var(or-6,:,:) + & + q(8,6) * var(or-7,:,:) + q(9,6) * var(or-8,:,:) + & + q(10,6) * var(or-9,:,:) ) * idel + dvar(or-6,:,:) = - ( q(1,7) * var(or,:,:) + q(2,7) * var(or-1,:,:) + & + q(3,7) * var(or-2,:,:) + q(4,7) * var(or-3,:,:) + & + q(5,7) * var(or-4,:,:) + q(6,7) * var(or-5,:,:) + & + q(8,7) * var(or-7,:,:) + q(9,7) * var(or-8,:,:) + & + q(10,7) * var(or-9,:,:) + & + q(11,7) * var(or-10,:,:) ) * idel + dvar(or-7,:,:) = - ( q(1,8) * var(or,:,:) + q(2,8) * var(or-1,:,:) + & + q(3,8) * var(or-2,:,:) + q(4,8) * var(or-3,:,:) + & + q(5,8) * var(or-4,:,:) + q(6,8) * var(or-5,:,:) + & + q(7,8) * var(or-6,:,:) + q(9,8) * var(or-8,:,:) + & + q(10,8) * var(or-9,:,:) + & + q(11,8) * var(or-10,:,:) + & + q(12,8) * var(or-11,:,:) ) * idel + ir = or - 8 end if if (il > ir+1) call CCTK_WARN (0, "domain too small") dvar(il:ir,:,:) = ( a(1) * ( var(il+1:ir+1,:,:) - & @@ -136,13 +137,13 @@ subroutine deriv_gf_8_4_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dv a(4) * ( var(il+4:ir+4,:,:) - & var(il-4:ir-4,:,:) ) ) * idel case (1) direction - ol = offset(1); or = offset(2) if ( zero_derivs_y /= 0 ) then dvar = zero else if ( bb(1) == 0 ) then jl = 1 + gsize else + ol = offset(1) dvar(:,1+ol,:) = ( q(1,1) * var(:,1+ol,:) + q(2,1) * var(:,2+ol,:) + & q(3,1) * var(:,3+ol,:) + q(4,1) * var(:,4+ol,:) + & q(5,1) * var(:,5+ol,:) + q(6,1) * var(:,6+ol,:) + & @@ -184,47 +185,48 @@ subroutine deriv_gf_8_4_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dv if ( bb(2) == 0 ) then jr = nj - gsize else - dvar(:,nj-or,:) = - ( q(1,1) * var(:,nj-or,:) + q(2,1) * var(:,nj-1-or,:) + & - q(3,1) * var(:,nj-2-or,:) + q(4,1) * var(:,nj-3-or,:) + & - q(5,1) * var(:,nj-4-or,:) + q(6,1) * var(:,nj-5-or,:) + & - q(7,1) * var(:,nj-6-or,:) + & - q(8,1) * var(:,nj-7-or,:) ) * idel - dvar(:,nj-1-or,:) = - ( q(1,2) * var(:,nj-or,:) + q(3,2) * var(:,nj-2-or,:) + & - q(4,2) * var(:,nj-3-or,:) + q(5,2) * var(:,nj-4-or,:) + & - q(6,2) * var(:,nj-5-or,:) + q(7,2) * var(:,nj-6-or,:) + & - q(8,2) * var(:,nj-7-or,:) ) * idel - dvar(:,nj-2-or,:) = - ( q(1,3) * var(:,nj-or,:) + q(2,3) * var(:,nj-1-or,:) + & - q(4,3) * var(:,nj-3-or,:) + q(5,3) * var(:,nj-4-or,:) + & - q(6,3) * var(:,nj-5-or,:) + q(7,3) * var(:,nj-6-or,:) + & - q(8,3) * var(:,nj-7-or,:) ) * idel - dvar(:,nj-3-or,:) = - ( q(1,4) * var(:,nj-or,:) + q(2,4) * var(:,nj-1-or,:) + & - q(3,4) * var(:,nj-2-or,:) + q(5,4) * var(:,nj-4-or,:) + & - q(6,4) * var(:,nj-5-or,:) + q(7,4) * var(:,nj-6-or,:) + & - q(8,4) * var(:,nj-7-or,:) ) * idel - dvar(:,nj-4-or,:) = - ( q(1,5) * var(:,nj-or,:) + q(2,5) * var(:,nj-1-or,:) + & - q(3,5) * var(:,nj-2-or,:) + q(4,5) * var(:,nj-3-or,:) + & - q(6,5) * var(:,nj-5-or,:) + q(7,5) * var(:,nj-6-or,:) + & - q(8,5) * var(:,nj-7-or,:) + & - q(9,5) * var(:,nj-8-or,:) ) * idel - dvar(:,nj-5-or,:) = - ( q(1,6) * var(:,nj-or,:) + q(2,6) * var(:,nj-1-or,:) + & - q(3,6) * var(:,nj-2-or,:) + q(4,6) * var(:,nj-3-or,:) + & - q(5,6) * var(:,nj-4-or,:) + q(7,6) * var(:,nj-6-or,:) + & - q(8,6) * var(:,nj-7-or,:) + q(9,6) * var(:,nj-8-or,:) + & - q(10,6) * var(:,nj-9-or,:) ) * idel - dvar(:,nj-6-or,:) = - ( q(1,7) * var(:,nj-or,:) + q(2,7) * var(:,nj-1-or,:) + & - q(3,7) * var(:,nj-2-or,:) + q(4,7) * var(:,nj-3-or,:) + & - q(5,7) * var(:,nj-4-or,:) + q(6,7) * var(:,nj-5-or,:) + & - q(8,7) * var(:,nj-7-or,:) + q(9,7) * var(:,nj-8-or,:) + & - q(10,7) * var(:,nj-9-or,:) + & - q(11,7) * var(:,nj-10-or,:) ) * idel - dvar(:,nj-7-or,:) = - ( q(1,8) * var(:,nj-or,:) + q(2,8) * var(:,nj-1-or,:) + & - q(3,8) * var(:,nj-2-or,:) + q(4,8) * var(:,nj-3-or,:) + & - q(5,8) * var(:,nj-4-or,:) + q(6,8) * var(:,nj-5-or,:) + & - q(7,8) * var(:,nj-6-or,:) + q(9,8) * var(:,nj-8-or,:) + & - q(10,8) * var(:,nj-9-or,:) + & - q(11,8) * var(:,nj-10-or,:) + & - q(12,8) * var(:,nj-11-or,:) ) * idel - jr = nj - 8 - or + or = nj - offset(2) + dvar(:,or,:) = - ( q(1,1) * var(:,or,:) + q(2,1) * var(:,or-1,:) + & + q(3,1) * var(:,or-2,:) + q(4,1) * var(:,or-3,:) + & + q(5,1) * var(:,or-4,:) + q(6,1) * var(:,or-5,:) + & + q(7,1) * var(:,or-6,:) + & + q(8,1) * var(:,or-7,:) ) * idel + dvar(:,or-1,:) = - ( q(1,2) * var(:,or,:) + q(3,2) * var(:,or-2,:) + & + q(4,2) * var(:,or-3,:) + q(5,2) * var(:,or-4,:) + & + q(6,2) * var(:,or-5,:) + q(7,2) * var(:,or-6,:) + & + q(8,2) * var(:,or-7,:) ) * idel + dvar(:,or-2,:) = - ( q(1,3) * var(:,or,:) + q(2,3) * var(:,or-1,:) + & + q(4,3) * var(:,or-3,:) + q(5,3) * var(:,or-4,:) + & + q(6,3) * var(:,or-5,:) + q(7,3) * var(:,or-6,:) + & + q(8,3) * var(:,or-7,:) ) * idel + dvar(:,or-3,:) = - ( q(1,4) * var(:,or,:) + q(2,4) * var(:,or-1,:) + & + q(3,4) * var(:,or-2,:) + q(5,4) * var(:,or-4,:) + & + q(6,4) * var(:,or-5,:) + q(7,4) * var(:,or-6,:) + & + q(8,4) * var(:,or-7,:) ) * idel + dvar(:,or-4,:) = - ( q(1,5) * var(:,or,:) + q(2,5) * var(:,or-1,:) + & + q(3,5) * var(:,or-2,:) + q(4,5) * var(:,or-3,:) + & + q(6,5) * var(:,or-5,:) + q(7,5) * var(:,or-6,:) + & + q(8,5) * var(:,or-7,:) + & + q(9,5) * var(:,or-8,:) ) * idel + dvar(:,or-5,:) = - ( q(1,6) * var(:,or,:) + q(2,6) * var(:,or-1,:) + & + q(3,6) * var(:,or-2,:) + q(4,6) * var(:,or-3,:) + & + q(5,6) * var(:,or-4,:) + q(7,6) * var(:,or-6,:) + & + q(8,6) * var(:,or-7,:) + q(9,6) * var(:,or-8,:) + & + q(10,6) * var(:,or-9,:) ) * idel + dvar(:,or-6,:) = - ( q(1,7) * var(:,or,:) + q(2,7) * var(:,or-1,:) + & + q(3,7) * var(:,or-2,:) + q(4,7) * var(:,or-3,:) + & + q(5,7) * var(:,or-4,:) + q(6,7) * var(:,or-5,:) + & + q(8,7) * var(:,or-7,:) + q(9,7) * var(:,or-8,:) + & + q(10,7) * var(:,or-9,:) + & + q(11,7) * var(:,or-10,:) ) * idel + dvar(:,or-7,:) = - ( q(1,8) * var(:,or,:) + q(2,8) * var(:,or-1,:) + & + q(3,8) * var(:,or-2,:) + q(4,8) * var(:,or-3,:) + & + q(5,8) * var(:,or-4,:) + q(6,8) * var(:,or-5,:) + & + q(7,8) * var(:,or-6,:) + q(9,8) * var(:,or-8,:) + & + q(10,8) * var(:,or-9,:) + & + q(11,8) * var(:,or-10,:) + & + q(12,8) * var(:,or-11,:) ) * idel + jr = or - 8 end if if (jl > jr+1) call CCTK_WARN (0, "domain too small") dvar(:,jl:jr,:) = ( a(1) * ( var(:,jl+1:jr+1,:) - & @@ -237,13 +239,13 @@ subroutine deriv_gf_8_4_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dv var(:,jl-4:jr-4,:) ) ) * idel end if case (2) direction - ol = offset(1); or = offset(2) if ( zero_derivs_z /= 0 ) then dvar = zero else if ( bb(1) == 0 ) then kl = 1 + gsize else + ol = offset(1) dvar(:,:,1+ol) = ( q(1,1) * var(:,:,1+ol) + q(2,1) * var(:,:,2+ol) + & q(3,1) * var(:,:,3+ol) + q(4,1) * var(:,:,4+ol) + & q(5,1) * var(:,:,5+ol) + q(6,1) * var(:,:,6+ol) + & @@ -285,47 +287,48 @@ subroutine deriv_gf_8_4_opt ( var, ni, nj, nk, dir, bb, gsize, offset, delta, dv if ( bb(2) == 0 ) then kr = nk - gsize else - dvar(:,:,nk-or) = - ( q(1,1) * var(:,:,nk-or) + q(2,1) * var(:,:,nk-1-or) + & - q(3,1) * var(:,:,nk-2-or) + q(4,1) * var(:,:,nk-3-or) + & - q(5,1) * var(:,:,nk-4-or) + q(6,1) * var(:,:,nk-5-or) + & - q(7,1) * var(:,:,nk-6-or) + & - q(8,1) * var(:,:,nk-7-or) ) * idel - dvar(:,:,nk-1-or) = - ( q(1,2) * var(:,:,nk-or) + q(3,2) * var(:,:,nk-2-or) + & - q(4,2) * var(:,:,nk-3-or) + q(5,2) * var(:,:,nk-4-or) + & - q(6,2) * var(:,:,nk-5-or) + q(7,2) * var(:,:,nk-6-or) + & - q(8,2) * var(:,:,nk-7-or) ) * idel - dvar(:,:,nk-2-or) = - ( q(1,3) * var(:,:,nk-or) + q(2,3) * var(:,:,nk-1-or) + & - q(4,3) * var(:,:,nk-3-or) + q(5,3) * var(:,:,nk-4-or) + & - q(6,3) * var(:,:,nk-5-or) + q(7,3) * var(:,:,nk-6-or) + & - q(8,3) * var(:,:,nk-7-or) ) * idel - dvar(:,:,nk-3-or) = - ( q(1,4) * var(:,:,nk-or) + q(2,4) * var(:,:,nk-1-or) + & - q(3,4) * var(:,:,nk-2-or) + q(5,4) * var(:,:,nk-4-or) + & - q(6,4) * var(:,:,nk-5-or) + q(7,4) * var(:,:,nk-6-or) + & - q(8,4) * var(:,:,nk-7-or) ) * idel - dvar(:,:,nk-4-or) = - ( q(1,5) * var(:,:,nk-or) + q(2,5) * var(:,:,nk-1-or) + & - q(3,5) * var(:,:,nk-2-or) + q(4,5) * var(:,:,nk-3-or) + & - q(6,5) * var(:,:,nk-5-or) + q(7,5) * var(:,:,nk-6-or) + & - q(8,5) * var(:,:,nk-7-or) + & - q(9,5) * var(:,:,nk-8-or) ) * idel - dvar(:,:,nk-5-or) = - ( q(1,6) * var(:,:,nk-or) + q(2,6) * var(:,:,nk-1-or) + & - q(3,6) * var(:,:,nk-2-or) + q(4,6) * var(:,:,nk-3-or) + & - q(5,6) * var(:,:,nk-4-or) + q(7,6) * var(:,:,nk-6-or) + & - q(8,6) * var(:,:,nk-7-or) + q(9,6) * var(:,:,nk-8-or) + & - q(10,6) * var(:,:,nk-9-or) ) * idel - dvar(:,:,nk-6-or) = - ( q(1,7) * var(:,:,nk-or) + q(2,7) * var(:,:,nk-1-or) + & - q(3,7) * var(:,:,nk-2-or) + q(4,7) * var(:,:,nk-3-or) + & - q(5,7) * var(:,:,nk-4-or) + q(6,7) * var(:,:,nk-5-or) + & - q(8,7) * var(:,:,nk-7-or) + q(9,7) * var(:,:,nk-8-or) + & - q(10,7) * var(:,:,nk-9-or) + & - q(11,7) * var(:,:,nk-10-or) ) * idel - dvar(:,:,nk-7-or) = - ( q(1,8) * var(:,:,nk-or) + q(2,8) * var(:,:,nk-1-or) + & - q(3,8) * var(:,:,nk-2-or) + q(4,8) * var(:,:,nk-3-or) + & - q(5,8) * var(:,:,nk-4-or) + q(6,8) * var(:,:,nk-5-or) + & - q(7,8) * var(:,:,nk-6-or) + q(9,8) * var(:,:,nk-8-or) + & - q(10,8) * var(:,:,nk-9-or) + & - q(11,8) * var(:,:,nk-10-or) + & - q(12,8) * var(:,:,nk-11-or) ) * idel - kr = nk - 8 - or + or = nk - offset(2) + dvar(:,:,or) = - ( q(1,1) * var(:,:,or) + q(2,1) * var(:,:,or-1) + & + q(3,1) * var(:,:,or-2) + q(4,1) * var(:,:,or-3) + & + q(5,1) * var(:,:,or-4) + q(6,1) * var(:,:,or-5) + & + q(7,1) * var(:,:,or-6) + & + q(8,1) * var(:,:,or-7) ) * idel + dvar(:,:,or-1) = - ( q(1,2) * var(:,:,or) + q(3,2) * var(:,:,or-2) + & + q(4,2) * var(:,:,or-3) + q(5,2) * var(:,:,or-4) + & + q(6,2) * var(:,:,or-5) + q(7,2) * var(:,:,or-6) + & + q(8,2) * var(:,:,or-7) ) * idel + dvar(:,:,or-2) = - ( q(1,3) * var(:,:,or) + q(2,3) * var(:,:,or-1) + & + q(4,3) * var(:,:,or-3) + q(5,3) * var(:,:,or-4) + & + q(6,3) * var(:,:,or-5) + q(7,3) * var(:,:,or-6) + & + q(8,3) * var(:,:,or-7) ) * idel + dvar(:,:,or-3) = - ( q(1,4) * var(:,:,or) + q(2,4) * var(:,:,or-1) + & + q(3,4) * var(:,:,or-2) + q(5,4) * var(:,:,or-4) + & + q(6,4) * var(:,:,or-5) + q(7,4) * var(:,:,or-6) + & + q(8,4) * var(:,:,or-7) ) * idel + dvar(:,:,or-4) = - ( q(1,5) * var(:,:,or) + q(2,5) * var(:,:,or-1) + & + q(3,5) * var(:,:,or-2) + q(4,5) * var(:,:,or-3) + & + q(6,5) * var(:,:,or-5) + q(7,5) * var(:,:,or-6) + & + q(8,5) * var(:,:,or-7) + & + q(9,5) * var(:,:,or-8) ) * idel + dvar(:,:,or-5) = - ( q(1,6) * var(:,:,or) + q(2,6) * var(:,:,or-1) + & + q(3,6) * var(:,:,or-2) + q(4,6) * var(:,:,or-3) + & + q(5,6) * var(:,:,or-4) + q(7,6) * var(:,:,or-6) + & + q(8,6) * var(:,:,or-7) + q(9,6) * var(:,:,or-8) + & + q(10,6) * var(:,:,or-9) ) * idel + dvar(:,:,or-6) = - ( q(1,7) * var(:,:,or) + q(2,7) * var(:,:,or-1) + & + q(3,7) * var(:,:,or-2) + q(4,7) * var(:,:,or-3) + & + q(5,7) * var(:,:,or-4) + q(6,7) * var(:,:,or-5) + & + q(8,7) * var(:,:,or-7) + q(9,7) * var(:,:,or-8) + & + q(10,7) * var(:,:,or-9) + & + q(11,7) * var(:,:,or-10) ) * idel + dvar(:,:,or-7) = - ( q(1,8) * var(:,:,or) + q(2,8) * var(:,:,or-1) + & + q(3,8) * var(:,:,or-2) + q(4,8) * var(:,:,or-3) + & + q(5,8) * var(:,:,or-4) + q(6,8) * var(:,:,or-5) + & + q(7,8) * var(:,:,or-6) + q(9,8) * var(:,:,or-8) + & + q(10,8) * var(:,:,or-9) + & + q(11,8) * var(:,:,or-10) + & + q(12,8) * var(:,:,or-11) ) * idel + kr = or - 8 end if if (kl > kr+1) call CCTK_WARN (0, "domain too small") dvar(:,:,kl:kr) = ( a(1) * ( var(:,:,kl+1:kr+1) - & diff --git a/src/Dissipation_2_1.F90 b/src/Dissipation_2_1.F90 index d6a3d5e..8d67996 100644 --- a/src/Dissipation_2_1.F90 +++ b/src/Dissipation_2_1.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(3,2) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -35,24 +36,26 @@ subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) ) * idel - - il = 3 + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) ) * idel + + il = 3 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) ) * idel - - ir = ni - 2 + or = ni - offset(2) + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) ) * idel + + ir = or - 2 end if !$omp parallel workshare rhs(il:ir,:,:) = rhs(il:ir,:,:) + & @@ -73,24 +76,26 @@ subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) ) * idel - jl = 3 + jl = 3 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) ) * idel + or = nj - offset(4) + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) ) * idel - jr = nj - 2 + jr = or - 2 end if !$omp parallel workshare rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & @@ -112,24 +117,26 @@ subroutine dissipation_2_1 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) ) * idel - kl = 3 + kl = 3 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) ) * idel + or = nk - offset(6) + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) ) * idel - kr = nk - 2 + kr = or - 2 end if !$omp parallel workshare rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & diff --git a/src/Dissipation_2_1_alt.F90 b/src/Dissipation_2_1_alt.F90 index 9992b6c..3501cdf 100644 --- a/src/Dissipation_2_1_alt.F90 +++ b/src/Dissipation_2_1_alt.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(4,2) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -31,26 +32,28 @@ subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) ) * idel - - il = 3 + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) ) * idel + + il = 3 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) ) * idel - - ir = ni - 2 + or = ni - offset(2) + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) ) * idel + + ir = or - 2 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -6.0_wp * var(il:ir,:,:) + & @@ -67,26 +70,28 @@ subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) ) * idel - jl = 3 + jl = 3 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) ) * idel + or = nj - offset(4) + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) ) * idel - jr = nj - 2 + jr = or - 2 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -6.0_wp * var(:,jl:jr,:) + & @@ -104,26 +109,28 @@ subroutine dissipation_2_1_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) ) * idel - kl = 3 + kl = 3 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) ) * idel + or = nk - offset(6) + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) ) * idel - kr = nk - 2 + kr = or - 2 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -6.0_wp * var(:,:,kl:kr) + & diff --git a/src/Dissipation_4_2.F90 b/src/Dissipation_4_2.F90 index 84746e7..d2c6d89 100644 --- a/src/Dissipation_4_2.F90 +++ b/src/Dissipation_4_2.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(6,4) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -35,46 +36,48 @@ subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else + ol = offset(1) !$omp parallel workshare - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(2,4) * var(2,:,:) + a(3,4) * var(3,:,:) + & - a(4,4) * var(4,:,:) + a(5,4) * var(5,:,:) + & - a(6,4) * var(6,:,:) ) * idel + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(2,4) * var(2+ol,:,:) + a(3,4) * var(3+ol,:,:) + & + a(4,4) * var(4+ol,:,:) + a(5,4) * var(5+ol,:,:) + & + a(6,4) * var(6+ol,:,:) ) * idel !$omp end parallel workshare - il = 5 + il = 5 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else + or = ni - offset(2) !$omp parallel workshare - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(2,4) * var(ni-1,:,:) + a(3,4) * var(ni-2,:,:) + & - a(4,4) * var(ni-3,:,:) + a(5,4) * var(ni-4,:,:) + & - a(6,4) * var(ni-5,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(2,4) * var(or-1,:,:) + a(3,4) * var(or-2,:,:) + & + a(4,4) * var(or-3,:,:) + a(5,4) * var(or-4,:,:) + & + a(6,4) * var(or-5,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) ) * idel !$omp end parallel workshare - ir = ni - 4 + ir = or - 4 end if !$omp parallel workshare rhs(il:ir,:,:) = rhs(il:ir,:,:) + & @@ -97,46 +100,48 @@ subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else + ol = offset(3) !$omp parallel workshare - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(2,4) * var(:,2,:) + a(3,4) * var(:,3,:) + & - a(4,4) * var(:,4,:) + a(5,4) * var(:,5,:) + & - a(6,4) * var(:,6,:) ) * idel + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(2,4) * var(:,2+ol,:) + a(3,4) * var(:,3+ol,:) + & + a(4,4) * var(:,4+ol,:) + a(5,4) * var(:,5+ol,:) + & + a(6,4) * var(:,6+ol,:) ) * idel !$omp end parallel workshare - jl = 5 + jl = 5 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else + or = nj - offset(4) !$omp parallel workshare - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(2,4) * var(:,nj-1,:) + a(3,4) * var(:,nj-2,:) + & - a(4,4) * var(:,nj-3,:) + a(5,4) * var(:,nj-4,:) + & - a(6,4) * var(:,nj-5,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(2,4) * var(:,or-1,:) + a(3,4) * var(:,or-2,:) + & + a(4,4) * var(:,or-3,:) + a(5,4) * var(:,or-4,:) + & + a(6,4) * var(:,or-5,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) ) * idel !$omp end parallel workshare - jr = nj - 4 + jr = or - 4 end if !$omp parallel workshare rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & @@ -160,46 +165,48 @@ subroutine dissipation_4_2 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else + ol = offset(5) !$omp parallel workshare - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(2,4) * var(:,:,2) + a(3,4) * var(:,:,3) + & - a(4,4) * var(:,:,4) + a(5,4) * var(:,:,5) + & - a(6,4) * var(:,:,6) ) * idel + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(2,4) * var(:,:,2+ol) + a(3,4) * var(:,:,3+ol) + & + a(4,4) * var(:,:,4+ol) + a(5,4) * var(:,:,5+ol) + & + a(6,4) * var(:,:,6+ol) ) * idel !$omp end parallel workshare - kl = 5 + kl = 5 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else + or = nk - offset(6) !$omp parallel workshare - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(2,4) * var(:,:,nk-1) + a(3,4) * var(:,:,nk-2) + & - a(4,4) * var(:,:,nk-3) + a(5,4) * var(:,:,nk-4) + & - a(6,4) * var(:,:,nk-5) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(2,4) * var(:,:,or-1) + a(3,4) * var(:,:,or-2) + & + a(4,4) * var(:,:,or-3) + a(5,4) * var(:,:,or-4) + & + a(6,4) * var(:,:,or-5) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) ) * idel !$omp end parallel workshare - kr = nk - 4 + kr = or - 4 end if !$omp parallel workshare rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & diff --git a/src/Dissipation_4_2_alt.F90 b/src/Dissipation_4_2_alt.F90 index feef10b..577ed39 100644 --- a/src/Dissipation_4_2_alt.F90 +++ b/src/Dissipation_4_2_alt.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(7,4) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -31,46 +32,48 @@ subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) ) * idel - - il = 5 + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) ) * idel + + il = 5 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(1,4) * var(ni,:,:) + a(2,4) * var(ni-1,:,:) + & - a(3,4) * var(ni-2,:,:) + a(4,4) * var(ni-3,:,:) + & - a(5,4) * var(ni-4,:,:) + a(6,4) * var(ni-5,:,:) + & - a(7,4) * var(ni-6,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) + a(6,3) * var(ni-5,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) + & - a(5,2) * var(ni-4,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) + a(4,1) * var(ni-3,:,:) ) * idel - - ir = ni - 4 + or = ni - offset(2) + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(1,4) * var(or,:,:) + a(2,4) * var(or-1,:,:) + & + a(3,4) * var(or-2,:,:) + a(4,4) * var(or-3,:,:) + & + a(5,4) * var(or-4,:,:) + a(6,4) * var(or-5,:,:) + & + a(7,4) * var(or-6,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) + a(6,3) * var(or-5,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) + & + a(5,2) * var(or-4,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) + a(4,1) * var(or-3,:,:) ) * idel + + ir = or - 4 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -20.0_wp * var(il:ir,:,:) + & @@ -89,46 +92,48 @@ subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) ) * idel - jl = 5 + jl = 5 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(1,4) * var(:,nj,:) + a(2,4) * var(:,nj-1,:) + & - a(3,4) * var(:,nj-2,:) + a(4,4) * var(:,nj-3,:) + & - a(5,4) * var(:,nj-4,:) + a(6,4) * var(:,nj-5,:) + & - a(7,4) * var(:,nj-6,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) + a(6,3) * var(:,nj-5,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) + & - a(5,2) * var(:,nj-4,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) + a(4,1) * var(:,nj-3,:) ) * idel + or = nj - offset(4) + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(1,4) * var(:,or,:) + a(2,4) * var(:,or-1,:) + & + a(3,4) * var(:,or-2,:) + a(4,4) * var(:,or-3,:) + & + a(5,4) * var(:,or-4,:) + a(6,4) * var(:,or-5,:) + & + a(7,4) * var(:,or-6,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) + a(6,3) * var(:,or-5,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) + & + a(5,2) * var(:,or-4,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) + a(4,1) * var(:,or-3,:) ) * idel - jr = nj - 4 + jr = or - 4 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -20.0_wp * var(:,jl:jr,:) + & @@ -148,46 +153,48 @@ subroutine dissipation_4_2_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) ) * idel - kl = 5 + kl = 5 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(1,4) * var(:,:,nk) + a(2,4) * var(:,:,nk-1) + & - a(3,4) * var(:,:,nk-2) + a(4,4) * var(:,:,nk-3) + & - a(5,4) * var(:,:,nk-4) + a(6,4) * var(:,:,nk-5) + & - a(7,4) * var(:,:,nk-6) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) + a(6,3) * var(:,:,nk-5) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) + & - a(5,2) * var(:,:,nk-4) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) + a(4,1) * var(:,:,nk-3) ) * idel + or = nk - offset(6) + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(1,4) * var(:,:,or) + a(2,4) * var(:,:,or-1) + & + a(3,4) * var(:,:,or-2) + a(4,4) * var(:,:,or-3) + & + a(5,4) * var(:,:,or-4) + a(6,4) * var(:,:,or-5) + & + a(7,4) * var(:,:,or-6) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) + a(6,3) * var(:,:,or-5) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) + & + a(5,2) * var(:,:,or-4) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) + a(4,1) * var(:,:,or-3) ) * idel - kr = nk - 4 + kr = or - 4 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -20.0_wp * var(:,:,kl:kr) + & diff --git a/src/Dissipation_4_3_min_err_coeff.F90 b/src/Dissipation_4_3_min_err_coeff.F90 index 7aa79ef..bd6a11d 100644 --- a/src/Dissipation_4_3_min_err_coeff.F90 +++ b/src/Dissipation_4_3_min_err_coeff.F90 @@ -5,7 +5,7 @@ #include "cctk_Functions.h" -subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & +subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, offset, & delta, epsilon, dfl, npatches, patch, rhs) use dissipation_coeff @@ -21,12 +21,12 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(lsh(1),lsh(2),lsh(3)), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon CCTK_REAL, dimension(3), intent(in) :: dfl CCTK_INT, intent(in) :: npatches, patch - CCTK_REAL :: zero = 0.0 integer, parameter :: wp = kind(zero) integer :: i, j, k @@ -34,7 +34,8 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(:,:), pointer :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or + CCTK_INT :: nii, njj, nkk ni = lsh(1); nj = lsh(2); nk = lsh(3) @@ -46,18 +47,26 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & end if if ( .not. savedx(patch) ) then - allocate ( atmp(ni,ni), d(ni,ni), b(ni,ni), h(ni,ni) ) + nii = ni + if ( bb(1) /= 0 ) then + nii = nii - offset(1) + endif + if ( bb(2) /= 0 ) then + nii = nii - offset(2) + endif + allocate ( atmp(nii,nii), d(nii,nii), b(nii,nii), h(nii,nii) ) atmp = zero; d = zero; b = zero; h = zero call set_dmatrix ( d, bb(1:2) ) - call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1), lbnd(1), delta(1), dfl(1) ) + call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1)-offset(1)-offset(2), lbnd(1), delta(1), dfl(1) ) call set_hmatrix ( h, bb(1:2) ) + atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( xcoeff(patch)%coeff(ni,ni) ) + allocate ( xcoeff(patch)%coeff(nii,nii) ) xcoeff(patch)%coeff = atmp @@ -78,95 +87,115 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) + & - a(7,2) * var(7,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) ) * idel - il = 6 + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) + & + a(7,2) * var(7+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) ) * idel + il = 6 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(ni-6,ni-4) * var(ni-6,:,:) + & - a(ni-5,ni-4) * var(ni-5,:,:) + & - a(ni-4,ni-4) * var(ni-4,:,:) + & - a(ni-3,ni-4) * var(ni-3,:,:) + & - a(ni-2,ni-4) * var(ni-2,:,:) + & - a(ni-1,ni-4) * var(ni-1,:,:) + & - a(ni,ni-4) * var(ni,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(ni-6,ni-3) * var(ni-6,:,:) + & - a(ni-5,ni-3) * var(ni-5,:,:) + & - a(ni-4,ni-3) * var(ni-4,:,:) + & - a(ni-3,ni-3) * var(ni-3,:,:) + & - a(ni-2,ni-3) * var(ni-2,:,:) + & - a(ni-1,ni-3) * var(ni-1,:,:) + & - a(ni,ni-3) * var(ni,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(ni-6,ni-2) * var(ni-6,:,:) + & - a(ni-5,ni-2) * var(ni-5,:,:) + & - a(ni-4,ni-2) * var(ni-4,:,:) + & - a(ni-3,ni-2) * var(ni-3,:,:) + & - a(ni-2,ni-2) * var(ni-2,:,:) + & - a(ni-1,ni-2) * var(ni-1,:,:) + & - a(ni,ni-2) * var(ni,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(ni-6,ni-1) * var(ni-6,:,:) + & - a(ni-5,ni-1) * var(ni-5,:,:) + & - a(ni-4,ni-1) * var(ni-4,:,:) + & - a(ni-3,ni-1) * var(ni-3,:,:) + & - a(ni-2,ni-1) * var(ni-2,:,:) + & - a(ni-1,ni-1) * var(ni-1,:,:) + & - a(ni,ni-1) * var(ni,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(ni-2,ni) * var(ni-2,:,:) + & - a(ni-1,ni) * var(ni-1,:,:) + & - a(ni,ni) * var(ni,:,:) ) * idel - ir = ni - 5 + or = ni - offset(2) + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(nii-6,nii-4) * var(or-6,:,:) + & + a(nii-5,nii-4) * var(or-5,:,:) + & + a(nii-4,nii-4) * var(or-4,:,:) + & + a(nii-3,nii-4) * var(or-3,:,:) + & + a(nii-2,nii-4) * var(or-2,:,:) + & + a(nii-1,nii-4) * var(or-1,:,:) + & + a(nii,nii-4) * var(or,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(nii-6,nii-3) * var(or-6,:,:) + & + a(nii-5,nii-3) * var(or-5,:,:) + & + a(nii-4,nii-3) * var(or-4,:,:) + & + a(nii-3,nii-3) * var(or-3,:,:) + & + a(nii-2,nii-3) * var(or-2,:,:) + & + a(nii-1,nii-3) * var(or-1,:,:) + & + a(nii,nii-3) * var(or,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(nii-6,nii-2) * var(or-6,:,:) + & + a(nii-5,nii-2) * var(or-5,:,:) + & + a(nii-4,nii-2) * var(or-4,:,:) + & + a(nii-3,nii-2) * var(or-3,:,:) + & + a(nii-2,nii-2) * var(or-2,:,:) + & + a(nii-1,nii-2) * var(or-1,:,:) + & + a(nii,nii-2) * var(or,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(nii-6,nii-1) * var(or-6,:,:) + & + a(nii-5,nii-1) * var(or-5,:,:) + & + a(nii-4,nii-1) * var(or-4,:,:) + & + a(nii-3,nii-1) * var(or-3,:,:) + & + a(nii-2,nii-1) * var(or-2,:,:) + & + a(nii-1,nii-1) * var(or-1,:,:) + & + a(nii,nii-1) * var(or,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(nii-2,nii) * var(or-2,:,:) + & + a(nii-1,nii) * var(or-1,:,:) + & + a(nii,nii) * var(or,:,:) ) * idel + ir = or - 5 end if - do i = il, ir - rhs(i,:,:) = rhs(i,:,:) + & - ( a(i-2,i) * var(i-2,:,:) + & - a(i-1,i) * var(i-1,:,:) + & - a(i,i) * var(i,:,:) + & - a(i+1,i) * var(i+1,:,:) + & - a(i+2,i) * var(i+2,:,:) ) * idel - end do + if (bb(1) /= 0) then + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-ol-2,i-ol) * var(i-2,:,:) + & + a(i-ol-1,i-ol) * var(i-1,:,:) + & + a(i-ol,i-ol) * var(i,:,:) + & + a(i-ol+1,i-ol) * var(i+1,:,:) + & + a(i-ol+2,i-ol) * var(i+2,:,:) ) * idel + end do + else + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-2,i) * var(i-2,:,:) + & + a(i-1,i) * var(i-1,:,:) + & + a(i,i) * var(i,:,:) + & + a(i+1,i) * var(i+1,:,:) + & + a(i+2,i) * var(i+2,:,:) ) * idel + end do + endif if ( zero_derivs_y == 0 ) then if ( .not. savedy(patch) ) then - allocate ( atmp(nj,nj), d(nj,nj), b(nj,nj), h(nj,nj) ) + njj = nj + if ( bb(3) /= 0 ) then + njj = njj - offset(3) + endif + if ( bb(4) /= 0 ) then + njj = njj - offset(4) + endif + allocate ( atmp(njj,njj), d(njj,njj), b(njj,njj), h(njj,njj) ) atmp = zero; d = zero; b = zero; h = zero call set_dmatrix ( d, bb(3:4) ) - call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2), lbnd(2), delta(2), dfl(2) ) + call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2)-offset(3)-offset(4), lbnd(2), delta(2), dfl(2) ) call set_hmatrix ( h, bb(3:4) ) atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( ycoeff(patch)%coeff(nj,nj) ) + allocate ( ycoeff(patch)%coeff(njj,njj) ) ycoeff(patch)%coeff = atmp @@ -187,98 +216,118 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) + & - a(7,2) * var(:,7,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) ) * idel - jl = 6 + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) + & + a(7,2) * var(:,7+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) ) * idel + jl = 6 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(nj-6,nj-4) * var(:,nj-6,:) + & - a(nj-5,nj-4) * var(:,nj-5,:) + & - a(nj-4,nj-4) * var(:,nj-4,:) + & - a(nj-3,nj-4) * var(:,nj-3,:) + & - a(nj-2,nj-4) * var(:,nj-2,:) + & - a(nj-1,nj-4) * var(:,nj-1,:) + & - a(nj,nj-4) * var(:,nj,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(nj-6,nj-3) * var(:,nj-6,:) + & - a(nj-5,nj-3) * var(:,nj-5,:) + & - a(nj-4,nj-3) * var(:,nj-4,:) + & - a(nj-3,nj-3) * var(:,nj-3,:) + & - a(nj-2,nj-3) * var(:,nj-2,:) + & - a(nj-1,nj-3) * var(:,nj-1,:) + & - a(nj,nj-3) * var(:,nj,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(nj-6,nj-2) * var(:,nj-6,:) + & - a(nj-5,nj-2) * var(:,nj-5,:) + & - a(nj-4,nj-2) * var(:,nj-4,:) + & - a(nj-3,nj-2) * var(:,nj-3,:) + & - a(nj-2,nj-2) * var(:,nj-2,:) + & - a(nj-1,nj-2) * var(:,nj-1,:) + & - a(nj,nj-2) * var(:,nj,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(nj-6,nj-1) * var(:,nj-6,:) + & - a(nj-5,nj-1) * var(:,nj-5,:) + & - a(nj-4,nj-1) * var(:,nj-4,:) + & - a(nj-3,nj-1) * var(:,nj-3,:) + & - a(nj-2,nj-1) * var(:,nj-2,:) + & - a(nj-1,nj-1) * var(:,nj-1,:) + & - a(nj,nj-1) * var(:,nj,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(nj-2,nj) * var(:,nj-2,:) + & - a(nj-1,nj) * var(:,nj-1,:) + & - a(nj,nj) * var(:,nj,:) ) * idel - jr = nj - 5 + or = nj - offset(4) + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(njj-6,njj-4) * var(:,or-6,:) + & + a(njj-5,njj-4) * var(:,or-5,:) + & + a(njj-4,njj-4) * var(:,or-4,:) + & + a(njj-3,njj-4) * var(:,or-3,:) + & + a(njj-2,njj-4) * var(:,or-2,:) + & + a(njj-1,njj-4) * var(:,or-1,:) + & + a(njj,njj-4) * var(:,or,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(njj-6,njj-3) * var(:,or-6,:) + & + a(njj-5,njj-3) * var(:,or-5,:) + & + a(njj-4,njj-3) * var(:,or-4,:) + & + a(njj-3,njj-3) * var(:,or-3,:) + & + a(njj-2,njj-3) * var(:,or-2,:) + & + a(njj-1,njj-3) * var(:,or-1,:) + & + a(njj,njj-3) * var(:,or,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(njj-6,njj-2) * var(:,or-6,:) + & + a(njj-5,njj-2) * var(:,or-5,:) + & + a(njj-4,njj-2) * var(:,or-4,:) + & + a(njj-3,njj-2) * var(:,or-3,:) + & + a(njj-2,njj-2) * var(:,or-2,:) + & + a(njj-1,njj-2) * var(:,or-1,:) + & + a(njj,njj-2) * var(:,or,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(njj-6,njj-1) * var(:,or-6,:) + & + a(njj-5,njj-1) * var(:,or-5,:) + & + a(njj-4,njj-1) * var(:,or-4,:) + & + a(njj-3,njj-1) * var(:,or-3,:) + & + a(njj-2,njj-1) * var(:,or-2,:) + & + a(njj-1,njj-1) * var(:,or-1,:) + & + a(njj,njj-1) * var(:,or,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(njj-2,njj) * var(:,or-2,:) + & + a(njj-1,njj) * var(:,or-1,:) + & + a(njj,njj) * var(:,or,:) ) * idel + jr = or - 5 end if - do j = jl, jr - rhs(:,j,:) = rhs(:,j,:) + & - ( a(j-2,j) * var(:,j-2,:) + & - a(j-1,j) * var(:,j-1,:) + & - a(j,j) * var(:,j,:) + & - a(j+1,j) * var(:,j+1,:) + & - a(j+2,j) * var(:,j+2,:) ) * idel - end do + if ( bb(3) /= 0 ) then + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & + ( a(j-ol-2,j-ol) * var(:,j-2,:) + & + a(j-ol-1,j-ol) * var(:,j-1,:) + & + a(j-ol,j-ol) * var(:,j,:) + & + a(j-ol+1,j-ol) * var(:,j+1,:) + & + a(j-ol+2,j-ol) * var(:,j+2,:) ) * idel + end do + else + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & + ( a(j-2,j) * var(:,j-2,:) + & + a(j-1,j) * var(:,j-1,:) + & + a(j,j) * var(:,j,:) + & + a(j+1,j) * var(:,j+1,:) + & + a(j+2,j) * var(:,j+2,:) ) * idel + end do + endif end if if ( zero_derivs_z == 0 ) then if ( .not. savedz(patch) ) then - allocate ( atmp(nk,nk), d(nk,nk), b(nk,nk), h(nk,nk) ) + nkk = nk + if ( bb(5) /= 0 ) then + nkk = nkk - offset(5) + endif + if ( bb(6) /= 0 ) then + nkk = nkk - offset(6) + endif + allocate ( atmp(nkk,nkk), d(nkk,nkk), b(nkk,nkk), h(nkk,nkk) ) atmp = zero; d = zero; b = zero; h = zero call set_dmatrix ( d, bb(5:6) ) - call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3), lbnd(3), delta(3), dfl(3) ) + call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3)-offset(5)-offset(6), lbnd(3), delta(3), dfl(3) ) call set_hmatrix ( h, bb(5:6) ) atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( zcoeff(patch)%coeff(nk,nk) ) + allocate ( zcoeff(patch)%coeff(nkk,nkk) ) zcoeff(patch)%coeff = atmp @@ -299,81 +348,94 @@ subroutine dissipation_4_3_opt (var, lsh, gsh, lbnd, bb, gsize, & if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) + & - a(7,2) * var(:,:,7) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) ) * idel - kl = 6 + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) + & + a(7,2) * var(:,:,7+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) ) * idel + kl = 6 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(nk-6,nk-4) * var(:,:,nk-6) + & - a(nk-5,nk-4) * var(:,:,nk-5) + & - a(nk-4,nk-4) * var(:,:,nk-4) + & - a(nk-3,nk-4) * var(:,:,nk-3) + & - a(nk-2,nk-4) * var(:,:,nk-2) + & - a(nk-1,nk-4) * var(:,:,nk-1) + & - a(nk,nk-4) * var(:,:,nk) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(nk-6,nk-3) * var(:,:,nk-6) + & - a(nk-5,nk-3) * var(:,:,nk-5) + & - a(nk-4,nk-3) * var(:,:,nk-4) + & - a(nk-3,nk-3) * var(:,:,nk-3) + & - a(nk-2,nk-3) * var(:,:,nk-2) + & - a(nk-1,nk-3) * var(:,:,nk-1) + & - a(nk,nk-3) * var(:,:,nk) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(nk-6,nk-2) * var(:,:,nk-6) + & - a(nk-5,nk-2) * var(:,:,nk-5) + & - a(nk-4,nk-2) * var(:,:,nk-4) + & - a(nk-3,nk-2) * var(:,:,nk-3) + & - a(nk-2,nk-2) * var(:,:,nk-2) + & - a(nk-1,nk-2) * var(:,:,nk-1) + & - a(nk,nk-2) * var(:,:,nk) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(nk-6,nk-1) * var(:,:,nk-6) + & - a(nk-5,nk-1) * var(:,:,nk-5) + & - a(nk-4,nk-1) * var(:,:,nk-4) + & - a(nk-3,nk-1) * var(:,:,nk-3) + & - a(nk-2,nk-1) * var(:,:,nk-2) + & - a(nk-1,nk-1) * var(:,:,nk-1) + & - a(nk,nk-1) * var(:,:,nk) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(nk-2,nk) * var(:,:,nk-2) + & - a(nk-1,nk) * var(:,:,nk-1) + & - a(nk,nk) * var(:,:,nk) ) * idel - kr = nk - 5 + or = nk - offset(6) + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(nkk-6,nkk-4) * var(:,:,or-6) + & + a(nkk-5,nkk-4) * var(:,:,or-5) + & + a(nkk-4,nkk-4) * var(:,:,or-4) + & + a(nkk-3,nkk-4) * var(:,:,or-3) + & + a(nkk-2,nkk-4) * var(:,:,or-2) + & + a(nkk-1,nkk-4) * var(:,:,or-1) + & + a(nkk,nkk-4) * var(:,:,or) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(nkk-6,nkk-3) * var(:,:,or-6) + & + a(nkk-5,nkk-3) * var(:,:,or-5) + & + a(nkk-4,nkk-3) * var(:,:,or-4) + & + a(nkk-3,nkk-3) * var(:,:,or-3) + & + a(nkk-2,nkk-3) * var(:,:,or-2) + & + a(nkk-1,nkk-3) * var(:,:,or-1) + & + a(nkk,nkk-3) * var(:,:,or) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(nkk-6,nkk-2) * var(:,:,or-6) + & + a(nkk-5,nkk-2) * var(:,:,or-5) + & + a(nkk-4,nkk-2) * var(:,:,or-4) + & + a(nkk-3,nkk-2) * var(:,:,or-3) + & + a(nkk-2,nkk-2) * var(:,:,or-2) + & + a(nkk-1,nkk-2) * var(:,:,or-1) + & + a(nkk,nkk-2) * var(:,:,or) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(nkk-6,nkk-1) * var(:,:,or-6) + & + a(nkk-5,nkk-1) * var(:,:,or-5) + & + a(nkk-4,nkk-1) * var(:,:,or-4) + & + a(nkk-3,nkk-1) * var(:,:,or-3) + & + a(nkk-2,nkk-1) * var(:,:,or-2) + & + a(nkk-1,nkk-1) * var(:,:,or-1) + & + a(nkk,nkk-1) * var(:,:,or) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(nkk-2,nkk) * var(:,:,or-2) + & + a(nkk-1,nkk) * var(:,:,or-1) + & + a(nkk,nkk) * var(:,:,or) ) * idel + kr = or - 5 end if - do k = kl, kr - rhs(:,:,k) = rhs(:,:,k) + & - ( a(k-2,k) * var(:,:,k-2) + & - a(k-1,k) * var(:,:,k-1) + & - a(k,k) * var(:,:,k) + & - a(k+1,k) * var(:,:,k+1) + & - a(k+2,k) * var(:,:,k+2) ) * idel - end do + if ( bb(5) /= 0) then + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & + ( a(k-ol-2,k-ol) * var(:,:,k-2) + & + a(k-ol-1,k-ol) * var(:,:,k-1) + & + a(k-ol,k-ol) * var(:,:,k) + & + a(k-ol+1,k-ol) * var(:,:,k+1) + & + a(k-ol+2,k-ol) * var(:,:,k+2) ) * idel + end do + else + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & + ( a(k-2,k) * var(:,:,k-2) + & + a(k-1,k) * var(:,:,k-1) + & + a(k,k) * var(:,:,k) + & + a(k+1,k) * var(:,:,k+1) + & + a(k+2,k) * var(:,:,k+2) ) * idel + end do + endif end if diff --git a/src/Dissipation_4_3_min_err_coeff_alt.F90 b/src/Dissipation_4_3_min_err_coeff_alt.F90 index 6dfb0b6..635f0ab 100644 --- a/src/Dissipation_4_3_min_err_coeff_alt.F90 +++ b/src/Dissipation_4_3_min_err_coeff_alt.F90 @@ -5,7 +5,7 @@ #include "cctk_Functions.h" -subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & +subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, offset, & delta, epsilon, dfl, npatches, patch, rhs) use dissipation_coeff @@ -21,6 +21,7 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(lsh(1),lsh(2),lsh(3)), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon CCTK_REAL, dimension(3), intent(in) :: dfl @@ -33,7 +34,8 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(:,:), pointer :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or + CCTK_INT :: nii, njj, nkk ni = lsh(1); nj = lsh(2); nk = lsh(3) @@ -45,10 +47,17 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & end if if ( .not. savedx(patch) ) then - allocate ( atmp(ni,ni), d(ni,ni), b(ni,ni), h(ni,ni), tmp(ni,ni) ) + nii = ni + if ( bb(1) /= 0 ) then + nii = nii - offset(1) + endif + if ( bb(2) /= 0 ) then + nii = nii - offset(2) + endif + allocate ( atmp(nii,nii), d(nii,nii), b(nii,nii), h(nii,nii), tmp(nii,nii) ) atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1), lbnd(1), delta(1), dfl(1) ) + call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1)-offset(1)-offset(2), lbnd(1), delta(1), dfl(1) ) call set_hmatrix ( h, bb(1:2) ) @@ -64,7 +73,7 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(1) / 2 + center = (gsh(1)-offset(1)-offset(2)) / 2 ir = center + max(3,gsize(1)) call set_dmatrix_half ( d(1:ir,1:ir), 1 ) @@ -80,17 +89,17 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & il = center + 1 - max(3,gsize(1)) d = zero - call set_dmatrix_half ( d(il:ni,il:ni), 2 ) - tmp(il:ni,il:ni) = matmul ( b(il:ni,il:ni), d(il:ni,il:ni) ) - tmp(il:ni,il:ni) = matmul ( transpose ( d(il:ni,il:ni) ), tmp(il:ni,il:ni) ) - tmp(il:ni,il:ni) = matmul ( h(il:ni,il:ni), tmp(il:ni,il:ni) ) - tmp(il:ni,il:ni) = -transpose ( tmp(il:ni,il:ni) ) + call set_dmatrix_half ( d(il:nii,il:nii), 2 ) + tmp(il:nii,il:nii) = matmul ( b(il:nii,il:nii), d(il:nii,il:nii) ) + tmp(il:nii,il:nii) = matmul ( transpose ( d(il:nii,il:nii) ), tmp(il:nii,il:nii) ) + tmp(il:nii,il:nii) = matmul ( h(il:nii,il:nii), tmp(il:nii,il:nii) ) + tmp(il:nii,il:nii) = -transpose ( tmp(il:nii,il:nii) ) - atmp(il:ni,center+1:ni) = tmp(il:ni,center+1:ni) + atmp(il:nii,center+1:nii) = tmp(il:nii,center+1:nii) end if - allocate ( xcoeff(patch)%coeff(ni,ni) ) + allocate ( xcoeff(patch)%coeff(nii,nii) ) xcoeff(patch)%coeff = atmp @@ -104,37 +113,39 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & idel = epsilon / ( 64 * delta(1) ) + if ( bb(1) == 0 ) then il = 1 + gsize(1) else - - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) + & - a(7,2) * var(7,:,:) + a(8,2) * var(8,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) + a(8,3) * var(8,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) ) * idel - - il = 6 + ol = offset(1) + + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) + & + a(7,2) * var(7+ol,:,:) + a(8,2) * var(8+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) + a(8,3) * var(8+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) ) * idel + + il = 6 + ol end if @@ -144,55 +155,67 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & else - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(ni-7,ni-4) * var(ni-7,:,:) + & - a(ni-6,ni-4) * var(ni-6,:,:) + & - a(ni-5,ni-4) * var(ni-5,:,:) + & - a(ni-4,ni-4) * var(ni-4,:,:) + & - a(ni-3,ni-4) * var(ni-3,:,:) + & - a(ni-2,ni-4) * var(ni-2,:,:) + & - a(ni-1,ni-4) * var(ni-1,:,:) + & - a(ni,ni-4) * var(ni,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(ni-7,ni-3) * var(ni-7,:,:) + & - a(ni-6,ni-3) * var(ni-6,:,:) + & - a(ni-5,ni-3) * var(ni-5,:,:) + & - a(ni-4,ni-3) * var(ni-4,:,:) + & - a(ni-3,ni-3) * var(ni-3,:,:) + & - a(ni-2,ni-3) * var(ni-2,:,:) + & - a(ni-1,ni-3) * var(ni-1,:,:) + & - a(ni,ni-3) * var(ni,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(ni-7,ni-2) * var(ni-7,:,:) + & - a(ni-6,ni-2) * var(ni-6,:,:) + & - a(ni-5,ni-2) * var(ni-5,:,:) + & - a(ni-4,ni-2) * var(ni-4,:,:) + & - a(ni-3,ni-2) * var(ni-3,:,:) + & - a(ni-2,ni-2) * var(ni-2,:,:) + & - a(ni-1,ni-2) * var(ni-1,:,:) + & - a(ni,ni-2) * var(ni,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(ni-7,ni-1) * var(ni-7,:,:) + & - a(ni-6,ni-1) * var(ni-6,:,:) + & - a(ni-5,ni-1) * var(ni-5,:,:) + & - a(ni-4,ni-1) * var(ni-4,:,:) + & - a(ni-3,ni-1) * var(ni-3,:,:) + & - a(ni-2,ni-1) * var(ni-2,:,:) + & - a(ni-1,ni-1) * var(ni-1,:,:) + & - a(ni,ni-1) * var(ni,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(ni-3,ni) * var(ni-3,:,:) + & - a(ni-2,ni) * var(ni-2,:,:) + & - a(ni-1,ni) * var(ni-1,:,:) + & - a(ni,ni) * var(ni,:,:) ) * idel - - ir = ni - 5 + or = ni - offset(2) + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(nii-7,nii-4) * var(or-7,:,:) + & + a(nii-6,nii-4) * var(or-6,:,:) + & + a(nii-5,nii-4) * var(or-5,:,:) + & + a(nii-4,nii-4) * var(or-4,:,:) + & + a(nii-3,nii-4) * var(or-3,:,:) + & + a(nii-2,nii-4) * var(or-2,:,:) + & + a(nii-1,nii-4) * var(or-1,:,:) + & + a(nii,nii-4) * var(or,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(nii-7,nii-3) * var(or-7,:,:) + & + a(nii-6,nii-3) * var(or-6,:,:) + & + a(nii-5,nii-3) * var(or-5,:,:) + & + a(nii-4,nii-3) * var(or-4,:,:) + & + a(nii-3,nii-3) * var(or-3,:,:) + & + a(nii-2,nii-3) * var(or-2,:,:) + & + a(nii-1,nii-3) * var(or-1,:,:) + & + a(nii,nii-3) * var(or,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(nii-7,nii-2) * var(or-7,:,:) + & + a(nii-6,nii-2) * var(or-6,:,:) + & + a(nii-5,nii-2) * var(or-5,:,:) + & + a(nii-4,nii-2) * var(or-4,:,:) + & + a(nii-3,nii-2) * var(or-3,:,:) + & + a(nii-2,nii-2) * var(or-2,:,:) + & + a(nii-1,nii-2) * var(or-1,:,:) + & + a(nii,nii-2) * var(or,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(nii-7,nii-1) * var(or-7,:,:) + & + a(nii-6,nii-1) * var(or-6,:,:) + & + a(nii-5,nii-1) * var(or-5,:,:) + & + a(nii-4,nii-1) * var(or-4,:,:) + & + a(nii-3,nii-1) * var(or-3,:,:) + & + a(nii-2,nii-1) * var(or-2,:,:) + & + a(nii-1,nii-1) * var(or-1,:,:) + & + a(nii,nii-1) * var(or,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(nii-3,nii) * var(or-3,:,:) + & + a(nii-2,nii) * var(or-2,:,:) + & + a(nii-1,nii) * var(or-1,:,:) + & + a(nii,nii) * var(or,:,:) ) * idel + + ir = or - 5 end if - do i = il, ir - - rhs(i,:,:) = rhs(i,:,:) + & + if ( bb(1) /= 0 ) then + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-ol-3,i-ol) * var(i-3,:,:) + & + a(i-ol-2,i-ol) * var(i-2,:,:) + & + a(i-ol-1,i-ol) * var(i-1,:,:) + & + a(i-ol,i-ol) * var(i,:,:) + & + a(i-ol+1,i-ol) * var(i+1,:,:) + & + a(i-ol+2,i-ol) * var(i+2,:,:) + & + a(i-ol+3,i-ol) * var(i+3,:,:) ) * idel + end do + else + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & ( a(i-3,i) * var(i-3,:,:) + & a(i-2,i) * var(i-2,:,:) + & a(i-1,i) * var(i-1,:,:) + & @@ -200,15 +223,23 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & a(i+1,i) * var(i+1,:,:) + & a(i+2,i) * var(i+2,:,:) + & a(i+3,i) * var(i+3,:,:) ) * idel - - end do + end do + endif if ( zero_derivs_y == 0 ) then if ( .not. savedy(patch) ) then - allocate ( atmp(nj,nj), d(nj,nj), b(nj,nj), h(nj,nj), tmp(nj,nj) ) + njj = nj + if ( bb(3) /= 0 ) then + njj = njj - offset(3) + endif + if ( bb(4) /= 0 ) then + njj = njj - offset(4) + endif + + allocate ( atmp(njj,njj), d(njj,njj), b(njj,njj), h(njj,njj), tmp(njj,njj) ) atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2), lbnd(2), delta(2), dfl(2) ) + call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2)-offset(3)-offset(4), lbnd(2), delta(2), dfl(2) ) call set_hmatrix ( h, bb(3:4) ) @@ -224,7 +255,7 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(2) / 2 + center = (gsh(2)-offset(3)-offset(4)) / 2 jr = center + max(3,gsize(2)) call set_dmatrix_half ( d(1:jr,1:jr), 1 ) @@ -240,19 +271,19 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & jl = center + 1 - max(3,gsize(2)) d = zero - call set_dmatrix_half ( d(jl:nj,jl:nj), 2 ) - tmp(jl:nj,jl:nj) = -transpose ( & - matmul ( h(jl:nj,jl:nj), & + call set_dmatrix_half ( d(jl:njj,jl:njj), 2 ) + tmp(jl:njj,jl:njj) = -transpose ( & + matmul ( h(jl:njj,jl:njj), & matmul ( & - transpose ( d(jl:nj,jl:nj) ), & - matmul ( b(jl:nj,jl:nj), & - d(jl:nj,jl:nj) ) ) ) ) + transpose ( d(jl:njj,jl:njj) ), & + matmul ( b(jl:njj,jl:njj), & + d(jl:njj,jl:njj) ) ) ) ) - atmp(jl:nj,center+1:nj) = tmp(jl:nj,center+1:nj) + atmp(jl:njj,center+1:njj) = tmp(jl:njj,center+1:njj) end if - allocate ( ycoeff(patch)%coeff(nj,nj) ) + allocate ( ycoeff(patch)%coeff(njj,njj) ) ycoeff(patch)%coeff = atmp @@ -271,32 +302,33 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & jl = 1 + gsize(2) else - - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) + & - a(7,2) * var(:,7,:) + a(8,2) * var(:,8,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) + a(8,3) * var(:,8,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) ) * idel - - jl = 6 + ol = offset(3) + + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) + & + a(7,2) * var(:,7+ol,:) + a(8,2) * var(:,8+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) + a(8,3) * var(:,8+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) ) * idel + + jl = 6 + ol end if @@ -306,55 +338,67 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & else - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(nj-7,nj-4) * var(:,nj-7,:) + & - a(nj-6,nj-4) * var(:,nj-6,:) + & - a(nj-5,nj-4) * var(:,nj-5,:) + & - a(nj-4,nj-4) * var(:,nj-4,:) + & - a(nj-3,nj-4) * var(:,nj-3,:) + & - a(nj-2,nj-4) * var(:,nj-2,:) + & - a(nj-1,nj-4) * var(:,nj-1,:) + & - a(nj,nj-4) * var(:,nj,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(nj-7,nj-3) * var(:,nj-7,:) + & - a(nj-6,nj-3) * var(:,nj-6,:) + & - a(nj-5,nj-3) * var(:,nj-5,:) + & - a(nj-4,nj-3) * var(:,nj-4,:) + & - a(nj-3,nj-3) * var(:,nj-3,:) + & - a(nj-2,nj-3) * var(:,nj-2,:) + & - a(nj-1,nj-3) * var(:,nj-1,:) + & - a(nj,nj-3) * var(:,nj,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(nj-7,nj-2) * var(:,nj-7,:) + & - a(nj-6,nj-2) * var(:,nj-6,:) + & - a(nj-5,nj-2) * var(:,nj-5,:) + & - a(nj-4,nj-2) * var(:,nj-4,:) + & - a(nj-3,nj-2) * var(:,nj-3,:) + & - a(nj-2,nj-2) * var(:,nj-2,:) + & - a(nj-1,nj-2) * var(:,nj-1,:) + & - a(nj,nj-2) * var(:,nj,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(nj-7,nj-1) * var(:,nj-7,:) + & - a(nj-6,nj-1) * var(:,nj-6,:) + & - a(nj-5,nj-1) * var(:,nj-5,:) + & - a(nj-4,nj-1) * var(:,nj-4,:) + & - a(nj-3,nj-1) * var(:,nj-3,:) + & - a(nj-2,nj-1) * var(:,nj-2,:) + & - a(nj-1,nj-1) * var(:,nj-1,:) + & - a(nj,nj-1) * var(:,nj,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(nj-3,nj) * var(:,nj-3,:) + & - a(nj-2,nj) * var(:,nj-2,:) + & - a(nj-1,nj) * var(:,nj-1,:) + & - a(nj,nj) * var(:,nj,:) ) * idel - - jr = nj - 5 + or = nj - offset(4) + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(njj-7,njj-4) * var(:,or-7,:) + & + a(njj-6,njj-4) * var(:,or-6,:) + & + a(njj-5,njj-4) * var(:,or-5,:) + & + a(njj-4,njj-4) * var(:,or-4,:) + & + a(njj-3,njj-4) * var(:,or-3,:) + & + a(njj-2,njj-4) * var(:,or-2,:) + & + a(njj-1,njj-4) * var(:,or-1,:) + & + a(njj,njj-4) * var(:,or,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(njj-7,njj-3) * var(:,or-7,:) + & + a(njj-6,njj-3) * var(:,or-6,:) + & + a(njj-5,njj-3) * var(:,or-5,:) + & + a(njj-4,njj-3) * var(:,or-4,:) + & + a(njj-3,njj-3) * var(:,or-3,:) + & + a(njj-2,njj-3) * var(:,or-2,:) + & + a(njj-1,njj-3) * var(:,or-1,:) + & + a(njj,njj-3) * var(:,or,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(njj-7,njj-2) * var(:,or-7,:) + & + a(njj-6,njj-2) * var(:,or-6,:) + & + a(njj-5,njj-2) * var(:,or-5,:) + & + a(njj-4,njj-2) * var(:,or-4,:) + & + a(njj-3,njj-2) * var(:,or-3,:) + & + a(njj-2,njj-2) * var(:,or-2,:) + & + a(njj-1,njj-2) * var(:,or-1,:) + & + a(njj,njj-2) * var(:,or,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(njj-7,njj-1) * var(:,or-7,:) + & + a(njj-6,njj-1) * var(:,or-6,:) + & + a(njj-5,njj-1) * var(:,or-5,:) + & + a(njj-4,njj-1) * var(:,or-4,:) + & + a(njj-3,njj-1) * var(:,or-3,:) + & + a(njj-2,njj-1) * var(:,or-2,:) + & + a(njj-1,njj-1) * var(:,or-1,:) + & + a(njj,njj-1) * var(:,or,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(njj-3,njj) * var(:,or-3,:) + & + a(njj-2,njj) * var(:,or-2,:) + & + a(njj-1,njj) * var(:,or-1,:) + & + a(njj,njj) * var(:,or,:) ) * idel + + jr = or - 5 end if - do j = jl, jr - - rhs(:,j,:) = rhs(:,j,:) + & + if ( bb(3) /= 0 ) then + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & + ( a(j-ol-3,j-ol) * var(:,j-3,:) + & + a(j-ol-2,j-ol) * var(:,j-2,:) + & + a(j-ol-1,j-ol) * var(:,j-1,:) + & + a(j-ol,j-ol) * var(:,j,:) + & + a(j-ol+1,j-ol) * var(:,j+1,:) + & + a(j-ol+2,j-ol) * var(:,j+2,:) + & + a(j-ol+3,j-ol) * var(:,j+3,:) ) * idel + end do + else + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & ( a(j-3,j) * var(:,j-3,:) + & a(j-2,j) * var(:,j-2,:) + & a(j-1,j) * var(:,j-1,:) + & @@ -362,17 +406,24 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & a(j+1,j) * var(:,j+1,:) + & a(j+2,j) * var(:,j+2,:) + & a(j+3,j) * var(:,j+3,:) ) * idel - - end do + end do + endif end if if ( zero_derivs_z == 0 ) then if ( .not. savedz(patch) ) then - allocate ( atmp(nk,nk), d(nk,nk), b(nk,nk), h(nk,nk), tmp(nk,nk) ) + nkk = nk + if ( bb(5) /= 0 ) then + nkk = nkk - offset(5) + endif + if ( bb(6) /= 0 ) then + nkk = nkk - offset(6) + endif + allocate ( atmp(nkk,nkk), d(nkk,nkk), b(nkk,nkk), h(nkk,nkk), tmp(nkk,nkk) ) atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3), lbnd(3), delta(3), dfl(3) ) + call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3)-offset(5)-offset(6), lbnd(3), delta(3), dfl(3) ) call set_hmatrix ( h, bb(5:6) ) @@ -388,7 +439,7 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(3) / 2 + center = (gsh(3)-offset(5)-offset(6)) / 2 kr = center + max(3,gsize(3)) call set_dmatrix_half ( d(1:kr,1:kr), 1 ) @@ -402,19 +453,19 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & kl = center + 1 - max(3,gsize(3)) d = zero - call set_dmatrix_half ( d(kl:nk,kl:nk), 2 ) - tmp(kl:nk,kl:nk) = -transpose ( & - matmul ( h(kl:nk,kl:nk), & + call set_dmatrix_half ( d(kl:nkk,kl:nkk), 2 ) + tmp(kl:nkk,kl:nkk) = -transpose ( & + matmul ( h(kl:nkk,kl:nkk), & matmul ( & - transpose ( d(kl:nk,kl:nk) ), & - matmul ( b(kl:nk,kl:nk), & - d(kl:nk,kl:nk) ) ) ) ) + transpose ( d(kl:nkk,kl:nkk) ), & + matmul ( b(kl:nkk,kl:nkk), & + d(kl:nkk,kl:nkk) ) ) ) ) - atmp(kl:nk,center+1:nk) = tmp(kl:nk,center+1:nk) + atmp(kl:nkk,center+1:nkk) = tmp(kl:nkk,center+1:nkk) end if - allocate ( zcoeff(patch)%coeff(nk,nk) ) + allocate ( zcoeff(patch)%coeff(nkk,nkk) ) zcoeff(patch)%coeff = atmp @@ -434,31 +485,33 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) + & - a(7,2) * var(:,:,7) + a(8,2) * var(:,:,8) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) + a(8,3) * var(:,:,8) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) ) * idel - - kl = 6 + ol = offset(5) + + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) + & + a(7,2) * var(:,:,7+ol) + a(8,2) * var(:,:,8+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) + a(8,3) * var(:,:,8+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) ) * idel + + kl = 6 + ol end if @@ -468,55 +521,68 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & else - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(nk-7,nk-4) * var(:,:,nk-7) + & - a(nk-6,nk-4) * var(:,:,nk-6) + & - a(nk-5,nk-4) * var(:,:,nk-5) + & - a(nk-4,nk-4) * var(:,:,nk-4) + & - a(nk-3,nk-4) * var(:,:,nk-3) + & - a(nk-2,nk-4) * var(:,:,nk-2) + & - a(nk-1,nk-4) * var(:,:,nk-1) + & - a(nk,nk-4) * var(:,:,nk) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(nk-7,nk-3) * var(:,:,nk-7) + & - a(nk-6,nk-3) * var(:,:,nk-6) + & - a(nk-5,nk-3) * var(:,:,nk-5) + & - a(nk-4,nk-3) * var(:,:,nk-4) + & - a(nk-3,nk-3) * var(:,:,nk-3) + & - a(nk-2,nk-3) * var(:,:,nk-2) + & - a(nk-1,nk-3) * var(:,:,nk-1) + & - a(nk,nk-3) * var(:,:,nk) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(nk-7,nk-2) * var(:,:,nk-7) + & - a(nk-6,nk-2) * var(:,:,nk-6) + & - a(nk-5,nk-2) * var(:,:,nk-5) + & - a(nk-4,nk-2) * var(:,:,nk-4) + & - a(nk-3,nk-2) * var(:,:,nk-3) + & - a(nk-2,nk-2) * var(:,:,nk-2) + & - a(nk-1,nk-2) * var(:,:,nk-1) + & - a(nk,nk-2) * var(:,:,nk) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(nk-7,nk-1) * var(:,:,nk-7) + & - a(nk-6,nk-1) * var(:,:,nk-6) + & - a(nk-5,nk-1) * var(:,:,nk-5) + & - a(nk-4,nk-1) * var(:,:,nk-4) + & - a(nk-3,nk-1) * var(:,:,nk-3) + & - a(nk-2,nk-1) * var(:,:,nk-2) + & - a(nk-1,nk-1) * var(:,:,nk-1) + & - a(nk,nk-1) * var(:,:,nk) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(nk-3,nk) * var(:,:,nk-3) + & - a(nk-2,nk) * var(:,:,nk-2) + & - a(nk-1,nk) * var(:,:,nk-1) + & - a(nk,nk) * var(:,:,nk) ) * idel - - kr = nk - 5 + or = nk - offset(6) + + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(nkk-7,nkk-4) * var(:,:,or-7) + & + a(nkk-6,nkk-4) * var(:,:,or-6) + & + a(nkk-5,nkk-4) * var(:,:,or-5) + & + a(nkk-4,nkk-4) * var(:,:,or-4) + & + a(nkk-3,nkk-4) * var(:,:,or-3) + & + a(nkk-2,nkk-4) * var(:,:,or-2) + & + a(nkk-1,nkk-4) * var(:,:,or-1) + & + a(nkk,nkk-4) * var(:,:,or) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(nkk-7,nkk-3) * var(:,:,or-7) + & + a(nkk-6,nkk-3) * var(:,:,or-6) + & + a(nkk-5,nkk-3) * var(:,:,or-5) + & + a(nkk-4,nkk-3) * var(:,:,or-4) + & + a(nkk-3,nkk-3) * var(:,:,or-3) + & + a(nkk-2,nkk-3) * var(:,:,or-2) + & + a(nkk-1,nkk-3) * var(:,:,or-1) + & + a(nkk,nkk-3) * var(:,:,or) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(nkk-7,nkk-2) * var(:,:,or-7) + & + a(nkk-6,nkk-2) * var(:,:,or-6) + & + a(nkk-5,nkk-2) * var(:,:,or-5) + & + a(nkk-4,nkk-2) * var(:,:,or-4) + & + a(nkk-3,nkk-2) * var(:,:,or-3) + & + a(nkk-2,nkk-2) * var(:,:,or-2) + & + a(nkk-1,nkk-2) * var(:,:,or-1) + & + a(nkk,nkk-2) * var(:,:,or) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(nkk-7,nkk-1) * var(:,:,or-7) + & + a(nkk-6,nkk-1) * var(:,:,or-6) + & + a(nkk-5,nkk-1) * var(:,:,or-5) + & + a(nkk-4,nkk-1) * var(:,:,or-4) + & + a(nkk-3,nkk-1) * var(:,:,or-3) + & + a(nkk-2,nkk-1) * var(:,:,or-2) + & + a(nkk-1,nkk-1) * var(:,:,or-1) + & + a(nkk,nkk-1) * var(:,:,or) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(nkk-3,nkk) * var(:,:,or-3) + & + a(nkk-2,nkk) * var(:,:,or-2) + & + a(nkk-1,nkk) * var(:,:,or-1) + & + a(nkk,nkk) * var(:,:,or) ) * idel + + kr = or - 5 end if - do k = kl, kr - - rhs(:,:,k) = rhs(:,:,k) + & + if ( bb(5) /= 0 ) then + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & + ( a(k-ol-3,k-ol) * var(:,:,k-3) + & + a(k-ol-2,k-ol) * var(:,:,k-2) + & + a(k-ol-1,k-ol) * var(:,:,k-1) + & + a(k-ol,k-ol) * var(:,:,k) + & + a(k-ol+1,k-ol) * var(:,:,k+1) + & + a(k-ol+2,k-ol) * var(:,:,k+2) + & + a(k-ol+3,k-ol) * var(:,:,k+3) ) * idel + end do + else + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & ( a(k-3,k) * var(:,:,k-3) + & a(k-2,k) * var(:,:,k-2) + & a(k-1,k) * var(:,:,k-1) + & @@ -524,8 +590,8 @@ subroutine dissipation_4_3_alt (var, lsh, gsh, lbnd, bb, gsize, & a(k+1,k) * var(:,:,k+1) + & a(k+2,k) * var(:,:,k+2) + & a(k+3,k) * var(:,:,k+3) ) * idel - - end do + end do + endif end if diff --git a/src/Dissipation_6_3.F90 b/src/Dissipation_6_3.F90 index af47329..50b7bde 100644 --- a/src/Dissipation_6_3.F90 +++ b/src/Dissipation_6_3.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(9,6) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -35,66 +36,68 @@ subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(2,5) * var(2,:,:) + a(3,5) * var(3,:,:) + & - a(4,5) * var(4,:,:) + a(5,5) * var(5,:,:) + & - a(6,5) * var(6,:,:) + a(7,5) * var(7,:,:) + & - a(8,5) * var(8,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(3,6) * var(3,:,:) + a(4,6) * var(4,:,:) + & - a(5,6) * var(5,:,:) + a(6,6) * var(6,:,:) + & - a(7,6) * var(7,:,:) + a(8,6) * var(8,:,:) + & - a(9,6) * var(9,:,:) ) * idel + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(2,5) * var(2+ol,:,:) + a(3,5) * var(3+ol,:,:) + & + a(4,5) * var(4+ol,:,:) + a(5,5) * var(5+ol,:,:) + & + a(6,5) * var(6+ol,:,:) + a(7,5) * var(7+ol,:,:) + & + a(8,5) * var(8+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(3,6) * var(3+ol,:,:) + a(4,6) * var(4+ol,:,:) + & + a(5,6) * var(5+ol,:,:) + a(6,6) * var(6+ol,:,:) + & + a(7,6) * var(7+ol,:,:) + a(8,6) * var(8+ol,:,:) + & + a(9,6) * var(9+ol,:,:) ) * idel - il = 7 + il = 7 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(3,6) * var(ni-2,:,:) + a(4,6) * var(ni-3,:,:) + & - a(5,6) * var(ni-4,:,:) + a(6,6) * var(ni-5,:,:) + & - a(7,6) * var(ni-6,:,:) + a(8,6) * var(ni-7,:,:) + & - a(9,6) * var(ni-8,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(2,5) * var(ni-1,:,:) + a(3,5) * var(ni-2,:,:) + & - a(4,5) * var(ni-3,:,:) + a(5,5) * var(ni-4,:,:) + & - a(6,5) * var(ni-5,:,:) + a(7,5) * var(ni-6,:,:) + & - a(8,5) * var(ni-7,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(1,4) * var(ni,:,:) + a(2,4) * var(ni-1,:,:) + & - a(3,4) * var(ni-2,:,:) + a(4,4) * var(ni-3,:,:) + & - a(5,4) * var(ni-4,:,:) + a(6,4) * var(ni-5,:,:) + & - a(7,4) * var(ni-6,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) + a(6,3) * var(ni-5,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) + & - a(5,2) * var(ni-4,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) + a(4,1) * var(ni-3,:,:) ) * idel + or = ni - offset(2) + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(3,6) * var(or-2,:,:) + a(4,6) * var(or-3,:,:) + & + a(5,6) * var(or-4,:,:) + a(6,6) * var(or-5,:,:) + & + a(7,6) * var(or-6,:,:) + a(8,6) * var(or-7,:,:) + & + a(9,6) * var(or-8,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(2,5) * var(or-1,:,:) + a(3,5) * var(or-2,:,:) + & + a(4,5) * var(or-3,:,:) + a(5,5) * var(or-4,:,:) + & + a(6,5) * var(or-5,:,:) + a(7,5) * var(or-6,:,:) + & + a(8,5) * var(or-7,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(1,4) * var(or,:,:) + a(2,4) * var(or-1,:,:) + & + a(3,4) * var(or-2,:,:) + a(4,4) * var(or-3,:,:) + & + a(5,4) * var(or-4,:,:) + a(6,4) * var(or-5,:,:) + & + a(7,4) * var(or-6,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) + a(6,3) * var(or-5,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) + & + a(5,2) * var(or-4,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) + a(4,1) * var(or-3,:,:) ) * idel - ir = ni - 6 + ir = or - 6 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -20.0_wp * var(il:ir,:,:) + & @@ -117,66 +120,68 @@ subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(2,5) * var(:,2,:) + a(3,5) * var(:,3,:) + & - a(4,5) * var(:,4,:) + a(5,5) * var(:,5,:) + & - a(6,5) * var(:,6,:) + a(7,5) * var(:,7,:) + & - a(8,5) * var(:,8,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(3,6) * var(:,3,:) + a(4,6) * var(:,4,:) + & - a(5,6) * var(:,5,:) + a(6,6) * var(:,6,:) + & - a(7,6) * var(:,7,:) + a(8,6) * var(:,8,:) + & - a(9,6) * var(:,9,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(2,5) * var(:,2+ol,:) + a(3,5) * var(:,3+ol,:) + & + a(4,5) * var(:,4+ol,:) + a(5,5) * var(:,5+ol,:) + & + a(6,5) * var(:,6+ol,:) + a(7,5) * var(:,7+ol,:) + & + a(8,5) * var(:,8+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(3,6) * var(:,3+ol,:) + a(4,6) * var(:,4+ol,:) + & + a(5,6) * var(:,5+ol,:) + a(6,6) * var(:,6+ol,:) + & + a(7,6) * var(:,7+ol,:) + a(8,6) * var(:,8+ol,:) + & + a(9,6) * var(:,9+ol,:) ) * idel - jl = 7 + jl = 7 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(3,6) * var(:,nj-2,:) + a(4,6) * var(:,nj-3,:) + & - a(5,6) * var(:,nj-4,:) + a(6,6) * var(:,nj-5,:) + & - a(7,6) * var(:,nj-6,:) + a(8,6) * var(:,nj-7,:) + & - a(9,6) * var(:,nj-8,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(2,5) * var(:,nj-1,:) + a(3,5) * var(:,nj-2,:) + & - a(4,5) * var(:,nj-3,:) + a(5,5) * var(:,nj-4,:) + & - a(6,5) * var(:,nj-5,:) + a(7,5) * var(:,nj-6,:) + & - a(8,5) * var(:,nj-7,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(1,4) * var(:,nj,:) + a(2,4) * var(:,nj-1,:) + & - a(3,4) * var(:,nj-2,:) + a(4,4) * var(:,nj-3,:) + & - a(5,4) * var(:,nj-4,:) + a(6,4) * var(:,nj-5,:) + & - a(7,4) * var(:,nj-6,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) + a(6,3) * var(:,nj-5,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) + & - a(5,2) * var(:,nj-4,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) + a(4,1) * var(:,nj-3,:) ) * idel + or = nj - offset(4) + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(3,6) * var(:,or-2,:) + a(4,6) * var(:,or-3,:) + & + a(5,6) * var(:,or-4,:) + a(6,6) * var(:,or-5,:) + & + a(7,6) * var(:,or-6,:) + a(8,6) * var(:,or-7,:) + & + a(9,6) * var(:,or-8,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(2,5) * var(:,or-1,:) + a(3,5) * var(:,or-2,:) + & + a(4,5) * var(:,or-3,:) + a(5,5) * var(:,or-4,:) + & + a(6,5) * var(:,or-5,:) + a(7,5) * var(:,or-6,:) + & + a(8,5) * var(:,or-7,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(1,4) * var(:,or,:) + a(2,4) * var(:,or-1,:) + & + a(3,4) * var(:,or-2,:) + a(4,4) * var(:,or-3,:) + & + a(5,4) * var(:,or-4,:) + a(6,4) * var(:,or-5,:) + & + a(7,4) * var(:,or-6,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) + a(6,3) * var(:,or-5,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) + & + a(5,2) * var(:,or-4,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) + a(4,1) * var(:,or-3,:) ) * idel - jr = nj - 6 + jr = or - 6 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -20.0_wp * var(:,jl:jr,:) + & @@ -200,66 +205,68 @@ subroutine dissipation_6_3 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(2,5) * var(:,:,2) + a(3,5) * var(:,:,3) + & - a(4,5) * var(:,:,4) + a(5,5) * var(:,:,5) + & - a(6,5) * var(:,:,6) + a(7,5) * var(:,:,7) + & - a(8,5) * var(:,:,8) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(3,6) * var(:,:,3) + a(4,6) * var(:,:,4) + & - a(5,6) * var(:,:,5) + a(6,6) * var(:,:,6) + & - a(7,6) * var(:,:,7) + a(8,6) * var(:,:,8) + & - a(9,6) * var(:,:,9) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(2,5) * var(:,:,2+ol) + a(3,5) * var(:,:,3+ol) + & + a(4,5) * var(:,:,4+ol) + a(5,5) * var(:,:,5+ol) + & + a(6,5) * var(:,:,6+ol) + a(7,5) * var(:,:,7+ol) + & + a(8,5) * var(:,:,8+ol) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(3,6) * var(:,:,3+ol) + a(4,6) * var(:,:,4+ol) + & + a(5,6) * var(:,:,5+ol) + a(6,6) * var(:,:,6+ol) + & + a(7,6) * var(:,:,7+ol) + a(8,6) * var(:,:,8+ol) + & + a(9,6) * var(:,:,9+ol) ) * idel - kl = 7 + kl = 7 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(3,6) * var(:,:,nk-2) + a(4,6) * var(:,:,nk-3) + & - a(5,6) * var(:,:,nk-4) + a(6,6) * var(:,:,nk-5) + & - a(7,6) * var(:,:,nk-6) + a(8,6) * var(:,:,nk-7) + & - a(9,6) * var(:,:,nk-8) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(2,5) * var(:,:,nk-1) + a(3,5) * var(:,:,nk-2) + & - a(4,5) * var(:,:,nk-3) + a(5,5) * var(:,:,nk-4) + & - a(6,5) * var(:,:,nk-5) + a(7,5) * var(:,:,nk-6) + & - a(8,5) * var(:,:,nk-7) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(1,4) * var(:,:,nk) + a(2,4) * var(:,:,nk-1) + & - a(3,4) * var(:,:,nk-2) + a(4,4) * var(:,:,nk-3) + & - a(5,4) * var(:,:,nk-4) + a(6,4) * var(:,:,nk-5) + & - a(7,4) * var(:,:,nk-6) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) + a(6,3) * var(:,:,nk-5) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) + & - a(5,2) * var(:,:,nk-4) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) + a(4,1) * var(:,:,nk-3) ) * idel + or = nk - offset(6) + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(3,6) * var(:,:,or-2) + a(4,6) * var(:,:,or-3) + & + a(5,6) * var(:,:,or-4) + a(6,6) * var(:,:,or-5) + & + a(7,6) * var(:,:,or-6) + a(8,6) * var(:,:,or-7) + & + a(9,6) * var(:,:,or-8) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(2,5) * var(:,:,or-1) + a(3,5) * var(:,:,or-2) + & + a(4,5) * var(:,:,or-3) + a(5,5) * var(:,:,or-4) + & + a(6,5) * var(:,:,or-5) + a(7,5) * var(:,:,or-6) + & + a(8,5) * var(:,:,or-7) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(1,4) * var(:,:,or) + a(2,4) * var(:,:,or-1) + & + a(3,4) * var(:,:,or-2) + a(4,4) * var(:,:,or-3) + & + a(5,4) * var(:,:,or-4) + a(6,4) * var(:,:,or-5) + & + a(7,4) * var(:,:,or-6) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) + a(6,3) * var(:,:,or-5) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) + & + a(5,2) * var(:,:,or-4) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) + a(4,1) * var(:,:,or-3) ) * idel - kr = nk - 6 + kr = or - 6 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -20.0_wp * var(:,:,kl:kr) + & diff --git a/src/Dissipation_6_3_alt.F90 b/src/Dissipation_6_3_alt.F90 index 5fd9bc9..1a4e00b 100644 --- a/src/Dissipation_6_3_alt.F90 +++ b/src/Dissipation_6_3_alt.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(10,6) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -31,74 +32,76 @@ subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) + & - a(5,1) * var(5,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) + & - a(9,5) * var(9,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(2,6) * var(2,:,:) + a(3,6) * var(3,:,:) + & - a(4,6) * var(4,:,:) + a(5,6) * var(5,:,:) + & - a(6,6) * var(6,:,:) + a(7,6) * var(7,:,:) + & - a(8,6) * var(8,:,:) + a(9,6) * var(9,:,:) + & - a(10,6) * var(10,:,:) ) * idel + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) + & + a(5,1) * var(5+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) + & + a(9,5) * var(9+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(2,6) * var(2+ol,:,:) + a(3,6) * var(3+ol,:,:) + & + a(4,6) * var(4+ol,:,:) + a(5,6) * var(5+ol,:,:) + & + a(6,6) * var(6+ol,:,:) + a(7,6) * var(7+ol,:,:) + & + a(8,6) * var(8+ol,:,:) + a(9,6) * var(9+ol,:,:) + & + a(10,6) * var(10+ol,:,:) ) * idel - il = 7 + il = 7 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(2,6) * var(ni-1,:,:) + a(3,6) * var(ni-2,:,:) + & - a(4,6) * var(ni-3,:,:) + a(5,6) * var(ni-4,:,:) + & - a(6,6) * var(ni-5,:,:) + a(7,6) * var(ni-6,:,:) + & - a(8,6) * var(ni-7,:,:) + a(9,6) * var(ni-8,:,:) + & - a(10,6) * var(ni-9,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(1,5) * var(ni,:,:) + a(2,5) * var(ni-1,:,:) + & - a(3,5) * var(ni-2,:,:) + a(4,5) * var(ni-3,:,:) + & - a(5,5) * var(ni-4,:,:) + a(6,5) * var(ni-5,:,:) + & - a(7,5) * var(ni-6,:,:) + a(8,5) * var(ni-7,:,:) + & - a(9,5) * var(ni-8,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(1,4) * var(ni,:,:) + a(2,4) * var(ni-1,:,:) + & - a(3,4) * var(ni-2,:,:) + a(4,4) * var(ni-3,:,:) + & - a(5,4) * var(ni-4,:,:) + a(6,4) * var(ni-5,:,:) + & - a(7,4) * var(ni-6,:,:) + a(8,4) * var(ni-7,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) + a(6,3) * var(ni-5,:,:) + & - a(7,3) * var(ni-6,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) + & - a(5,2) * var(ni-4,:,:) + a(6,2) * var(ni-5,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) + a(4,1) * var(ni-3,:,:) + & - a(5,1) * var(ni-4,:,:) ) * idel + or = ni - offset(2) + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(2,6) * var(or-1,:,:) + a(3,6) * var(or-2,:,:) + & + a(4,6) * var(or-3,:,:) + a(5,6) * var(or-4,:,:) + & + a(6,6) * var(or-5,:,:) + a(7,6) * var(or-6,:,:) + & + a(8,6) * var(or-7,:,:) + a(9,6) * var(or-8,:,:) + & + a(10,6) * var(or-9,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(1,5) * var(or,:,:) + a(2,5) * var(or-1,:,:) + & + a(3,5) * var(or-2,:,:) + a(4,5) * var(or-3,:,:) + & + a(5,5) * var(or-4,:,:) + a(6,5) * var(or-5,:,:) + & + a(7,5) * var(or-6,:,:) + a(8,5) * var(or-7,:,:) + & + a(9,5) * var(or-8,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(1,4) * var(or,:,:) + a(2,4) * var(or-1,:,:) + & + a(3,4) * var(or-2,:,:) + a(4,4) * var(or-3,:,:) + & + a(5,4) * var(or-4,:,:) + a(6,4) * var(or-5,:,:) + & + a(7,4) * var(or-6,:,:) + a(8,4) * var(or-7,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) + a(6,3) * var(or-5,:,:) + & + a(7,3) * var(or-6,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) + & + a(5,2) * var(or-4,:,:) + a(6,2) * var(or-5,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) + a(4,1) * var(or-3,:,:) + & + a(5,1) * var(or-4,:,:) ) * idel - ir = ni - 6 + ir = or - 6 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -70.0_wp * var(il:ir,:,:) + & @@ -119,74 +122,76 @@ subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) + & - a(5,1) * var(:,5,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) + & - a(9,5) * var(:,9,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(2,6) * var(:,2,:) + a(3,6) * var(:,3,:) + & - a(4,6) * var(:,4,:) + a(5,6) * var(:,5,:) + & - a(6,6) * var(:,6,:) + a(7,6) * var(:,7,:) + & - a(8,6) * var(:,8,:) + a(9,6) * var(:,9,:) + & - a(10,6) * var(:,10,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) + & + a(5,1) * var(:,5+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) + & + a(9,5) * var(:,9+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(2,6) * var(:,2+ol,:) + a(3,6) * var(:,3+ol,:) + & + a(4,6) * var(:,4+ol,:) + a(5,6) * var(:,5+ol,:) + & + a(6,6) * var(:,6+ol,:) + a(7,6) * var(:,7+ol,:) + & + a(8,6) * var(:,8+ol,:) + a(9,6) * var(:,9+ol,:) + & + a(10,6) * var(:,10+ol,:) ) * idel - jl = 7 + jl = 7 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(2,6) * var(:,nj-1,:) + a(3,6) * var(:,nj-2,:) + & - a(4,6) * var(:,nj-3,:) + a(5,6) * var(:,nj-4,:) + & - a(6,6) * var(:,nj-5,:) + a(7,6) * var(:,nj-6,:) + & - a(8,6) * var(:,nj-7,:) + a(9,6) * var(:,nj-8,:) + & - a(10,6) * var(:,nj-9,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(1,5) * var(:,nj,:) + a(2,5) * var(:,nj-1,:) + & - a(3,5) * var(:,nj-2,:) + a(4,5) * var(:,nj-3,:) + & - a(5,5) * var(:,nj-4,:) + a(6,5) * var(:,nj-5,:) + & - a(7,5) * var(:,nj-6,:) + a(8,5) * var(:,nj-7,:) + & - a(9,5) * var(:,nj-8,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(1,4) * var(:,nj,:) + a(2,4) * var(:,nj-1,:) + & - a(3,4) * var(:,nj-2,:) + a(4,4) * var(:,nj-3,:) + & - a(5,4) * var(:,nj-4,:) + a(6,4) * var(:,nj-5,:) + & - a(7,4) * var(:,nj-6,:) + a(8,4) * var(:,nj-7,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) + a(6,3) * var(:,nj-5,:) + & - a(7,3) * var(:,nj-6,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) + & - a(5,2) * var(:,nj-4,:) + a(6,2) * var(:,nj-5,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) + a(4,1) * var(:,nj-3,:) + & - a(5,1) * var(:,nj-4,:) ) * idel + or = nj - offset(4) + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(2,6) * var(:,or-1,:) + a(3,6) * var(:,or-2,:) + & + a(4,6) * var(:,or-3,:) + a(5,6) * var(:,or-4,:) + & + a(6,6) * var(:,or-5,:) + a(7,6) * var(:,or-6,:) + & + a(8,6) * var(:,or-7,:) + a(9,6) * var(:,or-8,:) + & + a(10,6) * var(:,or-9,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(1,5) * var(:,or,:) + a(2,5) * var(:,or-1,:) + & + a(3,5) * var(:,or-2,:) + a(4,5) * var(:,or-3,:) + & + a(5,5) * var(:,or-4,:) + a(6,5) * var(:,or-5,:) + & + a(7,5) * var(:,or-6,:) + a(8,5) * var(:,or-7,:) + & + a(9,5) * var(:,or-8,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(1,4) * var(:,or,:) + a(2,4) * var(:,or-1,:) + & + a(3,4) * var(:,or-2,:) + a(4,4) * var(:,or-3,:) + & + a(5,4) * var(:,or-4,:) + a(6,4) * var(:,or-5,:) + & + a(7,4) * var(:,or-6,:) + a(8,4) * var(:,or-7,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) + a(6,3) * var(:,or-5,:) + & + a(7,3) * var(:,or-6,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) + & + a(5,2) * var(:,or-4,:) + a(6,2) * var(:,or-5,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) + a(4,1) * var(:,or-3,:) + & + a(5,1) * var(:,or-4,:) ) * idel - jr = nj - 6 + jr = or - 6 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -70.0_wp * var(:,jl:jr,:) + & @@ -208,73 +213,75 @@ subroutine dissipation_6_3_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) + & - a(5,1) * var(:,:,5) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) + & - a(9,5) * var(:,:,9) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(2,6) * var(:,:,2) + a(3,6) * var(:,:,3) + & - a(4,6) * var(:,:,4) + a(5,6) * var(:,:,5) + & - a(6,6) * var(:,:,6) + a(7,6) * var(:,:,7) + & - a(8,6) * var(:,:,8) + a(9,6) * var(:,:,9) + & - a(10,6) * var(:,:,10) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) + & + a(5,1) * var(:,:,5+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) + & + a(9,5) * var(:,:,9+ol) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(2,6) * var(:,:,2+ol) + a(3,6) * var(:,:,3+ol) + & + a(4,6) * var(:,:,4+ol) + a(5,6) * var(:,:,5+ol) + & + a(6,6) * var(:,:,6+ol) + a(7,6) * var(:,:,7+ol) + & + a(8,6) * var(:,:,8+ol) + a(9,6) * var(:,:,9+ol) + & + a(10,6) * var(:,:,10+ol) ) * idel - kl = 7 + kl = 7 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(2,6) * var(:,:,nk-1) + a(3,6) * var(:,:,nk-2) + & - a(4,6) * var(:,:,nk-3) + a(5,6) * var(:,:,nk-4) + & - a(6,6) * var(:,:,nk-5) + a(7,6) * var(:,:,nk-6) + & - a(8,6) * var(:,:,nk-7) + a(9,6) * var(:,:,nk-8) + & - a(10,6) * var(:,:,nk-9) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(1,5) * var(:,:,nk) + a(2,5) * var(:,:,nk-1) + & - a(3,5) * var(:,:,nk-2) + a(4,5) * var(:,:,nk-3) + & - a(5,5) * var(:,:,nk-4) + a(6,5) * var(:,:,nk-5) + & - a(7,5) * var(:,:,nk-6) + a(8,5) * var(:,:,nk-7) + & - a(9,5) * var(:,:,nk-8) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(1,4) * var(:,:,nk) + a(2,4) * var(:,:,nk-1) + & - a(3,4) * var(:,:,nk-2) + a(4,4) * var(:,:,nk-3) + & - a(5,4) * var(:,:,nk-4) + a(6,4) * var(:,:,nk-5) + & - a(7,4) * var(:,:,nk-6) + a(8,4) * var(:,:,nk-7) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) + a(6,3) * var(:,:,nk-5) + & - a(7,3) * var(:,:,nk-6) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) + & - a(5,2) * var(:,:,nk-4) + a(6,2) * var(:,:,nk-5) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) + a(4,1) * var(:,:,nk-3) + & - a(5,1) * var(:,:,nk-4) ) * idel - kr = nk - 6 + or = nk - offset(6) + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(2,6) * var(:,:,or-1) + a(3,6) * var(:,:,or-2) + & + a(4,6) * var(:,:,or-3) + a(5,6) * var(:,:,or-4) + & + a(6,6) * var(:,:,or-5) + a(7,6) * var(:,:,or-6) + & + a(8,6) * var(:,:,or-7) + a(9,6) * var(:,:,or-8) + & + a(10,6) * var(:,:,or-9) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(1,5) * var(:,:,or) + a(2,5) * var(:,:,or-1) + & + a(3,5) * var(:,:,or-2) + a(4,5) * var(:,:,or-3) + & + a(5,5) * var(:,:,or-4) + a(6,5) * var(:,:,or-5) + & + a(7,5) * var(:,:,or-6) + a(8,5) * var(:,:,or-7) + & + a(9,5) * var(:,:,or-8) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(1,4) * var(:,:,or) + a(2,4) * var(:,:,or-1) + & + a(3,4) * var(:,:,or-2) + a(4,4) * var(:,:,or-3) + & + a(5,4) * var(:,:,or-4) + a(6,4) * var(:,:,or-5) + & + a(7,4) * var(:,:,or-6) + a(8,4) * var(:,:,or-7) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) + a(6,3) * var(:,:,or-5) + & + a(7,3) * var(:,:,or-6) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) + & + a(5,2) * var(:,:,or-4) + a(6,2) * var(:,:,or-5) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) + a(4,1) * var(:,:,or-3) + & + a(5,1) * var(:,:,or-4) ) * idel + kr = or - 6 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -70.0_wp * var(:,:,kl:kr) + & diff --git a/src/Dissipation_6_5_min_err_coeff.F90 b/src/Dissipation_6_5_min_err_coeff.F90 index 1ce64f9..bae7795 100644 --- a/src/Dissipation_6_5_min_err_coeff.F90 +++ b/src/Dissipation_6_5_min_err_coeff.F90 @@ -5,7 +5,7 @@ #include "cctk_Functions.h" -subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & +subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, offset, & delta, epsilon, dfl, npatches, patch, rhs) use dissipation_coeff @@ -21,6 +21,7 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(lsh(1),lsh(2),lsh(3)), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon CCTK_REAL, dimension(3), intent(in) :: dfl @@ -33,7 +34,8 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(:,:), pointer :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or + CCTK_INT :: nii, njj, nkk ni = lsh(1); nj = lsh(2); nk = lsh(3) @@ -45,10 +47,18 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & end if if ( .not. savedx(patch) ) then - allocate ( atmp(ni,ni), d(ni,ni), b(ni,ni), h(ni,ni), tmp(ni,ni) ) + nii = ni + if ( bb(1) /= 0 ) then + nii = nii - offset(1) + endif + if ( bb(2) /= 0 ) then + nii = nii - offset(2) + endif + allocate ( atmp(nii,nii), d(nii,nii), b(nii,nii), h(nii,nii), tmp(nii,nii) ) + atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1), lbnd(1), delta(1), dfl(1) ) + call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1)-offset(1)-offset(2), lbnd(1), delta(1), dfl(1) ) call set_hmatrix ( h, bb(1:2) ) @@ -64,7 +74,7 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(1) / 2 + center = (gsh(1)-offset(1)-offset(2)) / 2 ir = center + max(gsize(1),3) call set_dmatrix_half ( d(1:ir,1:ir), 1 ) @@ -78,17 +88,17 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & il = center + 1 - max(gsize(1),3) d = zero - call set_dmatrix_half ( d(il:ni,il:ni), 2 ) - tmp(il:ni,il:ni) = matmul ( b(il:ni,il:ni), d(il:ni,il:ni) ) - tmp(il:ni,il:ni) = matmul ( transpose ( d(il:ni,il:ni) ), tmp(il:ni,il:ni) ) - tmp(il:ni,il:ni) = matmul ( h(il:ni,il:ni), tmp(il:ni,il:ni) ) - tmp(il:ni,il:ni) = -transpose ( tmp(il:ni,il:ni) ) + call set_dmatrix_half ( d(il:nii,il:nii), 2 ) + tmp(il:nii,il:nii) = matmul ( b(il:nii,il:nii), d(il:nii,il:nii) ) + tmp(il:nii,il:nii) = matmul ( transpose ( d(il:nii,il:nii) ), tmp(il:nii,il:nii) ) + tmp(il:nii,il:nii) = matmul ( h(il:nii,il:nii), tmp(il:nii,il:nii) ) + tmp(il:nii,il:nii) = -transpose ( tmp(il:nii,il:nii) ) - atmp(il:ni,center+1:ni) = tmp(il:ni,center+1:ni) + atmp(il:nii,center+1:nii) = tmp(il:nii,center+1:nii) end if - allocate ( xcoeff(patch)%coeff(ni,ni) ) + allocate ( xcoeff(patch)%coeff(nii,nii) ) xcoeff(patch)%coeff = atmp @@ -111,48 +121,49 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & il = 1 + gsize(1) else - - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) + & - a(7,2) * var(7,:,:) + a(8,2) * var(8,:,:) + & - a(9,2) * var(9,:,:) + a(10,2) * var(10,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) + a(8,3) * var(8,:,:) + & - a(9,3) * var(9,:,:) + a(10,3) * var(10,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) + & - a(9,4) * var(9,:,:) + a(10,4) * var(10,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) + & - a(9,5) * var(9,:,:) + a(10,5) * var(10,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(1,6) * var(1,:,:) + a(2,6) * var(2,:,:) + & - a(3,6) * var(3,:,:) + a(4,6) * var(4,:,:) + & - a(5,6) * var(5,:,:) + a(6,6) * var(6,:,:) + & - a(7,6) * var(7,:,:) + a(8,6) * var(8,:,:) + & - a(9,6) * var(9,:,:) + a(10,6) * var(10,:,:) ) * idel - rhs(7,:,:) = rhs(7,:,:) + & - ( a(1,7) * var(1,:,:) + a(2,7) * var(2,:,:) + & - a(3,7) * var(3,:,:) + a(4,7) * var(4,:,:) + & - a(5,7) * var(5,:,:) + a(6,7) * var(6,:,:) + & - a(7,7) * var(7,:,:) + a(8,7) * var(8,:,:) + & - a(9,7) * var(9,:,:) + a(10,7) * var(10,:,:) ) * idel - - il = 8 + ol = offset(1) + + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) + & + a(7,2) * var(7+ol,:,:) + a(8,2) * var(8+ol,:,:) + & + a(9,2) * var(9+ol,:,:) + a(10,2) * var(10+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) + a(8,3) * var(8+ol,:,:) + & + a(9,3) * var(9+ol,:,:) + a(10,3) * var(10+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) + & + a(9,4) * var(9+ol,:,:) + a(10,4) * var(10+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) + & + a(9,5) * var(9+ol,:,:) + a(10,5) * var(10+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(1,6) * var(1+ol,:,:) + a(2,6) * var(2+ol,:,:) + & + a(3,6) * var(3+ol,:,:) + a(4,6) * var(4+ol,:,:) + & + a(5,6) * var(5+ol,:,:) + a(6,6) * var(6+ol,:,:) + & + a(7,6) * var(7+ol,:,:) + a(8,6) * var(8+ol,:,:) + & + a(9,6) * var(9+ol,:,:) + a(10,6) * var(10+ol,:,:) ) * idel + rhs(7+ol,:,:) = rhs(7+ol,:,:) + & + ( a(1,7) * var(1+ol,:,:) + a(2,7) * var(2+ol,:,:) + & + a(3,7) * var(3+ol,:,:) + a(4,7) * var(4+ol,:,:) + & + a(5,7) * var(5+ol,:,:) + a(6,7) * var(6+ol,:,:) + & + a(7,7) * var(7+ol,:,:) + a(8,7) * var(8+ol,:,:) + & + a(9,7) * var(9+ol,:,:) + a(10,7) * var(10+ol,:,:) ) * idel + + il = 8 + ol end if @@ -161,86 +172,99 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & ir = ni - gsize(1) else - - rhs(ni-6,:,:) = rhs(ni-6,:,:) + & - ( a(ni-9,ni-6) * var(ni-9,:,:) + & - a(ni-8,ni-6) * var(ni-8,:,:) + & - a(ni-7,ni-6) * var(ni-7,:,:) + & - a(ni-6,ni-6) * var(ni-6,:,:) + & - a(ni-5,ni-6) * var(ni-5,:,:) + & - a(ni-4,ni-6) * var(ni-4,:,:) + & - a(ni-3,ni-6) * var(ni-3,:,:) + & - a(ni-2,ni-6) * var(ni-2,:,:) + & - a(ni-1,ni-6) * var(ni-1,:,:) + & - a(ni,ni-6) * var(ni,:,:) ) * idel - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(ni-9,ni-5) * var(ni-9,:,:) + & - a(ni-8,ni-5) * var(ni-8,:,:) + & - a(ni-7,ni-5) * var(ni-7,:,:) + & - a(ni-6,ni-5) * var(ni-6,:,:) + & - a(ni-5,ni-5) * var(ni-5,:,:) + & - a(ni-4,ni-5) * var(ni-4,:,:) + & - a(ni-3,ni-5) * var(ni-3,:,:) + & - a(ni-2,ni-5) * var(ni-2,:,:) + & - a(ni-1,ni-5) * var(ni-1,:,:) + & - a(ni,ni-5) * var(ni,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(ni-9,ni-4) * var(ni-9,:,:) + & - a(ni-8,ni-4) * var(ni-8,:,:) + & - a(ni-7,ni-4) * var(ni-7,:,:) + & - a(ni-6,ni-4) * var(ni-6,:,:) + & - a(ni-5,ni-4) * var(ni-5,:,:) + & - a(ni-4,ni-4) * var(ni-4,:,:) + & - a(ni-3,ni-4) * var(ni-3,:,:) + & - a(ni-2,ni-4) * var(ni-2,:,:) + & - a(ni-1,ni-4) * var(ni-1,:,:) + & - a(ni,ni-4) * var(ni,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(ni-9,ni-3) * var(ni-9,:,:) + & - a(ni-8,ni-3) * var(ni-8,:,:) + & - a(ni-7,ni-3) * var(ni-7,:,:) + & - a(ni-6,ni-3) * var(ni-6,:,:) + & - a(ni-5,ni-3) * var(ni-5,:,:) + & - a(ni-4,ni-3) * var(ni-4,:,:) + & - a(ni-3,ni-3) * var(ni-3,:,:) + & - a(ni-2,ni-3) * var(ni-2,:,:) + & - a(ni-1,ni-3) * var(ni-1,:,:) + & - a(ni,ni-3) * var(ni,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(ni-9,ni-2) * var(ni-9,:,:) + & - a(ni-8,ni-2) * var(ni-8,:,:) + & - a(ni-7,ni-2) * var(ni-7,:,:) + & - a(ni-6,ni-2) * var(ni-6,:,:) + & - a(ni-5,ni-2) * var(ni-5,:,:) + & - a(ni-4,ni-2) * var(ni-4,:,:) + & - a(ni-3,ni-2) * var(ni-3,:,:) + & - a(ni-2,ni-2) * var(ni-2,:,:) + & - a(ni-1,ni-2) * var(ni-1,:,:) + & - a(ni,ni-2) * var(ni,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(ni-9,ni-1) * var(ni-9,:,:) + & - a(ni-8,ni-1) * var(ni-8,:,:) + & - a(ni-7,ni-1) * var(ni-7,:,:) + & - a(ni-6,ni-1) * var(ni-6,:,:) + & - a(ni-5,ni-1) * var(ni-5,:,:) + & - a(ni-4,ni-1) * var(ni-4,:,:) + & - a(ni-3,ni-1) * var(ni-3,:,:) + & - a(ni-2,ni-1) * var(ni-2,:,:) + & - a(ni-1,ni-1) * var(ni-1,:,:) + & - a(ni,ni-1) * var(ni,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(ni-3,ni) * var(ni-3,:,:) + & - a(ni-2,ni) * var(ni-2,:,:) + & - a(ni-1,ni) * var(ni-1,:,:) + & - a(ni,ni) * var(ni,:,:) ) * idel - - ir = ni - 7 + or = ni - offset(2) + + rhs(or-6,:,:) = rhs(or-6,:,:) + & + ( a(nii-9,nii-6) * var(or-9,:,:) + & + a(nii-8,nii-6) * var(or-8,:,:) + & + a(nii-7,nii-6) * var(or-7,:,:) + & + a(nii-6,nii-6) * var(or-6,:,:) + & + a(nii-5,nii-6) * var(or-5,:,:) + & + a(nii-4,nii-6) * var(or-4,:,:) + & + a(nii-3,nii-6) * var(or-3,:,:) + & + a(nii-2,nii-6) * var(or-2,:,:) + & + a(nii-1,nii-6) * var(or-1,:,:) + & + a(nii,nii-6) * var(or,:,:) ) * idel + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(nii-9,nii-5) * var(or-9,:,:) + & + a(nii-8,nii-5) * var(or-8,:,:) + & + a(nii-7,nii-5) * var(or-7,:,:) + & + a(nii-6,nii-5) * var(or-6,:,:) + & + a(nii-5,nii-5) * var(or-5,:,:) + & + a(nii-4,nii-5) * var(or-4,:,:) + & + a(nii-3,nii-5) * var(or-3,:,:) + & + a(nii-2,nii-5) * var(or-2,:,:) + & + a(nii-1,nii-5) * var(or-1,:,:) + & + a(nii,nii-5) * var(or,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(nii-9,nii-4) * var(or-9,:,:) + & + a(nii-8,nii-4) * var(or-8,:,:) + & + a(nii-7,nii-4) * var(or-7,:,:) + & + a(nii-6,nii-4) * var(or-6,:,:) + & + a(nii-5,nii-4) * var(or-5,:,:) + & + a(nii-4,nii-4) * var(or-4,:,:) + & + a(nii-3,nii-4) * var(or-3,:,:) + & + a(nii-2,nii-4) * var(or-2,:,:) + & + a(nii-1,nii-4) * var(or-1,:,:) + & + a(nii,nii-4) * var(or,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(nii-9,nii-3) * var(or-9,:,:) + & + a(nii-8,nii-3) * var(or-8,:,:) + & + a(nii-7,nii-3) * var(or-7,:,:) + & + a(nii-6,nii-3) * var(or-6,:,:) + & + a(nii-5,nii-3) * var(or-5,:,:) + & + a(nii-4,nii-3) * var(or-4,:,:) + & + a(nii-3,nii-3) * var(or-3,:,:) + & + a(nii-2,nii-3) * var(or-2,:,:) + & + a(nii-1,nii-3) * var(or-1,:,:) + & + a(nii,nii-3) * var(or,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(nii-9,nii-2) * var(or-9,:,:) + & + a(nii-8,nii-2) * var(or-8,:,:) + & + a(nii-7,nii-2) * var(or-7,:,:) + & + a(nii-6,nii-2) * var(or-6,:,:) + & + a(nii-5,nii-2) * var(or-5,:,:) + & + a(nii-4,nii-2) * var(or-4,:,:) + & + a(nii-3,nii-2) * var(or-3,:,:) + & + a(nii-2,nii-2) * var(or-2,:,:) + & + a(nii-1,nii-2) * var(or-1,:,:) + & + a(nii,nii-2) * var(or,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(nii-9,nii-1) * var(or-9,:,:) + & + a(nii-8,nii-1) * var(or-8,:,:) + & + a(nii-7,nii-1) * var(or-7,:,:) + & + a(nii-6,nii-1) * var(or-6,:,:) + & + a(nii-5,nii-1) * var(or-5,:,:) + & + a(nii-4,nii-1) * var(or-4,:,:) + & + a(nii-3,nii-1) * var(or-3,:,:) + & + a(nii-2,nii-1) * var(or-2,:,:) + & + a(nii-1,nii-1) * var(or-1,:,:) + & + a(nii,nii-1) * var(or,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(nii-3,nii) * var(or-3,:,:) + & + a(nii-2,nii) * var(or-2,:,:) + & + a(nii-1,nii) * var(or-1,:,:) + & + a(nii,nii) * var(or,:,:) ) * idel + + ir = or - 7 end if - do i = il, ir - - rhs(i,:,:) = rhs(i,:,:) + & + if ( bb(1) /= 0) then + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-ol-3,i-ol) * var(i-3,:,:) + & + a(i-ol-2,i-ol) * var(i-2,:,:) + & + a(i-ol-1,i-ol) * var(i-1,:,:) + & + a(i-ol,i-ol) * var(i,:,:) + & + a(i-ol+1,i-ol) * var(i+1,:,:) + & + a(i-ol+2,i-ol) * var(i+2,:,:) + & + a(i-ol+3,i-ol) * var(i+3,:,:) ) * idel + + end do + else + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & ( a(i-3,i) * var(i-3,:,:) + & a(i-2,i) * var(i-2,:,:) + & a(i-1,i) * var(i-1,:,:) + & @@ -249,14 +273,23 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & a(i+2,i) * var(i+2,:,:) + & a(i+3,i) * var(i+3,:,:) ) * idel - end do + end do + endif if ( zero_derivs_y == 0 ) then if ( .not. savedy(patch) ) then - allocate ( atmp(nj,nj), d(nj,nj), b(nj,nj), h(nj,nj), tmp(nj,nj) ) + njj = nj + if ( bb(3) /= 0 ) then + njj = njj - offset(3) + endif + if ( bb(4) /= 0 ) then + njj = njj - offset(4) + endif + + allocate ( atmp(njj,njj), d(njj,njj), b(njj,njj), h(njj,njj), tmp(njj,njj) ) atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2), lbnd(2), delta(2), dfl(2) ) + call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2)-offset(3)-offset(4), lbnd(2), delta(2), dfl(2) ) call set_hmatrix ( h, bb(3:4) ) @@ -272,7 +305,7 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(2) / 2 + center = (gsh(2)-offset(3)-offset(4)) / 2 jr = center + max(gsize(2),3) call set_dmatrix_half ( d(1:jr,1:jr), 1 ) @@ -286,19 +319,19 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & jl = center + 1 - max(gsize(2),3) d = zero - call set_dmatrix_half ( d(jl:nj,jl:nj), 2 ) - tmp(jl:nj,jl:nj) = -transpose ( & - matmul ( h(jl:nj,jl:nj), & + call set_dmatrix_half ( d(jl:njj,jl:njj), 2 ) + tmp(jl:njj,jl:njj) = -transpose ( & + matmul ( h(jl:njj,jl:njj), & matmul ( & - transpose ( d(jl:nj,jl:nj) ), & - matmul ( b(jl:nj,jl:nj), & - d(jl:nj,jl:nj) ) ) ) ) + transpose ( d(jl:njj,jl:njj) ), & + matmul ( b(jl:njj,jl:njj), & + d(jl:njj,jl:njj) ) ) ) ) - atmp(jl:nj,center+1:nj) = tmp(jl:nj,center+1:nj) + atmp(jl:njj,center+1:njj) = tmp(jl:njj,center+1:njj) end if - allocate ( ycoeff(patch)%coeff(nj,nj) ) + allocate ( ycoeff(patch)%coeff(njj,njj) ) ycoeff(patch)%coeff = atmp @@ -321,48 +354,49 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & jl = 1 + gsize(2) else - - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) + & - a(7,2) * var(:,7,:) + a(8,2) * var(:,8,:) + & - a(9,2) * var(:,9,:) + a(10,2) * var(:,10,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) + a(8,3) * var(:,8,:) + & - a(9,3) * var(:,9,:) + a(10,3) * var(:,10,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) + & - a(9,4) * var(:,9,:) + a(10,4) * var(:,10,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) + & - a(9,5) * var(:,9,:) + a(10,5) * var(:,10,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(1,6) * var(:,1,:) + a(2,6) * var(:,2,:) + & - a(3,6) * var(:,3,:) + a(4,6) * var(:,4,:) + & - a(5,6) * var(:,5,:) + a(6,6) * var(:,6,:) + & - a(7,6) * var(:,7,:) + a(8,6) * var(:,8,:) + & - a(9,6) * var(:,9,:) + a(10,6) * var(:,10,:) ) * idel - rhs(:,7,:) = rhs(:,7,:) + & - ( a(1,7) * var(:,1,:) + a(2,7) * var(:,2,:) + & - a(3,7) * var(:,3,:) + a(4,7) * var(:,4,:) + & - a(5,7) * var(:,5,:) + a(6,7) * var(:,6,:) + & - a(7,7) * var(:,7,:) + a(8,7) * var(:,8,:) + & - a(9,7) * var(:,9,:) + a(10,7) * var(:,10,:) ) * idel - - jl = 8 + ol = offset(3) + + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) + & + a(7,2) * var(:,7+ol,:) + a(8,2) * var(:,8+ol,:) + & + a(9,2) * var(:,9+ol,:) + a(10,2) * var(:,10+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) + a(8,3) * var(:,8+ol,:) + & + a(9,3) * var(:,9+ol,:) + a(10,3) * var(:,10+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) + & + a(9,4) * var(:,9+ol,:) + a(10,4) * var(:,10+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) + & + a(9,5) * var(:,9+ol,:) + a(10,5) * var(:,10+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(1,6) * var(:,1+ol,:) + a(2,6) * var(:,2+ol,:) + & + a(3,6) * var(:,3+ol,:) + a(4,6) * var(:,4+ol,:) + & + a(5,6) * var(:,5+ol,:) + a(6,6) * var(:,6+ol,:) + & + a(7,6) * var(:,7+ol,:) + a(8,6) * var(:,8+ol,:) + & + a(9,6) * var(:,9+ol,:) + a(10,6) * var(:,10+ol,:) ) * idel + rhs(:,7+ol,:) = rhs(:,7+ol,:) + & + ( a(1,7) * var(:,1+ol,:) + a(2,7) * var(:,2+ol,:) + & + a(3,7) * var(:,3+ol,:) + a(4,7) * var(:,4+ol,:) + & + a(5,7) * var(:,5+ol,:) + a(6,7) * var(:,6+ol,:) + & + a(7,7) * var(:,7+ol,:) + a(8,7) * var(:,8+ol,:) + & + a(9,7) * var(:,9+ol,:) + a(10,7) * var(:,10+ol,:) ) * idel + + jl = 8 + ol end if @@ -371,104 +405,124 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & jr = nj - gsize(2) else - - rhs(:,nj-6,:) = rhs(:,nj-6,:) + & - ( a(nj-9,nj-6) * var(:,nj-9,:) + & - a(nj-8,nj-6) * var(:,nj-8,:) + & - a(nj-7,nj-6) * var(:,nj-7,:) + & - a(nj-6,nj-6) * var(:,nj-6,:) + & - a(nj-5,nj-6) * var(:,nj-5,:) + & - a(nj-4,nj-6) * var(:,nj-4,:) + & - a(nj-3,nj-6) * var(:,nj-3,:) + & - a(nj-2,nj-6) * var(:,nj-2,:) + & - a(nj-1,nj-6) * var(:,nj-1,:) + & - a(nj,nj-6) * var(:,nj,:) ) * idel - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(nj-9,nj-5) * var(:,nj-9,:) + & - a(nj-8,nj-5) * var(:,nj-8,:) + & - a(nj-7,nj-5) * var(:,nj-7,:) + & - a(nj-6,nj-5) * var(:,nj-6,:) + & - a(nj-5,nj-5) * var(:,nj-5,:) + & - a(nj-4,nj-5) * var(:,nj-4,:) + & - a(nj-3,nj-5) * var(:,nj-3,:) + & - a(nj-2,nj-5) * var(:,nj-2,:) + & - a(nj-1,nj-5) * var(:,nj-1,:) + & - a(nj,nj-5) * var(:,nj,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(nj-9,nj-4) * var(:,nj-9,:) + & - a(nj-8,nj-4) * var(:,nj-8,:) + & - a(nj-7,nj-4) * var(:,nj-7,:) + & - a(nj-6,nj-4) * var(:,nj-6,:) + & - a(nj-5,nj-4) * var(:,nj-5,:) + & - a(nj-4,nj-4) * var(:,nj-4,:) + & - a(nj-3,nj-4) * var(:,nj-3,:) + & - a(nj-2,nj-4) * var(:,nj-2,:) + & - a(nj-1,nj-4) * var(:,nj-1,:) + & - a(nj,nj-4) * var(:,nj,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(nj-9,nj-3) * var(:,nj-9,:) + & - a(nj-8,nj-3) * var(:,nj-8,:) + & - a(nj-7,nj-3) * var(:,nj-7,:) + & - a(nj-6,nj-3) * var(:,nj-6,:) + & - a(nj-5,nj-3) * var(:,nj-5,:) + & - a(nj-4,nj-3) * var(:,nj-4,:) + & - a(nj-3,nj-3) * var(:,nj-3,:) + & - a(nj-2,nj-3) * var(:,nj-2,:) + & - a(nj-1,nj-3) * var(:,nj-1,:) + & - a(nj,nj-3) * var(:,nj,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(nj-9,nj-2) * var(:,nj-9,:) + & - a(nj-8,nj-2) * var(:,nj-8,:) + & - a(nj-7,nj-2) * var(:,nj-7,:) + & - a(nj-6,nj-2) * var(:,nj-6,:) + & - a(nj-5,nj-2) * var(:,nj-5,:) + & - a(nj-4,nj-2) * var(:,nj-4,:) + & - a(nj-3,nj-2) * var(:,nj-3,:) + & - a(nj-2,nj-2) * var(:,nj-2,:) + & - a(nj-1,nj-2) * var(:,nj-1,:) + & - a(nj,nj-2) * var(:,nj,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(nj-9,nj-1) * var(:,nj-9,:) + & - a(nj-8,nj-1) * var(:,nj-8,:) + & - a(nj-7,nj-1) * var(:,nj-7,:) + & - a(nj-6,nj-1) * var(:,nj-6,:) + & - a(nj-5,nj-1) * var(:,nj-5,:) + & - a(nj-4,nj-1) * var(:,nj-4,:) + & - a(nj-3,nj-1) * var(:,nj-3,:) + & - a(nj-2,nj-1) * var(:,nj-2,:) + & - a(nj-1,nj-1) * var(:,nj-1,:) + & - a(nj,nj-1) * var(:,nj,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(nj-3,nj) * var(:,nj-3,:) + & - a(nj-2,nj) * var(:,nj-2,:) + & - a(nj-1,nj) * var(:,nj-1,:) + & - a(nj,nj) * var(:,nj,:) ) * idel - - jr = nj - 7 + or = nj - offset(4) + + + rhs(:,or-6,:) = rhs(:,or-6,:) + & + ( a(njj-9,njj-6) * var(:,or-9,:) + & + a(njj-8,njj-6) * var(:,or-8,:) + & + a(njj-7,njj-6) * var(:,or-7,:) + & + a(njj-6,njj-6) * var(:,or-6,:) + & + a(njj-5,njj-6) * var(:,or-5,:) + & + a(njj-4,njj-6) * var(:,or-4,:) + & + a(njj-3,njj-6) * var(:,or-3,:) + & + a(njj-2,njj-6) * var(:,or-2,:) + & + a(njj-1,njj-6) * var(:,or-1,:) + & + a(njj,njj-6) * var(:,or,:) ) * idel + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(njj-9,njj-5) * var(:,or-9,:) + & + a(njj-8,njj-5) * var(:,or-8,:) + & + a(njj-7,njj-5) * var(:,or-7,:) + & + a(njj-6,njj-5) * var(:,or-6,:) + & + a(njj-5,njj-5) * var(:,or-5,:) + & + a(njj-4,njj-5) * var(:,or-4,:) + & + a(njj-3,njj-5) * var(:,or-3,:) + & + a(njj-2,njj-5) * var(:,or-2,:) + & + a(njj-1,njj-5) * var(:,or-1,:) + & + a(njj,njj-5) * var(:,or,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(njj-9,njj-4) * var(:,or-9,:) + & + a(njj-8,njj-4) * var(:,or-8,:) + & + a(njj-7,njj-4) * var(:,or-7,:) + & + a(njj-6,njj-4) * var(:,or-6,:) + & + a(njj-5,njj-4) * var(:,or-5,:) + & + a(njj-4,njj-4) * var(:,or-4,:) + & + a(njj-3,njj-4) * var(:,or-3,:) + & + a(njj-2,njj-4) * var(:,or-2,:) + & + a(njj-1,njj-4) * var(:,or-1,:) + & + a(njj,njj-4) * var(:,or,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(njj-9,njj-3) * var(:,or-9,:) + & + a(njj-8,njj-3) * var(:,or-8,:) + & + a(njj-7,njj-3) * var(:,or-7,:) + & + a(njj-6,njj-3) * var(:,or-6,:) + & + a(njj-5,njj-3) * var(:,or-5,:) + & + a(njj-4,njj-3) * var(:,or-4,:) + & + a(njj-3,njj-3) * var(:,or-3,:) + & + a(njj-2,njj-3) * var(:,or-2,:) + & + a(njj-1,njj-3) * var(:,or-1,:) + & + a(njj,njj-3) * var(:,or,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(njj-9,njj-2) * var(:,or-9,:) + & + a(njj-8,njj-2) * var(:,or-8,:) + & + a(njj-7,njj-2) * var(:,or-7,:) + & + a(njj-6,njj-2) * var(:,or-6,:) + & + a(njj-5,njj-2) * var(:,or-5,:) + & + a(njj-4,njj-2) * var(:,or-4,:) + & + a(njj-3,njj-2) * var(:,or-3,:) + & + a(njj-2,njj-2) * var(:,or-2,:) + & + a(njj-1,njj-2) * var(:,or-1,:) + & + a(njj,njj-2) * var(:,or,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(njj-9,njj-1) * var(:,or-9,:) + & + a(njj-8,njj-1) * var(:,or-8,:) + & + a(njj-7,njj-1) * var(:,or-7,:) + & + a(njj-6,njj-1) * var(:,or-6,:) + & + a(njj-5,njj-1) * var(:,or-5,:) + & + a(njj-4,njj-1) * var(:,or-4,:) + & + a(njj-3,njj-1) * var(:,or-3,:) + & + a(njj-2,njj-1) * var(:,or-2,:) + & + a(njj-1,njj-1) * var(:,or-1,:) + & + a(njj,njj-1) * var(:,or,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(njj-3,njj) * var(:,or-3,:) + & + a(njj-2,njj) * var(:,or-2,:) + & + a(njj-1,njj) * var(:,or-1,:) + & + a(njj,njj) * var(:,or,:) ) * idel + + jr = or - 7 end if - do j = jl, jr - - rhs(:,j,:) = rhs(:,j,:) + & - ( a(j-3,j) * var(:,j-3,:) + & + if ( bb(3) /= 0 ) then + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & + ( a(j-ol-3,j-ol) * var(:,j-3,:) + & + a(j-ol-2,j-ol) * var(:,j-2,:) + & + a(j-ol-1,j-ol) * var(:,j-1,:) + & + a(j-ol,j-ol) * var(:,j,:) + & + a(j-ol+1,j-ol) * var(:,j+1,:) + & + a(j-ol+2,j-ol) * var(:,j+2,:) + & + a(j-ol+3,j-ol) * var(:,j+3,:) ) * idel + end do + else + do j = jl, jr + rhs(:,j,:) = rhs(:,j,:) + & + ( a(j-3,j) * var(:,j-3,:) + & a(j-2,j) * var(:,j-2,:) + & a(j-1,j) * var(:,j-1,:) + & a(j,j) * var(:,j,:) + & a(j+1,j) * var(:,j+1,:) + & a(j+2,j) * var(:,j+2,:) + & a(j+3,j) * var(:,j+3,:) ) * idel - - end do + end do + endif end if if ( zero_derivs_z == 0 ) then if ( .not. savedz(patch) ) then - allocate ( atmp(nk,nk), d(nk,nk), b(nk,nk), h(nk,nk), tmp(nk,nk) ) + nkk = nk + if ( bb(5) /= 0 ) then + nkk = nkk - offset(5) + endif + if ( bb(6) /= 0 ) then + nkk = nkk - offset(6) + endif + allocate ( atmp(nkk,nkk), d(nkk,nkk), b(nkk,nkk), h(nkk,nkk), tmp(nkk,nkk) ) atmp = zero; d = zero; b = zero; h = zero; tmp = zero - call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3), lbnd(3), delta(3), dfl(3) ) + call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3)-offset(5)-offset(6), lbnd(3), delta(3), dfl(3) ) call set_hmatrix ( h, bb(5:6) ) @@ -484,7 +538,7 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & call CCTK_WARN(0, 'Internal error. Bounding box inconsistent with grid' ) end if - center = gsh(3) / 2 + center = (gsh(3)-offset(5)-offset(6)) / 2 kr = center + max(gsize(3),3) call set_dmatrix_half ( d(1:kr,1:kr), 1 ) @@ -500,19 +554,19 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & kl = center + 1 - max(gsize(3),3) d = zero - call set_dmatrix_half ( d(kl:nk,kl:nk), 2 ) - tmp(kl:nk,kl:nk) = -transpose ( & - matmul ( h(kl:nk,kl:nk), & + call set_dmatrix_half ( d(kl:nkk,kl:nkk), 2 ) + tmp(kl:nkk,kl:nkk) = -transpose ( & + matmul ( h(kl:nkk,kl:nkk), & matmul ( & - transpose ( d(kl:nk,kl:nk) ), & - matmul ( b(kl:nk,kl:nk), & - d(kl:nk,kl:nk) ) ) ) ) + transpose ( d(kl:nkk,kl:nkk) ), & + matmul ( b(kl:nkk,kl:nkk), & + d(kl:nkk,kl:nkk) ) ) ) ) - atmp(kl:nk,center+1:nk) = tmp(kl:nk,center+1:nk) + atmp(kl:nkk,center+1:nkk) = tmp(kl:nkk,center+1:nkk) end if - allocate ( zcoeff(patch)%coeff(nk,nk) ) + allocate ( zcoeff(patch)%coeff(nkk,nkk) ) zcoeff(patch)%coeff = atmp @@ -535,48 +589,49 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & kl = 1 + gsize(3) else - - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) + & - a(7,2) * var(:,:,7) + a(8,2) * var(:,:,8) + & - a(9,2) * var(:,:,9) + a(10,2) * var(:,:,10) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) + a(8,3) * var(:,:,8) + & - a(9,3) * var(:,:,9) + a(10,3) * var(:,:,10) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) + & - a(9,4) * var(:,:,9) + a(10,4) * var(:,:,10) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) + & - a(9,5) * var(:,:,9) + a(10,5) * var(:,:,10) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(1,6) * var(:,:,1) + a(2,6) * var(:,:,2) + & - a(3,6) * var(:,:,3) + a(4,6) * var(:,:,4) + & - a(5,6) * var(:,:,5) + a(6,6) * var(:,:,6) + & - a(7,6) * var(:,:,7) + a(8,6) * var(:,:,8) + & - a(9,6) * var(:,:,9) + a(10,6) * var(:,:,10) ) * idel - rhs(:,:,7) = rhs(:,:,7) + & - ( a(1,7) * var(:,:,1) + a(2,7) * var(:,:,2) + & - a(3,7) * var(:,:,3) + a(4,7) * var(:,:,4) + & - a(5,7) * var(:,:,5) + a(6,7) * var(:,:,6) + & - a(7,7) * var(:,:,7) + a(8,7) * var(:,:,8) + & - a(9,7) * var(:,:,9) + a(10,7) * var(:,:,10) ) * idel - - kl = 8 + ol = offset(5) + + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) + & + a(7,2) * var(:,:,7+ol) + a(8,2) * var(:,:,8+ol) + & + a(9,2) * var(:,:,9+ol) + a(10,2) * var(:,:,10+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) + a(8,3) * var(:,:,8+ol) + & + a(9,3) * var(:,:,9+ol) + a(10,3) * var(:,:,10+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) + & + a(9,4) * var(:,:,9+ol) + a(10,4) * var(:,:,10+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) + & + a(9,5) * var(:,:,9+ol) + a(10,5) * var(:,:,10+ol) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(1,6) * var(:,:,1+ol) + a(2,6) * var(:,:,2+ol) + & + a(3,6) * var(:,:,3+ol) + a(4,6) * var(:,:,4+ol) + & + a(5,6) * var(:,:,5+ol) + a(6,6) * var(:,:,6+ol) + & + a(7,6) * var(:,:,7+ol) + a(8,6) * var(:,:,8+ol) + & + a(9,6) * var(:,:,9+ol) + a(10,6) * var(:,:,10+ol) ) * idel + rhs(:,:,7+ol) = rhs(:,:,7+ol) + & + ( a(1,7) * var(:,:,1+ol) + a(2,7) * var(:,:,2+ol) + & + a(3,7) * var(:,:,3+ol) + a(4,7) * var(:,:,4+ol) + & + a(5,7) * var(:,:,5+ol) + a(6,7) * var(:,:,6+ol) + & + a(7,7) * var(:,:,7+ol) + a(8,7) * var(:,:,8+ol) + & + a(9,7) * var(:,:,9+ol) + a(10,7) * var(:,:,10+ol) ) * idel + + kl = 8 + ol end if @@ -585,86 +640,98 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & kr = nk - gsize(3) else - - rhs(:,:,nk-6) = rhs(:,:,nk-6) + & - ( a(nk-9,nk-6) * var(:,:,nk-9) + & - a(nk-8,nk-6) * var(:,:,nk-8) + & - a(nk-7,nk-6) * var(:,:,nk-7) + & - a(nk-6,nk-6) * var(:,:,nk-6) + & - a(nk-5,nk-6) * var(:,:,nk-5) + & - a(nk-4,nk-6) * var(:,:,nk-4) + & - a(nk-3,nk-6) * var(:,:,nk-3) + & - a(nk-2,nk-6) * var(:,:,nk-2) + & - a(nk-1,nk-6) * var(:,:,nk-1) + & - a(nk,nk-6) * var(:,:,nk) ) * idel - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(nk-9,nk-5) * var(:,:,nk-9) + & - a(nk-8,nk-5) * var(:,:,nk-8) + & - a(nk-7,nk-5) * var(:,:,nk-7) + & - a(nk-6,nk-5) * var(:,:,nk-6) + & - a(nk-5,nk-5) * var(:,:,nk-5) + & - a(nk-4,nk-5) * var(:,:,nk-4) + & - a(nk-3,nk-5) * var(:,:,nk-3) + & - a(nk-2,nk-5) * var(:,:,nk-2) + & - a(nk-1,nk-5) * var(:,:,nk-1) + & - a(nk,nk-5) * var(:,:,nk) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(nk-9,nk-4) * var(:,:,nk-9) + & - a(nk-8,nk-4) * var(:,:,nk-8) + & - a(nk-7,nk-4) * var(:,:,nk-7) + & - a(nk-6,nk-4) * var(:,:,nk-6) + & - a(nk-5,nk-4) * var(:,:,nk-5) + & - a(nk-4,nk-4) * var(:,:,nk-4) + & - a(nk-3,nk-4) * var(:,:,nk-3) + & - a(nk-2,nk-4) * var(:,:,nk-2) + & - a(nk-1,nk-4) * var(:,:,nk-1) + & - a(nk,nk-4) * var(:,:,nk) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(nk-9,nk-3) * var(:,:,nk-9) + & - a(nk-8,nk-3) * var(:,:,nk-8) + & - a(nk-7,nk-3) * var(:,:,nk-7) + & - a(nk-6,nk-3) * var(:,:,nk-6) + & - a(nk-5,nk-3) * var(:,:,nk-5) + & - a(nk-4,nk-3) * var(:,:,nk-4) + & - a(nk-3,nk-3) * var(:,:,nk-3) + & - a(nk-2,nk-3) * var(:,:,nk-2) + & - a(nk-1,nk-3) * var(:,:,nk-1) + & - a(nk,nk-3) * var(:,:,nk) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(nk-9,nk-2) * var(:,:,nk-9) + & - a(nk-8,nk-2) * var(:,:,nk-8) + & - a(nk-7,nk-2) * var(:,:,nk-7) + & - a(nk-6,nk-2) * var(:,:,nk-6) + & - a(nk-5,nk-2) * var(:,:,nk-5) + & - a(nk-4,nk-2) * var(:,:,nk-4) + & - a(nk-3,nk-2) * var(:,:,nk-3) + & - a(nk-2,nk-2) * var(:,:,nk-2) + & - a(nk-1,nk-2) * var(:,:,nk-1) + & - a(nk,nk-2) * var(:,:,nk) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(nk-9,nk-1) * var(:,:,nk-9) + & - a(nk-8,nk-1) * var(:,:,nk-8) + & - a(nk-7,nk-1) * var(:,:,nk-7) + & - a(nk-6,nk-1) * var(:,:,nk-6) + & - a(nk-5,nk-1) * var(:,:,nk-5) + & - a(nk-4,nk-1) * var(:,:,nk-4) + & - a(nk-3,nk-1) * var(:,:,nk-3) + & - a(nk-2,nk-1) * var(:,:,nk-2) + & - a(nk-1,nk-1) * var(:,:,nk-1) + & - a(nk,nk-1) * var(:,:,nk) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(nk-3,nk) * var(:,:,nk-3) + & - a(nk-2,nk) * var(:,:,nk-2) + & - a(nk-1,nk) * var(:,:,nk-1) + & - a(nk,nk) * var(:,:,nk) ) * idel - - kr = nk - 7 + or = nk - offset(6) + + rhs(:,:,or-6) = rhs(:,:,or-6) + & + ( a(nkk-9,nkk-6) * var(:,:,or-9) + & + a(nkk-8,nkk-6) * var(:,:,or-8) + & + a(nkk-7,nkk-6) * var(:,:,or-7) + & + a(nkk-6,nkk-6) * var(:,:,or-6) + & + a(nkk-5,nkk-6) * var(:,:,or-5) + & + a(nkk-4,nkk-6) * var(:,:,or-4) + & + a(nkk-3,nkk-6) * var(:,:,or-3) + & + a(nkk-2,nkk-6) * var(:,:,or-2) + & + a(nkk-1,nkk-6) * var(:,:,or-1) + & + a(nkk,nkk-6) * var(:,:,or) ) * idel + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(nkk-9,nkk-5) * var(:,:,or-9) + & + a(nkk-8,nkk-5) * var(:,:,or-8) + & + a(nkk-7,nkk-5) * var(:,:,or-7) + & + a(nkk-6,nkk-5) * var(:,:,or-6) + & + a(nkk-5,nkk-5) * var(:,:,or-5) + & + a(nkk-4,nkk-5) * var(:,:,or-4) + & + a(nkk-3,nkk-5) * var(:,:,or-3) + & + a(nkk-2,nkk-5) * var(:,:,or-2) + & + a(nkk-1,nkk-5) * var(:,:,or-1) + & + a(nkk,nkk-5) * var(:,:,or) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(nkk-9,nkk-4) * var(:,:,or-9) + & + a(nkk-8,nkk-4) * var(:,:,or-8) + & + a(nkk-7,nkk-4) * var(:,:,or-7) + & + a(nkk-6,nkk-4) * var(:,:,or-6) + & + a(nkk-5,nkk-4) * var(:,:,or-5) + & + a(nkk-4,nkk-4) * var(:,:,or-4) + & + a(nkk-3,nkk-4) * var(:,:,or-3) + & + a(nkk-2,nkk-4) * var(:,:,or-2) + & + a(nkk-1,nkk-4) * var(:,:,or-1) + & + a(nkk,nkk-4) * var(:,:,or) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(nkk-9,nkk-3) * var(:,:,or-9) + & + a(nkk-8,nkk-3) * var(:,:,or-8) + & + a(nkk-7,nkk-3) * var(:,:,or-7) + & + a(nkk-6,nkk-3) * var(:,:,or-6) + & + a(nkk-5,nkk-3) * var(:,:,or-5) + & + a(nkk-4,nkk-3) * var(:,:,or-4) + & + a(nkk-3,nkk-3) * var(:,:,or-3) + & + a(nkk-2,nkk-3) * var(:,:,or-2) + & + a(nkk-1,nkk-3) * var(:,:,or-1) + & + a(nkk,nkk-3) * var(:,:,or) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(nkk-9,nkk-2) * var(:,:,or-9) + & + a(nkk-8,nkk-2) * var(:,:,or-8) + & + a(nkk-7,nkk-2) * var(:,:,or-7) + & + a(nkk-6,nkk-2) * var(:,:,or-6) + & + a(nkk-5,nkk-2) * var(:,:,or-5) + & + a(nkk-4,nkk-2) * var(:,:,or-4) + & + a(nkk-3,nkk-2) * var(:,:,or-3) + & + a(nkk-2,nkk-2) * var(:,:,or-2) + & + a(nkk-1,nkk-2) * var(:,:,or-1) + & + a(nkk,nkk-2) * var(:,:,or) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(nkk-9,nkk-1) * var(:,:,or-9) + & + a(nkk-8,nkk-1) * var(:,:,or-8) + & + a(nkk-7,nkk-1) * var(:,:,or-7) + & + a(nkk-6,nkk-1) * var(:,:,or-6) + & + a(nkk-5,nkk-1) * var(:,:,or-5) + & + a(nkk-4,nkk-1) * var(:,:,or-4) + & + a(nkk-3,nkk-1) * var(:,:,or-3) + & + a(nkk-2,nkk-1) * var(:,:,or-2) + & + a(nkk-1,nkk-1) * var(:,:,or-1) + & + a(nkk,nkk-1) * var(:,:,or) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(nkk-3,nkk) * var(:,:,or-3) + & + a(nkk-2,nkk) * var(:,:,or-2) + & + a(nkk-1,nkk) * var(:,:,or-1) + & + a(nkk,nkk) * var(:,:,or) ) * idel + + kr = or - 7 end if - do k = kl, kr - - rhs(:,:,k) = rhs(:,:,k) + & + if ( bb(5) /= 0 ) then + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & + ( a(k-ol-3,k-ol) * var(:,:,k-3) + & + a(k-ol-2,k-ol) * var(:,:,k-2) + & + a(k-ol-1,k-ol) * var(:,:,k-1) + & + a(k-ol,k-ol) * var(:,:,k) + & + a(k-ol+1,k-ol) * var(:,:,k+1) + & + a(k-ol+2,k-ol) * var(:,:,k+2) + & + a(k-ol+3,k-ol) * var(:,:,k+3) ) * idel + end do + else + do k = kl, kr + rhs(:,:,k) = rhs(:,:,k) + & ( a(k-3,k) * var(:,:,k-3) + & a(k-2,k) * var(:,:,k-2) + & a(k-1,k) * var(:,:,k-1) + & @@ -672,8 +739,8 @@ subroutine dissipation_6_5_opt (var, lsh, gsh, lbnd, bb, gsize, & a(k+1,k) * var(:,:,k+1) + & a(k+2,k) * var(:,:,k+2) + & a(k+3,k) * var(:,:,k+3) ) * idel - - end do + end do + endif end if diff --git a/src/Dissipation_6_5_min_err_coeff_alt.F90 b/src/Dissipation_6_5_min_err_coeff_alt.F90 index fa99633..53b5e39 100644 --- a/src/Dissipation_6_5_min_err_coeff_alt.F90 +++ b/src/Dissipation_6_5_min_err_coeff_alt.F90 @@ -5,7 +5,7 @@ #include "cctk_Functions.h" -subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & +subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, offset, & delta, epsilon, dfl, npatches, patch, rhs) use dissipation_coeff @@ -21,6 +21,7 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(lsh(1),lsh(2),lsh(3)), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon CCTK_REAL, dimension(3), intent(in) :: dfl @@ -33,7 +34,8 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & CCTK_REAL, dimension(:,:), pointer :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or + CCTK_INT :: nii, njj, nkk ni = lsh(1); nj = lsh(2); nk = lsh(3) @@ -45,10 +47,17 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & end if if ( .not. savedx(patch) ) then - allocate ( atmp(ni,ni), d(ni,ni), b(ni,ni), h(ni,ni) ) + nii = ni + if ( bb(1) /= 0 ) then + nii = nii - offset(1) + endif + if ( bb(2) /= 0 ) then + nii = nii - offset(2) + endif + allocate ( atmp(nii,nii), d(nii,nii), b(nii,nii), h(nii,nii) ) atmp = zero; d = zero; b = zero; h = zero - call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1), lbnd(1), delta(1), dfl(1) ) + call set_bmatrix ( b, bb(1:2), lsh(1), gsh(1)-offset(1)-offset(2), lbnd(1), delta(1), dfl(1) ) call set_hmatrix ( h, bb(1:2) ) @@ -56,7 +65,7 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( xcoeff(patch)%coeff(ni,ni) ) + allocate ( xcoeff(patch)%coeff(nii,nii) ) xcoeff(patch)%coeff = atmp @@ -75,55 +84,56 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & il = 1 + gsize(1) else - - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) + & - a(5,1) * var(5,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) + & - a(7,2) * var(7,:,:) + a(8,2) * var(8,:,:) + & - a(9,2) * var(9,:,:) + a(10,2) * var(10,:,:) + & - a(11,2) * var(11,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) + a(8,3) * var(8,:,:) + & - a(9,3) * var(9,:,:) + a(10,3) * var(10,:,:) + & - a(11,3) * var(11,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) + & - a(9,4) * var(9,:,:) + a(10,4) * var(10,:,:) + & - a(11,4) * var(11,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) + & - a(9,5) * var(9,:,:) + a(10,5) * var(10,:,:) + & - a(11,5) * var(11,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(1,6) * var(1,:,:) + a(2,6) * var(2,:,:) + & - a(3,6) * var(3,:,:) + a(4,6) * var(4,:,:) + & - a(5,6) * var(5,:,:) + a(6,6) * var(6,:,:) + & - a(7,6) * var(7,:,:) + a(8,6) * var(8,:,:) + & - a(9,6) * var(9,:,:) + a(10,6) * var(10,:,:) + & - a(11,6) * var(11,:,:) ) * idel - rhs(7,:,:) = rhs(7,:,:) + & - ( a(1,7) * var(1,:,:) + a(2,7) * var(2,:,:) + & - a(3,7) * var(3,:,:) + a(4,7) * var(4,:,:) + & - a(5,7) * var(5,:,:) + a(6,7) * var(6,:,:) + & - a(7,7) * var(7,:,:) + a(8,7) * var(8,:,:) + & - a(9,7) * var(9,:,:) + a(10,7) * var(10,:,:) + & - a(11,7) * var(11,:,:) ) * idel - - il = 8 + ol = offset(1) + + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) + & + a(5,1) * var(5+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) + & + a(7,2) * var(7+ol,:,:) + a(8,2) * var(8+ol,:,:) + & + a(9,2) * var(9+ol,:,:) + a(10,2) * var(10+ol,:,:) + & + a(11,2) * var(11+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) + a(8,3) * var(8+ol,:,:) + & + a(9,3) * var(9+ol,:,:) + a(10,3) * var(10+ol,:,:) + & + a(11,3) * var(11+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) + & + a(9,4) * var(9+ol,:,:) + a(10,4) * var(10+ol,:,:) + & + a(11,4) * var(11+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) + & + a(9,5) * var(9+ol,:,:) + a(10,5) * var(10+ol,:,:) + & + a(11,5) * var(11+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(1,6) * var(1+ol,:,:) + a(2,6) * var(2+ol,:,:) + & + a(3,6) * var(3+ol,:,:) + a(4,6) * var(4+ol,:,:) + & + a(5,6) * var(5+ol,:,:) + a(6,6) * var(6+ol,:,:) + & + a(7,6) * var(7+ol,:,:) + a(8,6) * var(8+ol,:,:) + & + a(9,6) * var(9+ol,:,:) + a(10,6) * var(10+ol,:,:) + & + a(11,6) * var(11+ol,:,:) ) * idel + rhs(7+ol,:,:) = rhs(7+ol,:,:) + & + ( a(1,7) * var(1+ol,:,:) + a(2,7) * var(2+ol,:,:) + & + a(3,7) * var(3+ol,:,:) + a(4,7) * var(4+ol,:,:) + & + a(5,7) * var(5+ol,:,:) + a(6,7) * var(6+ol,:,:) + & + a(7,7) * var(7+ol,:,:) + a(8,7) * var(8+ol,:,:) + & + a(9,7) * var(9+ol,:,:) + a(10,7) * var(10+ol,:,:) + & + a(11,7) * var(11+ol,:,:) ) * idel + + il = 8 + ol end if @@ -132,111 +142,137 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & ir = ni - gsize(1) else - - rhs(ni-6,:,:) = rhs(ni-6,:,:) + & - ( a(ni-10,ni-6) * var(ni-10,:,:) + & - a(ni-9,ni-6) * var(ni-9,:,:) + & - a(ni-8,ni-6) * var(ni-8,:,:) + & - a(ni-7,ni-6) * var(ni-7,:,:) + & - a(ni-6,ni-6) * var(ni-6,:,:) + & - a(ni-5,ni-6) * var(ni-5,:,:) + & - a(ni-4,ni-6) * var(ni-4,:,:) + & - a(ni-3,ni-6) * var(ni-3,:,:) + & - a(ni-2,ni-6) * var(ni-2,:,:) + & - a(ni-1,ni-6) * var(ni-1,:,:) + & - a(ni,ni-6) * var(ni,:,:) ) * idel - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(ni-10,ni-5) * var(ni-10,:,:) + & - a(ni-9,ni-5) * var(ni-9,:,:) + & - a(ni-8,ni-5) * var(ni-8,:,:) + & - a(ni-7,ni-5) * var(ni-7,:,:) + & - a(ni-6,ni-5) * var(ni-6,:,:) + & - a(ni-5,ni-5) * var(ni-5,:,:) + & - a(ni-4,ni-5) * var(ni-4,:,:) + & - a(ni-3,ni-5) * var(ni-3,:,:) + & - a(ni-2,ni-5) * var(ni-2,:,:) + & - a(ni-1,ni-5) * var(ni-1,:,:) + & - a(ni,ni-5) * var(ni,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(ni-10,ni-4) * var(ni-10,:,:) + & - a(ni-9,ni-4) * var(ni-9,:,:) + & - a(ni-8,ni-4) * var(ni-8,:,:) + & - a(ni-7,ni-4) * var(ni-7,:,:) + & - a(ni-6,ni-4) * var(ni-6,:,:) + & - a(ni-5,ni-4) * var(ni-5,:,:) + & - a(ni-4,ni-4) * var(ni-4,:,:) + & - a(ni-3,ni-4) * var(ni-3,:,:) + & - a(ni-2,ni-4) * var(ni-2,:,:) + & - a(ni-1,ni-4) * var(ni-1,:,:) + & - a(ni,ni-4) * var(ni,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(ni-10,ni-3) * var(ni-10,:,:) + & - a(ni-9,ni-3) * var(ni-9,:,:) + & - a(ni-8,ni-3) * var(ni-8,:,:) + & - a(ni-7,ni-3) * var(ni-7,:,:) + & - a(ni-6,ni-3) * var(ni-6,:,:) + & - a(ni-5,ni-3) * var(ni-5,:,:) + & - a(ni-4,ni-3) * var(ni-4,:,:) + & - a(ni-3,ni-3) * var(ni-3,:,:) + & - a(ni-2,ni-3) * var(ni-2,:,:) + & - a(ni-1,ni-3) * var(ni-1,:,:) + & - a(ni,ni-3) * var(ni,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(ni-10,ni-2) * var(ni-10,:,:) + & - a(ni-9,ni-2) * var(ni-9,:,:) + & - a(ni-8,ni-2) * var(ni-8,:,:) + & - a(ni-7,ni-2) * var(ni-7,:,:) + & - a(ni-6,ni-2) * var(ni-6,:,:) + & - a(ni-5,ni-2) * var(ni-5,:,:) + & - a(ni-4,ni-2) * var(ni-4,:,:) + & - a(ni-3,ni-2) * var(ni-3,:,:) + & - a(ni-2,ni-2) * var(ni-2,:,:) + & - a(ni-1,ni-2) * var(ni-1,:,:) + & - a(ni,ni-2) * var(ni,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(ni-10,ni-1) * var(ni-10,:,:) + & - a(ni-9,ni-1) * var(ni-9,:,:) + & - a(ni-8,ni-1) * var(ni-8,:,:) + & - a(ni-7,ni-1) * var(ni-7,:,:) + & - a(ni-6,ni-1) * var(ni-6,:,:) + & - a(ni-5,ni-1) * var(ni-5,:,:) + & - a(ni-4,ni-1) * var(ni-4,:,:) + & - a(ni-3,ni-1) * var(ni-3,:,:) + & - a(ni-2,ni-1) * var(ni-2,:,:) + & - a(ni-1,ni-1) * var(ni-1,:,:) + & - a(ni,ni-1) * var(ni,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(ni-4,ni) * var(ni-4,:,:) + & - a(ni-3,ni) * var(ni-3,:,:) + & - a(ni-2,ni) * var(ni-2,:,:) + & - a(ni-1,ni) * var(ni-1,:,:) + & - a(ni,ni) * var(ni,:,:) ) * idel - - ir = ni - 7 + or = ni - offset(2) + + rhs(or-6,:,:) = rhs(or-6,:,:) + & + ( a(nii-10,nii-6) * var(or-10,:,:) + & + a(nii-9,nii-6) * var(or-9,:,:) + & + a(nii-8,nii-6) * var(or-8,:,:) + & + a(nii-7,nii-6) * var(or-7,:,:) + & + a(nii-6,nii-6) * var(or-6,:,:) + & + a(nii-5,nii-6) * var(or-5,:,:) + & + a(nii-4,nii-6) * var(or-4,:,:) + & + a(nii-3,nii-6) * var(or-3,:,:) + & + a(nii-2,nii-6) * var(or-2,:,:) + & + a(nii-1,nii-6) * var(or-1,:,:) + & + a(nii,nii-6) * var(or,:,:) ) * idel + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(nii-10,nii-5) * var(or-10,:,:) + & + a(nii-9,nii-5) * var(or-9,:,:) + & + a(nii-8,nii-5) * var(or-8,:,:) + & + a(nii-7,nii-5) * var(or-7,:,:) + & + a(nii-6,nii-5) * var(or-6,:,:) + & + a(nii-5,nii-5) * var(or-5,:,:) + & + a(nii-4,nii-5) * var(or-4,:,:) + & + a(nii-3,nii-5) * var(or-3,:,:) + & + a(nii-2,nii-5) * var(or-2,:,:) + & + a(nii-1,nii-5) * var(or-1,:,:) + & + a(nii,nii-5) * var(or,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(nii-10,nii-4) * var(or-10,:,:) + & + a(nii-9,nii-4) * var(or-9,:,:) + & + a(nii-8,nii-4) * var(or-8,:,:) + & + a(nii-7,nii-4) * var(or-7,:,:) + & + a(nii-6,nii-4) * var(or-6,:,:) + & + a(nii-5,nii-4) * var(or-5,:,:) + & + a(nii-4,nii-4) * var(or-4,:,:) + & + a(nii-3,nii-4) * var(or-3,:,:) + & + a(nii-2,nii-4) * var(or-2,:,:) + & + a(nii-1,nii-4) * var(or-1,:,:) + & + a(nii,nii-4) * var(or,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(nii-10,nii-3) * var(or-10,:,:) + & + a(nii-9,nii-3) * var(or-9,:,:) + & + a(nii-8,nii-3) * var(or-8,:,:) + & + a(nii-7,nii-3) * var(or-7,:,:) + & + a(nii-6,nii-3) * var(or-6,:,:) + & + a(nii-5,nii-3) * var(or-5,:,:) + & + a(nii-4,nii-3) * var(or-4,:,:) + & + a(nii-3,nii-3) * var(or-3,:,:) + & + a(nii-2,nii-3) * var(or-2,:,:) + & + a(nii-1,nii-3) * var(or-1,:,:) + & + a(nii,nii-3) * var(or,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(nii-10,nii-2) * var(or-10,:,:) + & + a(nii-9,nii-2) * var(or-9,:,:) + & + a(nii-8,nii-2) * var(or-8,:,:) + & + a(nii-7,nii-2) * var(or-7,:,:) + & + a(nii-6,nii-2) * var(or-6,:,:) + & + a(nii-5,nii-2) * var(or-5,:,:) + & + a(nii-4,nii-2) * var(or-4,:,:) + & + a(nii-3,nii-2) * var(or-3,:,:) + & + a(nii-2,nii-2) * var(or-2,:,:) + & + a(nii-1,nii-2) * var(or-1,:,:) + & + a(nii,nii-2) * var(or,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(nii-10,nii-1) * var(or-10,:,:) + & + a(nii-9,nii-1) * var(or-9,:,:) + & + a(nii-8,nii-1) * var(or-8,:,:) + & + a(nii-7,nii-1) * var(or-7,:,:) + & + a(nii-6,nii-1) * var(or-6,:,:) + & + a(nii-5,nii-1) * var(or-5,:,:) + & + a(nii-4,nii-1) * var(or-4,:,:) + & + a(nii-3,nii-1) * var(or-3,:,:) + & + a(nii-2,nii-1) * var(or-2,:,:) + & + a(nii-1,nii-1) * var(or-1,:,:) + & + a(nii,nii-1) * var(or,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(nii-4,nii) * var(or-4,:,:) + & + a(nii-3,nii) * var(or-3,:,:) + & + a(nii-2,nii) * var(or-2,:,:) + & + a(nii-1,nii) * var(or-1,:,:) + & + a(nii,nii) * var(or,:,:) ) * idel + + ir = or - 7 end if - do i = il, ir + if ( bb(1) /= 0 ) then + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-ol-4,i-ol) * var(i-4,:,:) + & + a(i-ol-3,i-ol) * var(i-3,:,:) + & + a(i-ol-2,i-ol) * var(i-2,:,:) + & + a(i-ol-1,i-ol) * var(i-1,:,:) + & + a(i-ol,i-ol) * var(i,:,:) + & + a(i-ol+1,i-ol) * var(i+1,:,:) + & + a(i-ol+2,i-ol) * var(i+2,:,:) + & + a(i-ol+3,i-ol) * var(i+3,:,:) + & + a(i-ol+4,i-ol) * var(i+4,:,:) ) * idel + end do + + else - rhs(i,:,:) = rhs(i,:,:) + & - ( a(i-4,i) * var(i-4,:,:) + & - a(i-3,i) * var(i-3,:,:) + & - a(i-2,i) * var(i-2,:,:) + & - a(i-1,i) * var(i-1,:,:) + & - a(i,i) * var(i,:,:) + & - a(i+1,i) * var(i+1,:,:) + & - a(i+2,i) * var(i+2,:,:) + & - a(i+3,i) * var(i+3,:,:) + & - a(i+4,i) * var(i+4,:,:) ) * idel + do i = il, ir + rhs(i,:,:) = rhs(i,:,:) + & + ( a(i-4,i) * var(i-4,:,:) + & + a(i-3,i) * var(i-3,:,:) + & + a(i-2,i) * var(i-2,:,:) + & + a(i-1,i) * var(i-1,:,:) + & + a(i,i) * var(i,:,:) + & + a(i+1,i) * var(i+1,:,:) + & + a(i+2,i) * var(i+2,:,:) + & + a(i+3,i) * var(i+3,:,:) + & + a(i+4,i) * var(i+4,:,:) ) * idel + end do + + end if ! bb(1) /= 0 - end do if ( zero_derivs_y == 0 ) then if ( .not. savedy(patch) ) then - allocate ( atmp(nj,nj), d(nj,nj), b(nj,nj), h(nj,nj) ) + njj = nj + if ( bb(3) /= 0 ) then + njj = njj - offset(3) + endif + if ( bb(4) /= 0 ) then + njj = njj - offset(4) + endif + + allocate ( atmp(njj,njj), d(njj,njj), b(njj,njj), h(njj,njj) ) atmp = zero; d = zero; b = zero; h = zero - call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2), lbnd(2), delta(2), dfl(2) ) + call set_bmatrix ( b, bb(3:4), lsh(2), gsh(2)-offset(3)-offset(4), lbnd(2), delta(2), dfl(2) ) call set_hmatrix ( h, bb(3:4) ) @@ -244,7 +280,7 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( ycoeff(patch)%coeff(nj,nj) ) + allocate ( ycoeff(patch)%coeff(njj,njj) ) ycoeff(patch)%coeff = atmp @@ -263,55 +299,56 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & jl = 1 + gsize(2) else - - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) + & - a(5,1) * var(:,5,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) + & - a(7,2) * var(:,7,:) + a(8,2) * var(:,8,:) + & - a(9,2) * var(:,9,:) + a(10,2) * var(:,10,:) + & - a(11,2) * var(:,11,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) + a(8,3) * var(:,8,:) + & - a(9,3) * var(:,9,:) + a(10,3) * var(:,10,:) + & - a(11,3) * var(:,11,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) + & - a(9,4) * var(:,9,:) + a(10,4) * var(:,10,:) + & - a(11,4) * var(:,11,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) + & - a(9,5) * var(:,9,:) + a(10,5) * var(:,10,:) + & - a(11,5) * var(:,11,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(1,6) * var(:,1,:) + a(2,6) * var(:,2,:) + & - a(3,6) * var(:,3,:) + a(4,6) * var(:,4,:) + & - a(5,6) * var(:,5,:) + a(6,6) * var(:,6,:) + & - a(7,6) * var(:,7,:) + a(8,6) * var(:,8,:) + & - a(9,6) * var(:,9,:) + a(10,6) * var(:,10,:) + & - a(11,6) * var(:,11,:) ) * idel - rhs(:,7,:) = rhs(:,7,:) + & - ( a(1,7) * var(:,1,:) + a(2,7) * var(:,2,:) + & - a(3,7) * var(:,3,:) + a(4,7) * var(:,4,:) + & - a(5,7) * var(:,5,:) + a(6,7) * var(:,6,:) + & - a(7,7) * var(:,7,:) + a(8,7) * var(:,8,:) + & - a(9,7) * var(:,9,:) + a(10,7) * var(:,10,:) + & - a(11,7) * var(:,11,:) ) * idel - - jl = 8 + ol = offset(3) + + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) + & + a(5,1) * var(:,5+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) + & + a(7,2) * var(:,7+ol,:) + a(8,2) * var(:,8+ol,:) + & + a(9,2) * var(:,9+ol,:) + a(10,2) * var(:,10+ol,:) + & + a(11,2) * var(:,11+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) + a(8,3) * var(:,8+ol,:) + & + a(9,3) * var(:,9+ol,:) + a(10,3) * var(:,10+ol,:) + & + a(11,3) * var(:,11+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) + & + a(9,4) * var(:,9+ol,:) + a(10,4) * var(:,10+ol,:) + & + a(11,4) * var(:,11+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) + & + a(9,5) * var(:,9+ol,:) + a(10,5) * var(:,10+ol,:) + & + a(11,5) * var(:,11+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(1,6) * var(:,1+ol,:) + a(2,6) * var(:,2+ol,:) + & + a(3,6) * var(:,3+ol,:) + a(4,6) * var(:,4+ol,:) + & + a(5,6) * var(:,5+ol,:) + a(6,6) * var(:,6+ol,:) + & + a(7,6) * var(:,7+ol,:) + a(8,6) * var(:,8+ol,:) + & + a(9,6) * var(:,9+ol,:) + a(10,6) * var(:,10+ol,:) + & + a(11,6) * var(:,11+ol,:) ) * idel + rhs(:,7+ol,:) = rhs(:,7+ol,:) + & + ( a(1,7) * var(:,1+ol,:) + a(2,7) * var(:,2+ol,:) + & + a(3,7) * var(:,3+ol,:) + a(4,7) * var(:,4+ol,:) + & + a(5,7) * var(:,5+ol,:) + a(6,7) * var(:,6+ol,:) + & + a(7,7) * var(:,7+ol,:) + a(8,7) * var(:,8+ol,:) + & + a(9,7) * var(:,9+ol,:) + a(10,7) * var(:,10+ol,:) + & + a(11,7) * var(:,11+ol,:) ) * idel + + jl = 8 + ol end if @@ -320,102 +357,103 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & jr = nj - gsize(2) else - - rhs(:,nj-6,:) = rhs(:,nj-6,:) + & - ( a(nj-10,nj-6) * var(:,nj-10,:) + & - a(nj-9,nj-6) * var(:,nj-9,:) + & - a(nj-8,nj-6) * var(:,nj-8,:) + & - a(nj-7,nj-6) * var(:,nj-7,:) + & - a(nj-6,nj-6) * var(:,nj-6,:) + & - a(nj-5,nj-6) * var(:,nj-5,:) + & - a(nj-4,nj-6) * var(:,nj-4,:) + & - a(nj-3,nj-6) * var(:,nj-3,:) + & - a(nj-2,nj-6) * var(:,nj-2,:) + & - a(nj-1,nj-6) * var(:,nj-1,:) + & - a(nj,nj-6) * var(:,nj,:) ) * idel - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(nj-10,nj-5) * var(:,nj-10,:) + & - a(nj-9,nj-5) * var(:,nj-9,:) + & - a(nj-8,nj-5) * var(:,nj-8,:) + & - a(nj-7,nj-5) * var(:,nj-7,:) + & - a(nj-6,nj-5) * var(:,nj-6,:) + & - a(nj-5,nj-5) * var(:,nj-5,:) + & - a(nj-4,nj-5) * var(:,nj-4,:) + & - a(nj-3,nj-5) * var(:,nj-3,:) + & - a(nj-2,nj-5) * var(:,nj-2,:) + & - a(nj-1,nj-5) * var(:,nj-1,:) + & - a(nj,nj-5) * var(:,nj,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(nj-10,nj-4) * var(:,nj-10,:) + & - a(nj-9,nj-4) * var(:,nj-9,:) + & - a(nj-8,nj-4) * var(:,nj-8,:) + & - a(nj-7,nj-4) * var(:,nj-7,:) + & - a(nj-6,nj-4) * var(:,nj-6,:) + & - a(nj-5,nj-4) * var(:,nj-5,:) + & - a(nj-4,nj-4) * var(:,nj-4,:) + & - a(nj-3,nj-4) * var(:,nj-3,:) + & - a(nj-2,nj-4) * var(:,nj-2,:) + & - a(nj-1,nj-4) * var(:,nj-1,:) + & - a(nj,nj-4) * var(:,nj,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(nj-10,nj-3) * var(:,nj-10,:) + & - a(nj-9,nj-3) * var(:,nj-9,:) + & - a(nj-8,nj-3) * var(:,nj-8,:) + & - a(nj-7,nj-3) * var(:,nj-7,:) + & - a(nj-6,nj-3) * var(:,nj-6,:) + & - a(nj-5,nj-3) * var(:,nj-5,:) + & - a(nj-4,nj-3) * var(:,nj-4,:) + & - a(nj-3,nj-3) * var(:,nj-3,:) + & - a(nj-2,nj-3) * var(:,nj-2,:) + & - a(nj-1,nj-3) * var(:,nj-1,:) + & - a(nj,nj-3) * var(:,nj,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(nj-10,nj-2) * var(:,nj-10,:) + & - a(nj-9,nj-2) * var(:,nj-9,:) + & - a(nj-8,nj-2) * var(:,nj-8,:) + & - a(nj-7,nj-2) * var(:,nj-7,:) + & - a(nj-6,nj-2) * var(:,nj-6,:) + & - a(nj-5,nj-2) * var(:,nj-5,:) + & - a(nj-4,nj-2) * var(:,nj-4,:) + & - a(nj-3,nj-2) * var(:,nj-3,:) + & - a(nj-2,nj-2) * var(:,nj-2,:) + & - a(nj-1,nj-2) * var(:,nj-1,:) + & - a(nj,nj-2) * var(:,nj,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(nj-10,nj-1) * var(:,nj-10,:) + & - a(nj-9,nj-1) * var(:,nj-9,:) + & - a(nj-8,nj-1) * var(:,nj-8,:) + & - a(nj-7,nj-1) * var(:,nj-7,:) + & - a(nj-6,nj-1) * var(:,nj-6,:) + & - a(nj-5,nj-1) * var(:,nj-5,:) + & - a(nj-4,nj-1) * var(:,nj-4,:) + & - a(nj-3,nj-1) * var(:,nj-3,:) + & - a(nj-2,nj-1) * var(:,nj-2,:) + & - a(nj-1,nj-1) * var(:,nj-1,:) + & - a(nj,nj-1) * var(:,nj,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(nj-4,nj) * var(:,nj-4,:) + & - a(nj-3,nj) * var(:,nj-3,:) + & - a(nj-2,nj) * var(:,nj-2,:) + & - a(nj-1,nj) * var(:,nj-1,:) + & - a(nj,nj) * var(:,nj,:) ) * idel - - jr = nj - 7 + or = nj - offset(4) + + rhs(:,or-6,:) = rhs(:,or-6,:) + & + ( a(njj-10,njj-6) * var(:,or-10,:) + & + a(njj-9,njj-6) * var(:,or-9,:) + & + a(njj-8,njj-6) * var(:,or-8,:) + & + a(njj-7,njj-6) * var(:,or-7,:) + & + a(njj-6,njj-6) * var(:,or-6,:) + & + a(njj-5,njj-6) * var(:,or-5,:) + & + a(njj-4,njj-6) * var(:,or-4,:) + & + a(njj-3,njj-6) * var(:,or-3,:) + & + a(njj-2,njj-6) * var(:,or-2,:) + & + a(njj-1,njj-6) * var(:,or-1,:) + & + a(njj,njj-6) * var(:,or,:) ) * idel + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(njj-10,njj-5) * var(:,or-10,:) + & + a(njj-9,njj-5) * var(:,or-9,:) + & + a(njj-8,njj-5) * var(:,or-8,:) + & + a(njj-7,njj-5) * var(:,or-7,:) + & + a(njj-6,njj-5) * var(:,or-6,:) + & + a(njj-5,njj-5) * var(:,or-5,:) + & + a(njj-4,njj-5) * var(:,or-4,:) + & + a(njj-3,njj-5) * var(:,or-3,:) + & + a(njj-2,njj-5) * var(:,or-2,:) + & + a(njj-1,njj-5) * var(:,or-1,:) + & + a(njj,njj-5) * var(:,or,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(njj-10,njj-4) * var(:,or-10,:) + & + a(njj-9,njj-4) * var(:,or-9,:) + & + a(njj-8,njj-4) * var(:,or-8,:) + & + a(njj-7,njj-4) * var(:,or-7,:) + & + a(njj-6,njj-4) * var(:,or-6,:) + & + a(njj-5,njj-4) * var(:,or-5,:) + & + a(njj-4,njj-4) * var(:,or-4,:) + & + a(njj-3,njj-4) * var(:,or-3,:) + & + a(njj-2,njj-4) * var(:,or-2,:) + & + a(njj-1,njj-4) * var(:,or-1,:) + & + a(njj,njj-4) * var(:,or,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(njj-10,njj-3) * var(:,or-10,:) + & + a(njj-9,njj-3) * var(:,or-9,:) + & + a(njj-8,njj-3) * var(:,or-8,:) + & + a(njj-7,njj-3) * var(:,or-7,:) + & + a(njj-6,njj-3) * var(:,or-6,:) + & + a(njj-5,njj-3) * var(:,or-5,:) + & + a(njj-4,njj-3) * var(:,or-4,:) + & + a(njj-3,njj-3) * var(:,or-3,:) + & + a(njj-2,njj-3) * var(:,or-2,:) + & + a(njj-1,njj-3) * var(:,or-1,:) + & + a(njj,njj-3) * var(:,or,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(njj-10,njj-2) * var(:,or-10,:) + & + a(njj-9,njj-2) * var(:,or-9,:) + & + a(njj-8,njj-2) * var(:,or-8,:) + & + a(njj-7,njj-2) * var(:,or-7,:) + & + a(njj-6,njj-2) * var(:,or-6,:) + & + a(njj-5,njj-2) * var(:,or-5,:) + & + a(njj-4,njj-2) * var(:,or-4,:) + & + a(njj-3,njj-2) * var(:,or-3,:) + & + a(njj-2,njj-2) * var(:,or-2,:) + & + a(njj-1,njj-2) * var(:,or-1,:) + & + a(njj,njj-2) * var(:,or,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(njj-10,njj-1) * var(:,or-10,:) + & + a(njj-9,njj-1) * var(:,or-9,:) + & + a(njj-8,njj-1) * var(:,or-8,:) + & + a(njj-7,njj-1) * var(:,or-7,:) + & + a(njj-6,njj-1) * var(:,or-6,:) + & + a(njj-5,njj-1) * var(:,or-5,:) + & + a(njj-4,njj-1) * var(:,or-4,:) + & + a(njj-3,njj-1) * var(:,or-3,:) + & + a(njj-2,njj-1) * var(:,or-2,:) + & + a(njj-1,njj-1) * var(:,or-1,:) + & + a(njj,njj-1) * var(:,or,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(njj-4,njj) * var(:,or-4,:) + & + a(njj-3,njj) * var(:,or-3,:) + & + a(njj-2,njj) * var(:,or-2,:) + & + a(njj-1,njj) * var(:,or-1,:) + & + a(njj,njj) * var(:,or,:) ) * idel + + jr = or - 7 end if do j = jl, jr rhs(:,j,:) = rhs(:,j,:) + & - ( a(j-4,j) * var(:,j-4,:) + & - a(j-3,j) * var(:,j-3,:) + & - a(j-2,j) * var(:,j-2,:) + & - a(j-1,j) * var(:,j-1,:) + & - a(j,j) * var(:,j,:) + & - a(j+1,j) * var(:,j+1,:) + & - a(j+2,j) * var(:,j+2,:) + & - a(j+3,j) * var(:,j+3,:) + & - a(j+4,j) * var(:,j+4,:) ) * idel + ( a(j-ol-4,j-ol) * var(:,j-4,:) + & + a(j-ol-3,j-ol) * var(:,j-3,:) + & + a(j-ol-2,j-ol) * var(:,j-2,:) + & + a(j-ol-1,j-ol) * var(:,j-1,:) + & + a(j-ol,j-ol) * var(:,j,:) + & + a(j-ol+1,j-ol) * var(:,j+1,:) + & + a(j-ol+2,j-ol) * var(:,j+2,:) + & + a(j-ol+3,j-ol) * var(:,j+3,:) + & + a(j-ol+4,j-ol) * var(:,j+4,:) ) * idel end do @@ -423,10 +461,17 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & if ( zero_derivs_z == 0 ) then if ( .not. savedz(patch) ) then - allocate ( atmp(nk,nk), d(nk,nk), b(nk,nk), h(nk,nk) ) + nkk = nk + if ( bb(5) /= 0 ) then + nkk = nkk - offset(5) + endif + if ( bb(6) /= 0 ) then + nkk = nkk - offset(6) + endif + allocate ( atmp(nkk,nkk), d(nkk,nkk), b(nkk,nkk), h(nkk,nkk) ) atmp = zero; d = zero; b = zero; h = zero - call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3), lbnd(3), delta(3), dfl(3) ) + call set_bmatrix ( b, bb(5:6), lsh(3), gsh(3)-offset(5)-offset(6), lbnd(3), delta(3), dfl(3) ) call set_hmatrix ( h, bb(5:6) ) @@ -434,7 +479,7 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & atmp = -transpose ( matmul ( h, matmul ( transpose(d), matmul ( b, d ) ) ) ) - allocate ( zcoeff(patch)%coeff(nk,nk) ) + allocate ( zcoeff(patch)%coeff(nkk,nkk) ) zcoeff(patch)%coeff = atmp @@ -453,55 +498,56 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & kl = 1 + gsize(3) else - - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) + & - a(5,1) * var(:,:,5) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) + & - a(7,2) * var(:,:,7) + a(8,2) * var(:,:,8) + & - a(9,2) * var(:,:,9) + a(10,2) * var(:,:,10) + & - a(11,2) * var(:,:,11) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) + a(8,3) * var(:,:,8) + & - a(9,3) * var(:,:,9) + a(10,3) * var(:,:,10) + & - a(11,3) * var(:,:,11) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) + & - a(9,4) * var(:,:,9) + a(10,4) * var(:,:,10) + & - a(11,4) * var(:,:,11) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) + & - a(9,5) * var(:,:,9) + a(10,5) * var(:,:,10) + & - a(11,5) * var(:,:,11) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(1,6) * var(:,:,1) + a(2,6) * var(:,:,2) + & - a(3,6) * var(:,:,3) + a(4,6) * var(:,:,4) + & - a(5,6) * var(:,:,5) + a(6,6) * var(:,:,6) + & - a(7,6) * var(:,:,7) + a(8,6) * var(:,:,8) + & - a(9,6) * var(:,:,9) + a(10,6) * var(:,:,10) + & - a(11,6) * var(:,:,11) ) * idel - rhs(:,:,7) = rhs(:,:,7) + & - ( a(1,7) * var(:,:,1) + a(2,7) * var(:,:,2) + & - a(3,7) * var(:,:,3) + a(4,7) * var(:,:,4) + & - a(5,7) * var(:,:,5) + a(6,7) * var(:,:,6) + & - a(7,7) * var(:,:,7) + a(8,7) * var(:,:,8) + & - a(9,7) * var(:,:,9) + a(10,7) * var(:,:,10) + & - a(11,7) * var(:,:,11) ) * idel - - kl = 8 + ol = offset(5) + + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) + & + a(5,1) * var(:,:,5+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) + & + a(7,2) * var(:,:,7+ol) + a(8,2) * var(:,:,8+ol) + & + a(9,2) * var(:,:,9+ol) + a(10,2) * var(:,:,10+ol) + & + a(11,2) * var(:,:,11+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) + a(8,3) * var(:,:,8+ol) + & + a(9,3) * var(:,:,9+ol) + a(10,3) * var(:,:,10+ol) + & + a(11,3) * var(:,:,11+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) + & + a(9,4) * var(:,:,9+ol) + a(10,4) * var(:,:,10+ol) + & + a(11,4) * var(:,:,11+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) + & + a(9,5) * var(:,:,9+ol) + a(10,5) * var(:,:,10+ol) + & + a(11,5) * var(:,:,11+ol) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(1,6) * var(:,:,1+ol) + a(2,6) * var(:,:,2+ol) + & + a(3,6) * var(:,:,3+ol) + a(4,6) * var(:,:,4+ol) + & + a(5,6) * var(:,:,5+ol) + a(6,6) * var(:,:,6+ol) + & + a(7,6) * var(:,:,7+ol) + a(8,6) * var(:,:,8+ol) + & + a(9,6) * var(:,:,9+ol) + a(10,6) * var(:,:,10+ol) + & + a(11,6) * var(:,:,11+ol) ) * idel + rhs(:,:,7+ol) = rhs(:,:,7+ol) + & + ( a(1,7) * var(:,:,1+ol) + a(2,7) * var(:,:,2+ol) + & + a(3,7) * var(:,:,3+ol) + a(4,7) * var(:,:,4+ol) + & + a(5,7) * var(:,:,5+ol) + a(6,7) * var(:,:,6+ol) + & + a(7,7) * var(:,:,7+ol) + a(8,7) * var(:,:,8+ol) + & + a(9,7) * var(:,:,9+ol) + a(10,7) * var(:,:,10+ol) + & + a(11,7) * var(:,:,11+ol) ) * idel + + kl = 8 + ol end if @@ -510,93 +556,106 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & kr = nk - gsize(3) else - - rhs(:,:,nk-6) = rhs(:,:,nk-6) + & - ( a(nk-10,nk-6) * var(:,:,nk-10) + & - a(nk-9,nk-6) * var(:,:,nk-9) + & - a(nk-8,nk-6) * var(:,:,nk-8) + & - a(nk-7,nk-6) * var(:,:,nk-7) + & - a(nk-6,nk-6) * var(:,:,nk-6) + & - a(nk-5,nk-6) * var(:,:,nk-5) + & - a(nk-4,nk-6) * var(:,:,nk-4) + & - a(nk-3,nk-6) * var(:,:,nk-3) + & - a(nk-2,nk-6) * var(:,:,nk-2) + & - a(nk-1,nk-6) * var(:,:,nk-1) + & - a(nk,nk-6) * var(:,:,nk) ) * idel - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(nk-10,nk-5) * var(:,:,nk-10) + & - a(nk-9,nk-5) * var(:,:,nk-9) + & - a(nk-8,nk-5) * var(:,:,nk-8) + & - a(nk-7,nk-5) * var(:,:,nk-7) + & - a(nk-6,nk-5) * var(:,:,nk-6) + & - a(nk-5,nk-5) * var(:,:,nk-5) + & - a(nk-4,nk-5) * var(:,:,nk-4) + & - a(nk-3,nk-5) * var(:,:,nk-3) + & - a(nk-2,nk-5) * var(:,:,nk-2) + & - a(nk-1,nk-5) * var(:,:,nk-1) + & - a(nk,nk-5) * var(:,:,nk) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(nk-10,nk-4) * var(:,:,nk-10) + & - a(nk-9,nk-4) * var(:,:,nk-9) + & - a(nk-8,nk-4) * var(:,:,nk-8) + & - a(nk-7,nk-4) * var(:,:,nk-7) + & - a(nk-6,nk-4) * var(:,:,nk-6) + & - a(nk-5,nk-4) * var(:,:,nk-5) + & - a(nk-4,nk-4) * var(:,:,nk-4) + & - a(nk-3,nk-4) * var(:,:,nk-3) + & - a(nk-2,nk-4) * var(:,:,nk-2) + & - a(nk-1,nk-4) * var(:,:,nk-1) + & - a(nk,nk-4) * var(:,:,nk) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(nk-10,nk-3) * var(:,:,nk-10) + & - a(nk-9,nk-3) * var(:,:,nk-9) + & - a(nk-8,nk-3) * var(:,:,nk-8) + & - a(nk-7,nk-3) * var(:,:,nk-7) + & - a(nk-6,nk-3) * var(:,:,nk-6) + & - a(nk-5,nk-3) * var(:,:,nk-5) + & - a(nk-4,nk-3) * var(:,:,nk-4) + & - a(nk-3,nk-3) * var(:,:,nk-3) + & - a(nk-2,nk-3) * var(:,:,nk-2) + & - a(nk-1,nk-3) * var(:,:,nk-1) + & - a(nk,nk-3) * var(:,:,nk) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(nk-10,nk-2) * var(:,:,nk-10) + & - a(nk-9,nk-2) * var(:,:,nk-9) + & - a(nk-8,nk-2) * var(:,:,nk-8) + & - a(nk-7,nk-2) * var(:,:,nk-7) + & - a(nk-6,nk-2) * var(:,:,nk-6) + & - a(nk-5,nk-2) * var(:,:,nk-5) + & - a(nk-4,nk-2) * var(:,:,nk-4) + & - a(nk-3,nk-2) * var(:,:,nk-3) + & - a(nk-2,nk-2) * var(:,:,nk-2) + & - a(nk-1,nk-2) * var(:,:,nk-1) + & - a(nk,nk-2) * var(:,:,nk) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(nk-10,nk-1) * var(:,:,nk-10) + & - a(nk-9,nk-1) * var(:,:,nk-9) + & - a(nk-8,nk-1) * var(:,:,nk-8) + & - a(nk-7,nk-1) * var(:,:,nk-7) + & - a(nk-6,nk-1) * var(:,:,nk-6) + & - a(nk-5,nk-1) * var(:,:,nk-5) + & - a(nk-4,nk-1) * var(:,:,nk-4) + & - a(nk-3,nk-1) * var(:,:,nk-3) + & - a(nk-2,nk-1) * var(:,:,nk-2) + & - a(nk-1,nk-1) * var(:,:,nk-1) + & - a(nk,nk-1) * var(:,:,nk) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(nk-4,nk) * var(:,:,nk-4) + & - a(nk-3,nk) * var(:,:,nk-3) + & - a(nk-2,nk) * var(:,:,nk-2) + & - a(nk-1,nk) * var(:,:,nk-1) + & - a(nk,nk) * var(:,:,nk) ) * idel - - kr = nk - 7 + or = nk - offset(6) + + rhs(:,:,or-6) = rhs(:,:,or-6) + & + ( a(nkk-10,nkk-6) * var(:,:,or-10) + & + a(nkk-9,nkk-6) * var(:,:,or-9) + & + a(nkk-8,nkk-6) * var(:,:,or-8) + & + a(nkk-7,nkk-6) * var(:,:,or-7) + & + a(nkk-6,nkk-6) * var(:,:,or-6) + & + a(nkk-5,nkk-6) * var(:,:,or-5) + & + a(nkk-4,nkk-6) * var(:,:,or-4) + & + a(nkk-3,nkk-6) * var(:,:,or-3) + & + a(nkk-2,nkk-6) * var(:,:,or-2) + & + a(nkk-1,nkk-6) * var(:,:,or-1) + & + a(nkk,nkk-6) * var(:,:,or) ) * idel + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(nkk-10,nkk-5) * var(:,:,or-10) + & + a(nkk-9,nkk-5) * var(:,:,or-9) + & + a(nkk-8,nkk-5) * var(:,:,or-8) + & + a(nkk-7,nkk-5) * var(:,:,or-7) + & + a(nkk-6,nkk-5) * var(:,:,or-6) + & + a(nkk-5,nkk-5) * var(:,:,or-5) + & + a(nkk-4,nkk-5) * var(:,:,or-4) + & + a(nkk-3,nkk-5) * var(:,:,or-3) + & + a(nkk-2,nkk-5) * var(:,:,or-2) + & + a(nkk-1,nkk-5) * var(:,:,or-1) + & + a(nkk,nkk-5) * var(:,:,or) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(nkk-10,nkk-4) * var(:,:,or-10) + & + a(nkk-9,nkk-4) * var(:,:,or-9) + & + a(nkk-8,nkk-4) * var(:,:,or-8) + & + a(nkk-7,nkk-4) * var(:,:,or-7) + & + a(nkk-6,nkk-4) * var(:,:,or-6) + & + a(nkk-5,nkk-4) * var(:,:,or-5) + & + a(nkk-4,nkk-4) * var(:,:,or-4) + & + a(nkk-3,nkk-4) * var(:,:,or-3) + & + a(nkk-2,nkk-4) * var(:,:,or-2) + & + a(nkk-1,nkk-4) * var(:,:,or-1) + & + a(nkk,nkk-4) * var(:,:,or) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(nkk-10,nkk-3) * var(:,:,or-10) + & + a(nkk-9,nkk-3) * var(:,:,or-9) + & + a(nkk-8,nkk-3) * var(:,:,or-8) + & + a(nkk-7,nkk-3) * var(:,:,or-7) + & + a(nkk-6,nkk-3) * var(:,:,or-6) + & + a(nkk-5,nkk-3) * var(:,:,or-5) + & + a(nkk-4,nkk-3) * var(:,:,or-4) + & + a(nkk-3,nkk-3) * var(:,:,or-3) + & + a(nkk-2,nkk-3) * var(:,:,or-2) + & + a(nkk-1,nkk-3) * var(:,:,or-1) + & + a(nkk,nkk-3) * var(:,:,or) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(nkk-10,nkk-2) * var(:,:,or-10) + & + a(nkk-9,nkk-2) * var(:,:,or-9) + & + a(nkk-8,nkk-2) * var(:,:,or-8) + & + a(nkk-7,nkk-2) * var(:,:,or-7) + & + a(nkk-6,nkk-2) * var(:,:,or-6) + & + a(nkk-5,nkk-2) * var(:,:,or-5) + & + a(nkk-4,nkk-2) * var(:,:,or-4) + & + a(nkk-3,nkk-2) * var(:,:,or-3) + & + a(nkk-2,nkk-2) * var(:,:,or-2) + & + a(nkk-1,nkk-2) * var(:,:,or-1) + & + a(nkk,nkk-2) * var(:,:,or) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(nkk-10,nkk-1) * var(:,:,or-10) + & + a(nkk-9,nkk-1) * var(:,:,or-9) + & + a(nkk-8,nkk-1) * var(:,:,or-8) + & + a(nkk-7,nkk-1) * var(:,:,or-7) + & + a(nkk-6,nkk-1) * var(:,:,or-6) + & + a(nkk-5,nkk-1) * var(:,:,or-5) + & + a(nkk-4,nkk-1) * var(:,:,or-4) + & + a(nkk-3,nkk-1) * var(:,:,or-3) + & + a(nkk-2,nkk-1) * var(:,:,or-2) + & + a(nkk-1,nkk-1) * var(:,:,or-1) + & + a(nkk,nkk-1) * var(:,:,or) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(nkk-4,nkk) * var(:,:,or-4) + & + a(nkk-3,nkk) * var(:,:,or-3) + & + a(nkk-2,nkk) * var(:,:,or-2) + & + a(nkk-1,nkk) * var(:,:,or-1) + & + a(nkk,nkk) * var(:,:,or) ) * idel + + kr = or - 7 end if do k = kl, kr - rhs(:,:,k) = rhs(:,:,k) + & + if ( bb(5) /= 0) then + rhs(:,:,k) = rhs(:,:,k) + & + ( a(k-ol-4,k-ol) * var(:,:,k-4) + & + a(k-ol-3,k-ol) * var(:,:,k-3) + & + a(k-ol-2,k-ol) * var(:,:,k-2) + & + a(k-ol-1,k-ol) * var(:,:,k-1) + & + a(k-ol,k-ol) * var(:,:,k) + & + a(k-ol+1,k-ol) * var(:,:,k+1) + & + a(k-ol+2,k-ol) * var(:,:,k+2) + & + a(k-ol+3,k-ol) * var(:,:,k+3) + & + a(k-ol+4,k-ol) * var(:,:,k+4) ) * idel + else + rhs(:,:,k) = rhs(:,:,k) + & ( a(k-4,k) * var(:,:,k-4) + & a(k-3,k) * var(:,:,k-3) + & a(k-2,k) * var(:,:,k-2) + & @@ -606,6 +665,7 @@ subroutine dissipation_6_5_alt (var, lsh, gsh, lbnd, bb, gsize, & a(k+2,k) * var(:,:,k+2) + & a(k+3,k) * var(:,:,k+3) + & a(k+4,k) * var(:,:,k+4) ) * idel + endif end do diff --git a/src/Dissipation_8_4.F90 b/src/Dissipation_8_4.F90 index c81432b..47238f7 100644 --- a/src/Dissipation_8_4.F90 +++ b/src/Dissipation_8_4.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(12,8) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -35,98 +36,100 @@ subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) + & - a(5,1) * var(5,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) + & - a(9,5) * var(9,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(2,6) * var(2,:,:) + a(3,6) * var(3,:,:) + & - a(4,6) * var(4,:,:) + a(5,6) * var(5,:,:) + & - a(6,6) * var(6,:,:) + a(7,6) * var(7,:,:) + & - a(8,6) * var(8,:,:) + a(9,6) * var(9,:,:) + & - a(10,6) * var(10,:,:) ) * idel - rhs(7,:,:) = rhs(7,:,:) + & - ( a(3,7) * var(3,:,:) + a(4,7) * var(4,:,:) + & - a(5,7) * var(5,:,:) + a(6,7) * var(6,:,:) + & - a(7,7) * var(7,:,:) + a(8,7) * var(8,:,:) + & - a(9,7) * var(9,:,:) + a(10,7) * var(10,:,:) + & - a(11,7) * var(11,:,:) ) * idel - rhs(8,:,:) = rhs(8,:,:) + & - ( a(4,8) * var(4,:,:) + a(5,8) * var(5,:,:) + & - a(6,8) * var(6,:,:) + a(7,8) * var(7,:,:) + & - a(8,8) * var(8,:,:) + a(9,8) * var(9,:,:) + & - a(10,8) * var(10,:,:) + a(11,8) * var(11,:,:) + & - a(12,8) * var(12,:,:) ) * idel + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) + & + a(5,1) * var(5+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) + & + a(9,5) * var(9+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(2,6) * var(2+ol,:,:) + a(3,6) * var(3+ol,:,:) + & + a(4,6) * var(4+ol,:,:) + a(5,6) * var(5+ol,:,:) + & + a(6,6) * var(6+ol,:,:) + a(7,6) * var(7+ol,:,:) + & + a(8,6) * var(8+ol,:,:) + a(9,6) * var(9+ol,:,:) + & + a(10,6) * var(10+ol,:,:) ) * idel + rhs(7+ol,:,:) = rhs(7+ol,:,:) + & + ( a(3,7) * var(3+ol,:,:) + a(4,7) * var(4+ol,:,:) + & + a(5,7) * var(5+ol,:,:) + a(6,7) * var(6+ol,:,:) + & + a(7,7) * var(7+ol,:,:) + a(8,7) * var(8+ol,:,:) + & + a(9,7) * var(9+ol,:,:) + a(10,7) * var(10+ol,:,:) + & + a(11,7) * var(11+ol,:,:) ) * idel + rhs(8+ol,:,:) = rhs(8+ol,:,:) + & + ( a(4,8) * var(4+ol,:,:) + a(5,8) * var(5+ol,:,:) + & + a(6,8) * var(6+ol,:,:) + a(7,8) * var(7+ol,:,:) + & + a(8,8) * var(8+ol,:,:) + a(9,8) * var(9+ol,:,:) + & + a(10,8) * var(10+ol,:,:) + a(11,8) * var(11+ol,:,:) + & + a(12,8) * var(12+ol,:,:) ) * idel - il = 9 + il = 9 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-7,:,:) = rhs(ni-7,:,:) + & - ( a(4,8) * var(ni-3,:,:) + a(5,8) * var(ni-4,:,:) + & - a(6,8) * var(ni-5,:,:) + a(7,8) * var(ni-6,:,:) + & - a(8,8) * var(ni-7,:,:) + a(9,8) * var(ni-8,:,:) + & - a(10,8) * var(ni-9,:,:) + a(11,8) * var(ni-10,:,:) + & - a(12,8) * var(ni-11,:,:) ) * idel - rhs(ni-6,:,:) = rhs(ni-6,:,:) + & - ( a(3,7) * var(ni-2,:,:) + a(4,7) * var(ni-3,:,:) + & - a(5,7) * var(ni-4,:,:) + a(6,7) * var(ni-5,:,:) + & - a(7,7) * var(ni-6,:,:) + a(8,7) * var(ni-7,:,:) + & - a(9,7) * var(ni-8,:,:) + a(10,7) * var(ni-9,:,:) + & - a(11,7) * var(ni-10,:,:) ) * idel - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(2,6) * var(ni-1,:,:) + a(3,6) * var(ni-2,:,:) + & - a(4,6) * var(ni-3,:,:) + a(5,6) * var(ni-4,:,:) + & - a(6,6) * var(ni-5,:,:) + a(7,6) * var(ni-6,:,:) + & - a(8,6) * var(ni-7,:,:) + a(9,6) * var(ni-8,:,:) + & - a(10,6) * var(ni-9,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(1,5) * var(ni,:,:) + a(2,5) * var(ni-1,:,:) + & - a(3,5) * var(ni-2,:,:) + a(4,5) * var(ni-3,:,:) + & - a(5,5) * var(ni-4,:,:) + a(6,5) * var(ni-5,:,:) + & - a(7,5) * var(ni-6,:,:) + a(8,5) * var(ni-7,:,:) + & - a(9,5) * var(ni-8,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(1,4) * var(ni,:,:) + a(2,4) * var(ni-1,:,:) + & - a(3,4) * var(ni-2,:,:) + a(4,4) * var(ni-3,:,:) + & - a(5,4) * var(ni-4,:,:) + a(6,4) * var(ni-5,:,:) + & - a(7,4) * var(ni-6,:,:) + a(8,4) * var(ni-7,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) + a(6,3) * var(ni-5,:,:) + & - a(7,3) * var(ni-6,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) + & - a(5,2) * var(ni-4,:,:) + a(6,2) * var(ni-5,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) + a(4,1) * var(ni-3,:,:) + & - a(5,1) * var(ni-4,:,:) ) * idel + or = ni - offset(2) + rhs(or-7,:,:) = rhs(or-7,:,:) + & + ( a(4,8) * var(or-3,:,:) + a(5,8) * var(or-4,:,:) + & + a(6,8) * var(or-5,:,:) + a(7,8) * var(or-6,:,:) + & + a(8,8) * var(or-7,:,:) + a(9,8) * var(or-8,:,:) + & + a(10,8) * var(or-9,:,:) + a(11,8) * var(or-10,:,:) + & + a(12,8) * var(or-11,:,:) ) * idel + rhs(or-6,:,:) = rhs(or-6,:,:) + & + ( a(3,7) * var(or-2,:,:) + a(4,7) * var(or-3,:,:) + & + a(5,7) * var(or-4,:,:) + a(6,7) * var(or-5,:,:) + & + a(7,7) * var(or-6,:,:) + a(8,7) * var(or-7,:,:) + & + a(9,7) * var(or-8,:,:) + a(10,7) * var(or-9,:,:) + & + a(11,7) * var(or-10,:,:) ) * idel + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(2,6) * var(or-1,:,:) + a(3,6) * var(or-2,:,:) + & + a(4,6) * var(or-3,:,:) + a(5,6) * var(or-4,:,:) + & + a(6,6) * var(or-5,:,:) + a(7,6) * var(or-6,:,:) + & + a(8,6) * var(or-7,:,:) + a(9,6) * var(or-8,:,:) + & + a(10,6) * var(or-9,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(1,5) * var(or,:,:) + a(2,5) * var(or-1,:,:) + & + a(3,5) * var(or-2,:,:) + a(4,5) * var(or-3,:,:) + & + a(5,5) * var(or-4,:,:) + a(6,5) * var(or-5,:,:) + & + a(7,5) * var(or-6,:,:) + a(8,5) * var(or-7,:,:) + & + a(9,5) * var(or-8,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(1,4) * var(or,:,:) + a(2,4) * var(or-1,:,:) + & + a(3,4) * var(or-2,:,:) + a(4,4) * var(or-3,:,:) + & + a(5,4) * var(or-4,:,:) + a(6,4) * var(or-5,:,:) + & + a(7,4) * var(or-6,:,:) + a(8,4) * var(or-7,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) + a(6,3) * var(or-5,:,:) + & + a(7,3) * var(or-6,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) + & + a(5,2) * var(or-4,:,:) + a(6,2) * var(or-5,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) + a(4,1) * var(or-3,:,:) + & + a(5,1) * var(or-4,:,:) ) * idel - ir = ni - 8 + ir = or - 8 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -70.0_wp * var(il:ir,:,:) + & @@ -151,98 +154,100 @@ subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) + & - a(5,1) * var(:,5,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) + & - a(9,5) * var(:,9,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(2,6) * var(:,2,:) + a(3,6) * var(:,3,:) + & - a(4,6) * var(:,4,:) + a(5,6) * var(:,5,:) + & - a(6,6) * var(:,6,:) + a(7,6) * var(:,7,:) + & - a(8,6) * var(:,8,:) + a(9,6) * var(:,9,:) + & - a(10,6) * var(:,10,:) ) * idel - rhs(:,7,:) = rhs(:,7,:) + & - ( a(3,7) * var(:,3,:) + a(4,7) * var(:,4,:) + & - a(5,7) * var(:,5,:) + a(6,7) * var(:,6,:) + & - a(7,7) * var(:,7,:) + a(8,7) * var(:,8,:) + & - a(9,7) * var(:,9,:) + a(10,7) * var(:,10,:) + & - a(11,7) * var(:,11,:) ) * idel - rhs(:,8,:) = rhs(:,8,:) + & - ( a(4,8) * var(:,4,:) + a(5,8) * var(:,5,:) + & - a(6,8) * var(:,6,:) + a(7,8) * var(:,7,:) + & - a(8,8) * var(:,8,:) + a(9,8) * var(:,9,:) + & - a(10,8) * var(:,10,:) + a(11,8) * var(:,11,:) + & - a(12,8) * var(:,12,:) ) * idel + ol = offset(3) + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) + & + a(5,1) * var(:,5+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) + & + a(9,5) * var(:,9+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(2,6) * var(:,2+ol,:) + a(3,6) * var(:,3+ol,:) + & + a(4,6) * var(:,4+ol,:) + a(5,6) * var(:,5+ol,:) + & + a(6,6) * var(:,6+ol,:) + a(7,6) * var(:,7+ol,:) + & + a(8,6) * var(:,8+ol,:) + a(9,6) * var(:,9+ol,:) + & + a(10,6) * var(:,10+ol,:) ) * idel + rhs(:,7+ol,:) = rhs(:,7+ol,:) + & + ( a(3,7) * var(:,3+ol,:) + a(4,7) * var(:,4+ol,:) + & + a(5,7) * var(:,5+ol,:) + a(6,7) * var(:,6+ol,:) + & + a(7,7) * var(:,7+ol,:) + a(8,7) * var(:,8+ol,:) + & + a(9,7) * var(:,9+ol,:) + a(10,7) * var(:,10+ol,:) + & + a(11,7) * var(:,11+ol,:) ) * idel + rhs(:,8+ol,:) = rhs(:,8+ol,:) + & + ( a(4,8) * var(:,4+ol,:) + a(5,8) * var(:,5+ol,:) + & + a(6,8) * var(:,6+ol,:) + a(7,8) * var(:,7+ol,:) + & + a(8,8) * var(:,8+ol,:) + a(9,8) * var(:,9+ol,:) + & + a(10,8) * var(:,10+ol,:) + a(11,8) * var(:,11+ol,:) + & + a(12,8) * var(:,12+ol,:) ) * idel - jl = 9 + jl = 9 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-7,:) = rhs(:,nj-7,:) + & - ( a(4,8) * var(:,nj-3,:) + a(5,8) * var(:,nj-4,:) + & - a(6,8) * var(:,nj-5,:) + a(7,8) * var(:,nj-6,:) + & - a(8,8) * var(:,nj-7,:) + a(9,8) * var(:,nj-8,:) + & - a(10,8) * var(:,nj-9,:) + a(11,8) * var(:,nj-10,:) + & - a(12,8) * var(:,nj-11,:) ) * idel - rhs(:,nj-6,:) = rhs(:,nj-6,:) + & - ( a(3,7) * var(:,nj-2,:) + a(4,7) * var(:,nj-3,:) + & - a(5,7) * var(:,nj-4,:) + a(6,7) * var(:,nj-5,:) + & - a(7,7) * var(:,nj-6,:) + a(8,7) * var(:,nj-7,:) + & - a(9,7) * var(:,nj-8,:) + a(10,7) * var(:,nj-9,:) + & - a(11,7) * var(:,nj-10,:) ) * idel - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(2,6) * var(:,nj-1,:) + a(3,6) * var(:,nj-2,:) + & - a(4,6) * var(:,nj-3,:) + a(5,6) * var(:,nj-4,:) + & - a(6,6) * var(:,nj-5,:) + a(7,6) * var(:,nj-6,:) + & - a(8,6) * var(:,nj-7,:) + a(9,6) * var(:,nj-8,:) + & - a(10,6) * var(:,nj-9,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(1,5) * var(:,nj,:) + a(2,5) * var(:,nj-1,:) + & - a(3,5) * var(:,nj-2,:) + a(4,5) * var(:,nj-3,:) + & - a(5,5) * var(:,nj-4,:) + a(6,5) * var(:,nj-5,:) + & - a(7,5) * var(:,nj-6,:) + a(8,5) * var(:,nj-7,:) + & - a(9,5) * var(:,nj-8,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(1,4) * var(:,nj,:) + a(2,4) * var(:,nj-1,:) + & - a(3,4) * var(:,nj-2,:) + a(4,4) * var(:,nj-3,:) + & - a(5,4) * var(:,nj-4,:) + a(6,4) * var(:,nj-5,:) + & - a(7,4) * var(:,nj-6,:) + a(8,4) * var(:,nj-7,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) + a(6,3) * var(:,nj-5,:) + & - a(7,3) * var(:,nj-6,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) + & - a(5,2) * var(:,nj-4,:) + a(6,2) * var(:,nj-5,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) + a(4,1) * var(:,nj-3,:) + & - a(5,1) * var(:,nj-4,:) ) * idel + or = nj - offset(4) + rhs(:,or-7,:) = rhs(:,or-7,:) + & + ( a(4,8) * var(:,or-3,:) + a(5,8) * var(:,or-4,:) + & + a(6,8) * var(:,or-5,:) + a(7,8) * var(:,or-6,:) + & + a(8,8) * var(:,or-7,:) + a(9,8) * var(:,or-8,:) + & + a(10,8) * var(:,or-9,:) + a(11,8) * var(:,or-10,:) + & + a(12,8) * var(:,or-11,:) ) * idel + rhs(:,or-6,:) = rhs(:,or-6,:) + & + ( a(3,7) * var(:,or-2,:) + a(4,7) * var(:,or-3,:) + & + a(5,7) * var(:,or-4,:) + a(6,7) * var(:,or-5,:) + & + a(7,7) * var(:,or-6,:) + a(8,7) * var(:,or-7,:) + & + a(9,7) * var(:,or-8,:) + a(10,7) * var(:,or-9,:) + & + a(11,7) * var(:,or-10,:) ) * idel + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(2,6) * var(:,or-1,:) + a(3,6) * var(:,or-2,:) + & + a(4,6) * var(:,or-3,:) + a(5,6) * var(:,or-4,:) + & + a(6,6) * var(:,or-5,:) + a(7,6) * var(:,or-6,:) + & + a(8,6) * var(:,or-7,:) + a(9,6) * var(:,or-8,:) + & + a(10,6) * var(:,or-9,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(1,5) * var(:,or,:) + a(2,5) * var(:,or-1,:) + & + a(3,5) * var(:,or-2,:) + a(4,5) * var(:,or-3,:) + & + a(5,5) * var(:,or-4,:) + a(6,5) * var(:,or-5,:) + & + a(7,5) * var(:,or-6,:) + a(8,5) * var(:,or-7,:) + & + a(9,5) * var(:,or-8,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(1,4) * var(:,or,:) + a(2,4) * var(:,or-1,:) + & + a(3,4) * var(:,or-2,:) + a(4,4) * var(:,or-3,:) + & + a(5,4) * var(:,or-4,:) + a(6,4) * var(:,or-5,:) + & + a(7,4) * var(:,or-6,:) + a(8,4) * var(:,or-7,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) + a(6,3) * var(:,or-5,:) + & + a(7,3) * var(:,or-6,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) + & + a(5,2) * var(:,or-4,:) + a(6,2) * var(:,or-5,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) + a(4,1) * var(:,or-3,:) + & + a(5,1) * var(:,or-4,:) ) * idel - jr = nj - 8 + jr = or - 8 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -70.0_wp * var(:,jl:jr,:) + & @@ -268,97 +273,99 @@ subroutine dissipation_8_4 (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) + & - a(5,1) * var(:,:,5) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) + & - a(9,5) * var(:,:,9) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(2,6) * var(:,:,2) + a(3,6) * var(:,:,3) + & - a(4,6) * var(:,:,4) + a(5,6) * var(:,:,5) + & - a(6,6) * var(:,:,6) + a(7,6) * var(:,:,7) + & - a(8,6) * var(:,:,8) + a(9,6) * var(:,:,9) + & - a(10,6) * var(:,:,10) ) * idel - rhs(:,:,7) = rhs(:,:,7) + & - ( a(3,7) * var(:,:,3) + a(4,7) * var(:,:,4) + & - a(5,7) * var(:,:,5) + a(6,7) * var(:,:,6) + & - a(7,7) * var(:,:,7) + a(8,7) * var(:,:,8) + & - a(9,7) * var(:,:,9) + a(10,7) * var(:,:,10) + & - a(11,7) * var(:,:,11) ) * idel - rhs(:,:,8) = rhs(:,:,8) + & - ( a(4,8) * var(:,:,4) + a(5,8) * var(:,:,5) + & - a(6,8) * var(:,:,6) + a(7,8) * var(:,:,7) + & - a(8,8) * var(:,:,8) + a(9,8) * var(:,:,9) + & - a(10,8) * var(:,:,10) + a(11,8) * var(:,:,11) + & - a(12,8) * var(:,:,12) ) * idel + ol = offset(5) + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) + & + a(5,1) * var(:,:,5+ol) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) + & + a(9,5) * var(:,:,9+ol) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(2,6) * var(:,:,2+ol) + a(3,6) * var(:,:,3+ol) + & + a(4,6) * var(:,:,4+ol) + a(5,6) * var(:,:,5+ol) + & + a(6,6) * var(:,:,6+ol) + a(7,6) * var(:,:,7+ol) + & + a(8,6) * var(:,:,8+ol) + a(9,6) * var(:,:,9+ol) + & + a(10,6) * var(:,:,10+ol) ) * idel + rhs(:,:,7+ol) = rhs(:,:,7+ol) + & + ( a(3,7) * var(:,:,3+ol) + a(4,7) * var(:,:,4+ol) + & + a(5,7) * var(:,:,5+ol) + a(6,7) * var(:,:,6+ol) + & + a(7,7) * var(:,:,7+ol) + a(8,7) * var(:,:,8+ol) + & + a(9,7) * var(:,:,9+ol) + a(10,7) * var(:,:,10+ol) + & + a(11,7) * var(:,:,11+ol) ) * idel + rhs(:,:,8+ol) = rhs(:,:,8+ol) + & + ( a(4,8) * var(:,:,4+ol) + a(5,8) * var(:,:,5+ol) + & + a(6,8) * var(:,:,6+ol) + a(7,8) * var(:,:,7+ol) + & + a(8,8) * var(:,:,8+ol) + a(9,8) * var(:,:,9+ol) + & + a(10,8) * var(:,:,10+ol) + a(11,8) * var(:,:,11+ol) + & + a(12,8) * var(:,:,12+ol) ) * idel - kl = 9 + kl = 9 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-7) = rhs(:,:,nk-7) + & - ( a(4,8) * var(:,:,nk-3) + a(5,8) * var(:,:,nk-4) + & - a(6,8) * var(:,:,nk-5) + a(7,8) * var(:,:,nk-6) + & - a(8,8) * var(:,:,nk-7) + a(9,8) * var(:,:,nk-8) + & - a(10,8) * var(:,:,nk-9) + a(11,8) * var(:,:,nk-10) + & - a(12,8) * var(:,:,nk-11) ) * idel - rhs(:,:,nk-6) = rhs(:,:,nk-6) + & - ( a(3,7) * var(:,:,nk-2) + a(4,7) * var(:,:,nk-3) + & - a(5,7) * var(:,:,nk-4) + a(6,7) * var(:,:,nk-5) + & - a(7,7) * var(:,:,nk-6) + a(8,7) * var(:,:,nk-7) + & - a(9,7) * var(:,:,nk-8) + a(10,7) * var(:,:,nk-9) + & - a(11,7) * var(:,:,nk-10) ) * idel - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(2,6) * var(:,:,nk-1) + a(3,6) * var(:,:,nk-2) + & - a(4,6) * var(:,:,nk-3) + a(5,6) * var(:,:,nk-4) + & - a(6,6) * var(:,:,nk-5) + a(7,6) * var(:,:,nk-6) + & - a(8,6) * var(:,:,nk-7) + a(9,6) * var(:,:,nk-8) + & - a(10,6) * var(:,:,nk-9) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(1,5) * var(:,:,nk) + a(2,5) * var(:,:,nk-1) + & - a(3,5) * var(:,:,nk-2) + a(4,5) * var(:,:,nk-3) + & - a(5,5) * var(:,:,nk-4) + a(6,5) * var(:,:,nk-5) + & - a(7,5) * var(:,:,nk-6) + a(8,5) * var(:,:,nk-7) + & - a(9,5) * var(:,:,nk-8) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(1,4) * var(:,:,nk) + a(2,4) * var(:,:,nk-1) + & - a(3,4) * var(:,:,nk-2) + a(4,4) * var(:,:,nk-3) + & - a(5,4) * var(:,:,nk-4) + a(6,4) * var(:,:,nk-5) + & - a(7,4) * var(:,:,nk-6) + a(8,4) * var(:,:,nk-7) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) + a(6,3) * var(:,:,nk-5) + & - a(7,3) * var(:,:,nk-6) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) + & - a(5,2) * var(:,:,nk-4) + a(6,2) * var(:,:,nk-5) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) + a(4,1) * var(:,:,nk-3) + & - a(5,1) * var(:,:,nk-4) ) * idel - kr = nk - 8 + or = nk - offset(6) + rhs(:,:,or-7) = rhs(:,:,or-7) + & + ( a(4,8) * var(:,:,or-3) + a(5,8) * var(:,:,or-4) + & + a(6,8) * var(:,:,or-5) + a(7,8) * var(:,:,or-6) + & + a(8,8) * var(:,:,or-7) + a(9,8) * var(:,:,or-8) + & + a(10,8) * var(:,:,or-9) + a(11,8) * var(:,:,or-10) + & + a(12,8) * var(:,:,or-11) ) * idel + rhs(:,:,or-6) = rhs(:,:,or-6) + & + ( a(3,7) * var(:,:,or-2) + a(4,7) * var(:,:,or-3) + & + a(5,7) * var(:,:,or-4) + a(6,7) * var(:,:,or-5) + & + a(7,7) * var(:,:,or-6) + a(8,7) * var(:,:,or-7) + & + a(9,7) * var(:,:,or-8) + a(10,7) * var(:,:,or-9) + & + a(11,7) * var(:,:,or-10) ) * idel + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(2,6) * var(:,:,or-1) + a(3,6) * var(:,:,or-2) + & + a(4,6) * var(:,:,or-3) + a(5,6) * var(:,:,or-4) + & + a(6,6) * var(:,:,or-5) + a(7,6) * var(:,:,or-6) + & + a(8,6) * var(:,:,or-7) + a(9,6) * var(:,:,or-8) + & + a(10,6) * var(:,:,or-9) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(1,5) * var(:,:,or) + a(2,5) * var(:,:,or-1) + & + a(3,5) * var(:,:,or-2) + a(4,5) * var(:,:,or-3) + & + a(5,5) * var(:,:,or-4) + a(6,5) * var(:,:,or-5) + & + a(7,5) * var(:,:,or-6) + a(8,5) * var(:,:,or-7) + & + a(9,5) * var(:,:,or-8) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(1,4) * var(:,:,or) + a(2,4) * var(:,:,or-1) + & + a(3,4) * var(:,:,or-2) + a(4,4) * var(:,:,or-3) + & + a(5,4) * var(:,:,or-4) + a(6,4) * var(:,:,or-5) + & + a(7,4) * var(:,:,or-6) + a(8,4) * var(:,:,or-7) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) + a(6,3) * var(:,:,or-5) + & + a(7,3) * var(:,:,or-6) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) + & + a(5,2) * var(:,:,or-4) + a(6,2) * var(:,:,or-5) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) + a(4,1) * var(:,:,or-3) + & + a(5,1) * var(:,:,or-4) ) * idel + kr = or - 8 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -70.0_wp * var(:,:,kl:kr) + & diff --git a/src/Dissipation_8_4_alt.F90 b/src/Dissipation_8_4_alt.F90 index 2cbd77d..40a9ea7 100644 --- a/src/Dissipation_8_4_alt.F90 +++ b/src/Dissipation_8_4_alt.F90 @@ -3,7 +3,7 @@ #include "cctk.h" #include "cctk_Parameters.h" -subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) +subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, offset, delta, epsilon, rhs) implicit none @@ -14,6 +14,7 @@ subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(ni,nj,nk), intent(inout) :: rhs CCTK_INT, dimension(6), intent(in) :: bb CCTK_INT, dimension(3), intent(in) :: gsize + CCTK_INT, dimension(6), intent(in) :: offset CCTK_REAL, dimension(3), intent(in) :: delta CCTK_REAL, intent(in) :: epsilon @@ -22,7 +23,7 @@ subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) CCTK_REAL, dimension(13,8) :: a CCTK_REAL :: idel - CCTK_INT :: il, ir, jl, jr, kl, kr + CCTK_INT :: il, ir, jl, jr, kl, kr, ol, or call set_coeff ( a ) @@ -31,108 +32,110 @@ subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(1) == 0 ) then il = 1 + gsize(1) else - rhs(1,:,:) = rhs(1,:,:) + & - ( a(1,1) * var(1,:,:) + a(2,1) * var(2,:,:) + & - a(3,1) * var(3,:,:) + a(4,1) * var(4,:,:) + & - a(5,1) * var(5,:,:) + a(6,1) * var(6,:,:) ) * idel - rhs(2,:,:) = rhs(2,:,:) + & - ( a(1,2) * var(1,:,:) + a(2,2) * var(2,:,:) + & - a(3,2) * var(3,:,:) + a(4,2) * var(4,:,:) + & - a(5,2) * var(5,:,:) + a(6,2) * var(6,:,:) + & - a(7,2) * var(7,:,:) ) * idel - rhs(3,:,:) = rhs(3,:,:) + & - ( a(1,3) * var(1,:,:) + a(2,3) * var(2,:,:) + & - a(3,3) * var(3,:,:) + a(4,3) * var(4,:,:) + & - a(5,3) * var(5,:,:) + a(6,3) * var(6,:,:) + & - a(7,3) * var(7,:,:) + a(8,3) * var(8,:,:) ) * idel - rhs(4,:,:) = rhs(4,:,:) + & - ( a(1,4) * var(1,:,:) + a(2,4) * var(2,:,:) + & - a(3,4) * var(3,:,:) + a(4,4) * var(4,:,:) + & - a(5,4) * var(5,:,:) + a(6,4) * var(6,:,:) + & - a(7,4) * var(7,:,:) + a(8,4) * var(8,:,:) + & - a(9,4) * var(9,:,:) ) * idel - rhs(5,:,:) = rhs(5,:,:) + & - ( a(1,5) * var(1,:,:) + a(2,5) * var(2,:,:) + & - a(3,5) * var(3,:,:) + a(4,5) * var(4,:,:) + & - a(5,5) * var(5,:,:) + a(6,5) * var(6,:,:) + & - a(7,5) * var(7,:,:) + a(8,5) * var(8,:,:) + & - a(9,5) * var(9,:,:) + a(10,5) * var(10,:,:) ) * idel - rhs(6,:,:) = rhs(6,:,:) + & - ( a(1,6) * var(1,:,:) + a(2,6) * var(2,:,:) + & - a(3,6) * var(3,:,:) + a(4,6) * var(4,:,:) + & - a(5,6) * var(5,:,:) + a(6,6) * var(6,:,:) + & - a(7,6) * var(7,:,:) + a(8,6) * var(8,:,:) + & - a(9,6) * var(9,:,:) + a(10,6) * var(10,:,:) + & - a(11,6) * var(11,:,:) ) * idel - rhs(7,:,:) = rhs(7,:,:) + & - ( a(2,7) * var(2,:,:) + a(3,7) * var(3,:,:) + & - a(4,7) * var(4,:,:) + a(5,7) * var(5,:,:) + & - a(6,7) * var(6,:,:) + a(7,7) * var(7,:,:) + & - a(8,7) * var(8,:,:) + a(9,7) * var(9,:,:) + & - a(10,7) * var(10,:,:) + a(11,7) * var(11,:,:) + & - a(12,7) * var(12,:,:) ) * idel - rhs(8,:,:) = rhs(8,:,:) + & - ( a(3,8) * var(3,:,:) + a(4,8) * var(4,:,:) + & - a(5,8) * var(5,:,:) + a(6,8) * var(6,:,:) + & - a(7,8) * var(7,:,:) + a(8,8) * var(8,:,:) + & - a(9,8) * var(9,:,:) + a(10,8) * var(10,:,:) + & - a(11,8) * var(11,:,:) + a(12,8) * var(12,:,:) + & - a(13,8) * var(13,:,:) ) * idel + ol = offset(1) + rhs(1+ol,:,:) = rhs(1+ol,:,:) + & + ( a(1,1) * var(1+ol,:,:) + a(2,1) * var(2+ol,:,:) + & + a(3,1) * var(3+ol,:,:) + a(4,1) * var(4+ol,:,:) + & + a(5,1) * var(5+ol,:,:) + a(6,1) * var(6+ol,:,:) ) * idel + rhs(2+ol,:,:) = rhs(2+ol,:,:) + & + ( a(1,2) * var(1+ol,:,:) + a(2,2) * var(2+ol,:,:) + & + a(3,2) * var(3+ol,:,:) + a(4,2) * var(4+ol,:,:) + & + a(5,2) * var(5+ol,:,:) + a(6,2) * var(6+ol,:,:) + & + a(7,2) * var(7+ol,:,:) ) * idel + rhs(3+ol,:,:) = rhs(3+ol,:,:) + & + ( a(1,3) * var(1+ol,:,:) + a(2,3) * var(2+ol,:,:) + & + a(3,3) * var(3+ol,:,:) + a(4,3) * var(4+ol,:,:) + & + a(5,3) * var(5+ol,:,:) + a(6,3) * var(6+ol,:,:) + & + a(7,3) * var(7+ol,:,:) + a(8,3) * var(8+ol,:,:) ) * idel + rhs(4+ol,:,:) = rhs(4+ol,:,:) + & + ( a(1,4) * var(1+ol,:,:) + a(2,4) * var(2+ol,:,:) + & + a(3,4) * var(3+ol,:,:) + a(4,4) * var(4+ol,:,:) + & + a(5,4) * var(5+ol,:,:) + a(6,4) * var(6+ol,:,:) + & + a(7,4) * var(7+ol,:,:) + a(8,4) * var(8+ol,:,:) + & + a(9,4) * var(9+ol,:,:) ) * idel + rhs(5+ol,:,:) = rhs(5+ol,:,:) + & + ( a(1,5) * var(1+ol,:,:) + a(2,5) * var(2+ol,:,:) + & + a(3,5) * var(3+ol,:,:) + a(4,5) * var(4+ol,:,:) + & + a(5,5) * var(5+ol,:,:) + a(6,5) * var(6+ol,:,:) + & + a(7,5) * var(7+ol,:,:) + a(8,5) * var(8+ol,:,:) + & + a(9,5) * var(9+ol,:,:) + a(10,5) * var(10+ol,:,:) ) * idel + rhs(6+ol,:,:) = rhs(6+ol,:,:) + & + ( a(1,6) * var(1+ol,:,:) + a(2,6) * var(2+ol,:,:) + & + a(3,6) * var(3+ol,:,:) + a(4,6) * var(4+ol,:,:) + & + a(5,6) * var(5+ol,:,:) + a(6,6) * var(6+ol,:,:) + & + a(7,6) * var(7+ol,:,:) + a(8,6) * var(8+ol,:,:) + & + a(9,6) * var(9+ol,:,:) + a(10,6) * var(10+ol,:,:) + & + a(11,6) * var(11+ol,:,:) ) * idel + rhs(7+ol,:,:) = rhs(7+ol,:,:) + & + ( a(2,7) * var(2+ol,:,:) + a(3,7) * var(3+ol,:,:) + & + a(4,7) * var(4+ol,:,:) + a(5,7) * var(5+ol,:,:) + & + a(6,7) * var(6+ol,:,:) + a(7,7) * var(7+ol,:,:) + & + a(8,7) * var(8+ol,:,:) + a(9,7) * var(9+ol,:,:) + & + a(10,7) * var(10+ol,:,:) + a(11,7) * var(11+ol,:,:) + & + a(12,7) * var(12+ol,:,:) ) * idel + rhs(8+ol,:,:) = rhs(8+ol,:,:) + & + ( a(3,8) * var(3+ol,:,:) + a(4,8) * var(4+ol,:,:) + & + a(5,8) * var(5+ol,:,:) + a(6,8) * var(6+ol,:,:) + & + a(7,8) * var(7+ol,:,:) + a(8,8) * var(8+ol,:,:) + & + a(9,8) * var(9+ol,:,:) + a(10,8) * var(10+ol,:,:) + & + a(11,8) * var(11+ol,:,:) + a(12,8) * var(12+ol,:,:) + & + a(13,8) * var(13+ol,:,:) ) * idel - il = 9 + il = 9 + ol end if if ( bb(2) == 0 ) then ir = ni - gsize(1) else - rhs(ni-7,:,:) = rhs(ni-7,:,:) + & - ( a(3,8) * var(ni-2,:,:) + a(4,8) * var(ni-3,:,:) + & - a(5,8) * var(ni-4,:,:) + a(6,8) * var(ni-5,:,:) + & - a(7,8) * var(ni-6,:,:) + a(8,8) * var(ni-7,:,:) + & - a(9,8) * var(ni-8,:,:) + a(10,8) * var(ni-9,:,:) + & - a(11,8) * var(ni-10,:,:) + a(12,8) * var(ni-11,:,:) + & - a(13,8) * var(ni-12,:,:) ) * idel - rhs(ni-6,:,:) = rhs(ni-6,:,:) + & - ( a(2,7) * var(ni-1,:,:) + a(3,7) * var(ni-2,:,:) + & - a(4,7) * var(ni-3,:,:) + a(5,7) * var(ni-4,:,:) + & - a(6,7) * var(ni-5,:,:) + a(7,7) * var(ni-6,:,:) + & - a(8,7) * var(ni-7,:,:) + a(9,7) * var(ni-8,:,:) + & - a(10,7) * var(ni-9,:,:) + a(11,7) * var(ni-10,:,:) + & - a(12,7) * var(ni-11,:,:) ) * idel - rhs(ni-5,:,:) = rhs(ni-5,:,:) + & - ( a(1,6) * var(ni,:,:) + a(2,6) * var(ni-1,:,:) + & - a(3,6) * var(ni-2,:,:) + a(4,6) * var(ni-3,:,:) + & - a(5,6) * var(ni-4,:,:) + a(6,6) * var(ni-5,:,:) + & - a(7,6) * var(ni-6,:,:) + a(8,6) * var(ni-7,:,:) + & - a(9,6) * var(ni-8,:,:) + a(10,6) * var(ni-9,:,:) + & - a(11,6) * var(ni-10,:,:) ) * idel - rhs(ni-4,:,:) = rhs(ni-4,:,:) + & - ( a(1,5) * var(ni,:,:) + a(2,5) * var(ni-1,:,:) + & - a(3,5) * var(ni-2,:,:) + a(4,5) * var(ni-3,:,:) + & - a(5,5) * var(ni-4,:,:) + a(6,5) * var(ni-5,:,:) + & - a(7,5) * var(ni-6,:,:) + a(8,5) * var(ni-7,:,:) + & - a(9,5) * var(ni-8,:,:) + a(10,5) * var(ni-9,:,:) ) * idel - rhs(ni-3,:,:) = rhs(ni-3,:,:) + & - ( a(1,4) * var(ni,:,:) + a(2,4) * var(ni-1,:,:) + & - a(3,4) * var(ni-2,:,:) + a(4,4) * var(ni-3,:,:) + & - a(5,4) * var(ni-4,:,:) + a(6,4) * var(ni-5,:,:) + & - a(7,4) * var(ni-6,:,:) + a(8,4) * var(ni-7,:,:) + & - a(9,4) * var(ni-8,:,:) ) * idel - rhs(ni-2,:,:) = rhs(ni-2,:,:) + & - ( a(1,3) * var(ni,:,:) + a(2,3) * var(ni-1,:,:) + & - a(3,3) * var(ni-2,:,:) + a(4,3) * var(ni-3,:,:) + & - a(5,3) * var(ni-4,:,:) + a(6,3) * var(ni-5,:,:) + & - a(7,3) * var(ni-6,:,:) + a(8,3) * var(ni-7,:,:) ) * idel - rhs(ni-1,:,:) = rhs(ni-1,:,:) + & - ( a(1,2) * var(ni,:,:) + a(2,2) * var(ni-1,:,:) + & - a(3,2) * var(ni-2,:,:) + a(4,2) * var(ni-3,:,:) + & - a(5,2) * var(ni-4,:,:) + a(6,2) * var(ni-5,:,:) + & - a(7,2) * var(ni-6,:,:) ) * idel - rhs(ni,:,:) = rhs(ni,:,:) + & - ( a(1,1) * var(ni,:,:) + a(2,1) * var(ni-1,:,:) + & - a(3,1) * var(ni-2,:,:) + a(4,1) * var(ni-3,:,:) + & - a(5,1) * var(ni-4,:,:) + a(6,1) * var(ni-5,:,:) ) * idel + or = ni - offset(2) + rhs(or-7,:,:) = rhs(or-7,:,:) + & + ( a(3,8) * var(or-2,:,:) + a(4,8) * var(or-3,:,:) + & + a(5,8) * var(or-4,:,:) + a(6,8) * var(or-5,:,:) + & + a(7,8) * var(or-6,:,:) + a(8,8) * var(or-7,:,:) + & + a(9,8) * var(or-8,:,:) + a(10,8) * var(or-9,:,:) + & + a(11,8) * var(or-10,:,:) + a(12,8) * var(or-11,:,:) + & + a(13,8) * var(or-12,:,:) ) * idel + rhs(or-6,:,:) = rhs(or-6,:,:) + & + ( a(2,7) * var(or-1,:,:) + a(3,7) * var(or-2,:,:) + & + a(4,7) * var(or-3,:,:) + a(5,7) * var(or-4,:,:) + & + a(6,7) * var(or-5,:,:) + a(7,7) * var(or-6,:,:) + & + a(8,7) * var(or-7,:,:) + a(9,7) * var(or-8,:,:) + & + a(10,7) * var(or-9,:,:) + a(11,7) * var(or-10,:,:) + & + a(12,7) * var(or-11,:,:) ) * idel + rhs(or-5,:,:) = rhs(or-5,:,:) + & + ( a(1,6) * var(or,:,:) + a(2,6) * var(or-1,:,:) + & + a(3,6) * var(or-2,:,:) + a(4,6) * var(or-3,:,:) + & + a(5,6) * var(or-4,:,:) + a(6,6) * var(or-5,:,:) + & + a(7,6) * var(or-6,:,:) + a(8,6) * var(or-7,:,:) + & + a(9,6) * var(or-8,:,:) + a(10,6) * var(or-9,:,:) + & + a(11,6) * var(or-10,:,:) ) * idel + rhs(or-4,:,:) = rhs(or-4,:,:) + & + ( a(1,5) * var(or,:,:) + a(2,5) * var(or-1,:,:) + & + a(3,5) * var(or-2,:,:) + a(4,5) * var(or-3,:,:) + & + a(5,5) * var(or-4,:,:) + a(6,5) * var(or-5,:,:) + & + a(7,5) * var(or-6,:,:) + a(8,5) * var(or-7,:,:) + & + a(9,5) * var(or-8,:,:) + a(10,5) * var(or-9,:,:) ) * idel + rhs(or-3,:,:) = rhs(or-3,:,:) + & + ( a(1,4) * var(or,:,:) + a(2,4) * var(or-1,:,:) + & + a(3,4) * var(or-2,:,:) + a(4,4) * var(or-3,:,:) + & + a(5,4) * var(or-4,:,:) + a(6,4) * var(or-5,:,:) + & + a(7,4) * var(or-6,:,:) + a(8,4) * var(or-7,:,:) + & + a(9,4) * var(or-8,:,:) ) * idel + rhs(or-2,:,:) = rhs(or-2,:,:) + & + ( a(1,3) * var(or,:,:) + a(2,3) * var(or-1,:,:) + & + a(3,3) * var(or-2,:,:) + a(4,3) * var(or-3,:,:) + & + a(5,3) * var(or-4,:,:) + a(6,3) * var(or-5,:,:) + & + a(7,3) * var(or-6,:,:) + a(8,3) * var(or-7,:,:) ) * idel + rhs(or-1,:,:) = rhs(or-1,:,:) + & + ( a(1,2) * var(or,:,:) + a(2,2) * var(or-1,:,:) + & + a(3,2) * var(or-2,:,:) + a(4,2) * var(or-3,:,:) + & + a(5,2) * var(or-4,:,:) + a(6,2) * var(or-5,:,:) + & + a(7,2) * var(or-6,:,:) ) * idel + rhs(or,:,:) = rhs(or,:,:) + & + ( a(1,1) * var(or,:,:) + a(2,1) * var(or-1,:,:) + & + a(3,1) * var(or-2,:,:) + a(4,1) * var(or-3,:,:) + & + a(5,1) * var(or-4,:,:) + a(6,1) * var(or-5,:,:) ) * idel - ir = ni - 8 + ir = or - 8 end if rhs(il:ir,:,:) = rhs(il:ir,:,:) + & ( -252.0_wp * var(il:ir,:,:) + & @@ -155,108 +158,110 @@ subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(3) == 0 ) then jl = 1 + gsize(2) else - rhs(:,1,:) = rhs(:,1,:) + & - ( a(1,1) * var(:,1,:) + a(2,1) * var(:,2,:) + & - a(3,1) * var(:,3,:) + a(4,1) * var(:,4,:) + & - a(5,1) * var(:,5,:) + a(6,1) * var(:,6,:) ) * idel - rhs(:,2,:) = rhs(:,2,:) + & - ( a(1,2) * var(:,1,:) + a(2,2) * var(:,2,:) + & - a(3,2) * var(:,3,:) + a(4,2) * var(:,4,:) + & - a(5,2) * var(:,5,:) + a(6,2) * var(:,6,:) + & - a(7,2) * var(:,7,:) ) * idel - rhs(:,3,:) = rhs(:,3,:) + & - ( a(1,3) * var(:,1,:) + a(2,3) * var(:,2,:) + & - a(3,3) * var(:,3,:) + a(4,3) * var(:,4,:) + & - a(5,3) * var(:,5,:) + a(6,3) * var(:,6,:) + & - a(7,3) * var(:,7,:) + a(8,3) * var(:,8,:) ) * idel - rhs(:,4,:) = rhs(:,4,:) + & - ( a(1,4) * var(:,1,:) + a(2,4) * var(:,2,:) + & - a(3,4) * var(:,3,:) + a(4,4) * var(:,4,:) + & - a(5,4) * var(:,5,:) + a(6,4) * var(:,6,:) + & - a(7,4) * var(:,7,:) + a(8,4) * var(:,8,:) + & - a(9,4) * var(:,9,:) ) * idel - rhs(:,5,:) = rhs(:,5,:) + & - ( a(1,5) * var(:,1,:) + a(2,5) * var(:,2,:) + & - a(3,5) * var(:,3,:) + a(4,5) * var(:,4,:) + & - a(5,5) * var(:,5,:) + a(6,5) * var(:,6,:) + & - a(7,5) * var(:,7,:) + a(8,5) * var(:,8,:) + & - a(9,5) * var(:,9,:) + a(10,5) * var(:,10,:) ) * idel - rhs(:,6,:) = rhs(:,6,:) + & - ( a(1,6) * var(:,1,:) + a(2,6) * var(:,2,:) + & - a(3,6) * var(:,3,:) + a(4,6) * var(:,4,:) + & - a(5,6) * var(:,5,:) + a(6,6) * var(:,6,:) + & - a(7,6) * var(:,7,:) + a(8,6) * var(:,8,:) + & - a(9,6) * var(:,9,:) + a(10,6) * var(:,10,:) + & - a(11,6) * var(:,11,:) ) * idel - rhs(:,7,:) = rhs(:,7,:) + & - ( a(2,7) * var(:,2,:) + a(3,7) * var(:,3,:) + & - a(4,7) * var(:,4,:) + a(5,7) * var(:,5,:) + & - a(6,7) * var(:,6,:) + a(7,7) * var(:,7,:) + & - a(8,7) * var(:,8,:) + a(9,7) * var(:,9,:) + & - a(10,7) * var(:,10,:) + a(11,7) * var(:,11,:) + & - a(12,7) * var(:,12,:) ) * idel - rhs(:,8,:) = rhs(:,8,:) + & - ( a(3,8) * var(:,3,:) + a(4,8) * var(:,4,:) + & - a(5,8) * var(:,5,:) + a(6,8) * var(:,6,:) + & - a(7,8) * var(:,7,:) + a(8,8) * var(:,8,:) + & - a(9,8) * var(:,9,:) + a(10,8) * var(:,10,:) + & - a(11,8) * var(:,11,:) + a(12,8) * var(:,12,:) + & - a(13,8) * var(:,13,:) ) * idel + ol = offset(5); + rhs(:,1+ol,:) = rhs(:,1+ol,:) + & + ( a(1,1) * var(:,1+ol,:) + a(2,1) * var(:,2+ol,:) + & + a(3,1) * var(:,3+ol,:) + a(4,1) * var(:,4+ol,:) + & + a(5,1) * var(:,5+ol,:) + a(6,1) * var(:,6+ol,:) ) * idel + rhs(:,2+ol,:) = rhs(:,2+ol,:) + & + ( a(1,2) * var(:,1+ol,:) + a(2,2) * var(:,2+ol,:) + & + a(3,2) * var(:,3+ol,:) + a(4,2) * var(:,4+ol,:) + & + a(5,2) * var(:,5+ol,:) + a(6,2) * var(:,6+ol,:) + & + a(7,2) * var(:,7+ol,:) ) * idel + rhs(:,3+ol,:) = rhs(:,3+ol,:) + & + ( a(1,3) * var(:,1+ol,:) + a(2,3) * var(:,2+ol,:) + & + a(3,3) * var(:,3+ol,:) + a(4,3) * var(:,4+ol,:) + & + a(5,3) * var(:,5+ol,:) + a(6,3) * var(:,6+ol,:) + & + a(7,3) * var(:,7+ol,:) + a(8,3) * var(:,8+ol,:) ) * idel + rhs(:,4+ol,:) = rhs(:,4+ol,:) + & + ( a(1,4) * var(:,1+ol,:) + a(2,4) * var(:,2+ol,:) + & + a(3,4) * var(:,3+ol,:) + a(4,4) * var(:,4+ol,:) + & + a(5,4) * var(:,5+ol,:) + a(6,4) * var(:,6+ol,:) + & + a(7,4) * var(:,7+ol,:) + a(8,4) * var(:,8+ol,:) + & + a(9,4) * var(:,9+ol,:) ) * idel + rhs(:,5+ol,:) = rhs(:,5+ol,:) + & + ( a(1,5) * var(:,1+ol,:) + a(2,5) * var(:,2+ol,:) + & + a(3,5) * var(:,3+ol,:) + a(4,5) * var(:,4+ol,:) + & + a(5,5) * var(:,5+ol,:) + a(6,5) * var(:,6+ol,:) + & + a(7,5) * var(:,7+ol,:) + a(8,5) * var(:,8+ol,:) + & + a(9,5) * var(:,9+ol,:) + a(10,5) * var(:,10+ol,:) ) * idel + rhs(:,6+ol,:) = rhs(:,6+ol,:) + & + ( a(1,6) * var(:,1+ol,:) + a(2,6) * var(:,2+ol,:) + & + a(3,6) * var(:,3+ol,:) + a(4,6) * var(:,4+ol,:) + & + a(5,6) * var(:,5+ol,:) + a(6,6) * var(:,6+ol,:) + & + a(7,6) * var(:,7+ol,:) + a(8,6) * var(:,8+ol,:) + & + a(9,6) * var(:,9+ol,:) + a(10,6) * var(:,10+ol,:) + & + a(11,6) * var(:,11+ol,:) ) * idel + rhs(:,7+ol,:) = rhs(:,7+ol,:) + & + ( a(2,7) * var(:,2+ol,:) + a(3,7) * var(:,3+ol,:) + & + a(4,7) * var(:,4+ol,:) + a(5,7) * var(:,5+ol,:) + & + a(6,7) * var(:,6+ol,:) + a(7,7) * var(:,7+ol,:) + & + a(8,7) * var(:,8+ol,:) + a(9,7) * var(:,9+ol,:) + & + a(10,7) * var(:,10+ol,:) + a(11,7) * var(:,11+ol,:) + & + a(12,7) * var(:,12+ol,:) ) * idel + rhs(:,8+ol,:) = rhs(:,8+ol,:) + & + ( a(3,8) * var(:,3+ol,:) + a(4,8) * var(:,4+ol,:) + & + a(5,8) * var(:,5+ol,:) + a(6,8) * var(:,6+ol,:) + & + a(7,8) * var(:,7+ol,:) + a(8,8) * var(:,8+ol,:) + & + a(9,8) * var(:,9+ol,:) + a(10,8) * var(:,10+ol,:) + & + a(11,8) * var(:,11+ol,:) + a(12,8) * var(:,12+ol,:) + & + a(13,8) * var(:,13+ol,:) ) * idel - jl = 9 + jl = 9 + ol end if if ( bb(4) == 0 ) then jr = nj - gsize(2) else - rhs(:,nj-7,:) = rhs(:,nj-7,:) + & - ( a(3,8) * var(:,nj-2,:) + a(4,8) * var(:,nj-3,:) + & - a(5,8) * var(:,nj-4,:) + a(6,8) * var(:,nj-5,:) + & - a(7,8) * var(:,nj-6,:) + a(8,8) * var(:,nj-7,:) + & - a(9,8) * var(:,nj-8,:) + a(10,8) * var(:,nj-9,:) + & - a(11,8) * var(:,nj-10,:) + a(12,8) * var(:,nj-11,:) + & - a(13,8) * var(:,nj-12,:) ) * idel - rhs(:,nj-6,:) = rhs(:,nj-6,:) + & - ( a(2,7) * var(:,nj-1,:) + a(3,7) * var(:,nj-2,:) + & - a(4,7) * var(:,nj-3,:) + a(5,7) * var(:,nj-4,:) + & - a(6,7) * var(:,nj-5,:) + a(7,7) * var(:,nj-6,:) + & - a(8,7) * var(:,nj-7,:) + a(9,7) * var(:,nj-8,:) + & - a(10,7) * var(:,nj-9,:) + a(11,7) * var(:,nj-10,:) + & - a(12,7) * var(:,nj-11,:) ) * idel - rhs(:,nj-5,:) = rhs(:,nj-5,:) + & - ( a(1,6) * var(:,nj,:) + a(2,6) * var(:,nj-1,:) + & - a(3,6) * var(:,nj-2,:) + a(4,6) * var(:,nj-3,:) + & - a(5,6) * var(:,nj-4,:) + a(6,6) * var(:,nj-5,:) + & - a(7,6) * var(:,nj-6,:) + a(8,6) * var(:,nj-7,:) + & - a(9,6) * var(:,nj-8,:) + a(10,6) * var(:,nj-9,:) + & - a(11,6) * var(:,nj-10,:) ) * idel - rhs(:,nj-4,:) = rhs(:,nj-4,:) + & - ( a(1,5) * var(:,nj,:) + a(2,5) * var(:,nj-1,:) + & - a(3,5) * var(:,nj-2,:) + a(4,5) * var(:,nj-3,:) + & - a(5,5) * var(:,nj-4,:) + a(6,5) * var(:,nj-5,:) + & - a(7,5) * var(:,nj-6,:) + a(8,5) * var(:,nj-7,:) + & - a(9,5) * var(:,nj-8,:) + a(10,5) * var(:,nj-9,:) ) * idel - rhs(:,nj-3,:) = rhs(:,nj-3,:) + & - ( a(1,4) * var(:,nj,:) + a(2,4) * var(:,nj-1,:) + & - a(3,4) * var(:,nj-2,:) + a(4,4) * var(:,nj-3,:) + & - a(5,4) * var(:,nj-4,:) + a(6,4) * var(:,nj-5,:) + & - a(7,4) * var(:,nj-6,:) + a(8,4) * var(:,nj-7,:) + & - a(9,4) * var(:,nj-8,:) ) * idel - rhs(:,nj-2,:) = rhs(:,nj-2,:) + & - ( a(1,3) * var(:,nj,:) + a(2,3) * var(:,nj-1,:) + & - a(3,3) * var(:,nj-2,:) + a(4,3) * var(:,nj-3,:) + & - a(5,3) * var(:,nj-4,:) + a(6,3) * var(:,nj-5,:) + & - a(7,3) * var(:,nj-6,:) + a(8,3) * var(:,nj-7,:) ) * idel - rhs(:,nj-1,:) = rhs(:,nj-1,:) + & - ( a(1,2) * var(:,nj,:) + a(2,2) * var(:,nj-1,:) + & - a(3,2) * var(:,nj-2,:) + a(4,2) * var(:,nj-3,:) + & - a(5,2) * var(:,nj-4,:) + a(6,2) * var(:,nj-5,:) + & - a(7,2) * var(:,nj-6,:) ) * idel - rhs(:,nj,:) = rhs(:,nj,:) + & - ( a(1,1) * var(:,nj,:) + a(2,1) * var(:,nj-1,:) + & - a(3,1) * var(:,nj-2,:) + a(4,1) * var(:,nj-3,:) + & - a(5,1) * var(:,nj-4,:) + a(6,1) * var(:,nj-5,:) ) * idel + or = nj - offset(4) + rhs(:,or-7,:) = rhs(:,or-7,:) + & + ( a(3,8) * var(:,or-2,:) + a(4,8) * var(:,or-3,:) + & + a(5,8) * var(:,or-4,:) + a(6,8) * var(:,or-5,:) + & + a(7,8) * var(:,or-6,:) + a(8,8) * var(:,or-7,:) + & + a(9,8) * var(:,or-8,:) + a(10,8) * var(:,or-9,:) + & + a(11,8) * var(:,or-10,:) + a(12,8) * var(:,or-11,:) + & + a(13,8) * var(:,or-12,:) ) * idel + rhs(:,or-6,:) = rhs(:,or-6,:) + & + ( a(2,7) * var(:,or-1,:) + a(3,7) * var(:,or-2,:) + & + a(4,7) * var(:,or-3,:) + a(5,7) * var(:,or-4,:) + & + a(6,7) * var(:,or-5,:) + a(7,7) * var(:,or-6,:) + & + a(8,7) * var(:,or-7,:) + a(9,7) * var(:,or-8,:) + & + a(10,7) * var(:,or-9,:) + a(11,7) * var(:,or-10,:) + & + a(12,7) * var(:,or-11,:) ) * idel + rhs(:,or-5,:) = rhs(:,or-5,:) + & + ( a(1,6) * var(:,or,:) + a(2,6) * var(:,or-1,:) + & + a(3,6) * var(:,or-2,:) + a(4,6) * var(:,or-3,:) + & + a(5,6) * var(:,or-4,:) + a(6,6) * var(:,or-5,:) + & + a(7,6) * var(:,or-6,:) + a(8,6) * var(:,or-7,:) + & + a(9,6) * var(:,or-8,:) + a(10,6) * var(:,or-9,:) + & + a(11,6) * var(:,or-10,:) ) * idel + rhs(:,or-4,:) = rhs(:,or-4,:) + & + ( a(1,5) * var(:,or,:) + a(2,5) * var(:,or-1,:) + & + a(3,5) * var(:,or-2,:) + a(4,5) * var(:,or-3,:) + & + a(5,5) * var(:,or-4,:) + a(6,5) * var(:,or-5,:) + & + a(7,5) * var(:,or-6,:) + a(8,5) * var(:,or-7,:) + & + a(9,5) * var(:,or-8,:) + a(10,5) * var(:,or-9,:) ) * idel + rhs(:,or-3,:) = rhs(:,or-3,:) + & + ( a(1,4) * var(:,or,:) + a(2,4) * var(:,or-1,:) + & + a(3,4) * var(:,or-2,:) + a(4,4) * var(:,or-3,:) + & + a(5,4) * var(:,or-4,:) + a(6,4) * var(:,or-5,:) + & + a(7,4) * var(:,or-6,:) + a(8,4) * var(:,or-7,:) + & + a(9,4) * var(:,or-8,:) ) * idel + rhs(:,or-2,:) = rhs(:,or-2,:) + & + ( a(1,3) * var(:,or,:) + a(2,3) * var(:,or-1,:) + & + a(3,3) * var(:,or-2,:) + a(4,3) * var(:,or-3,:) + & + a(5,3) * var(:,or-4,:) + a(6,3) * var(:,or-5,:) + & + a(7,3) * var(:,or-6,:) + a(8,3) * var(:,or-7,:) ) * idel + rhs(:,or-1,:) = rhs(:,or-1,:) + & + ( a(1,2) * var(:,or,:) + a(2,2) * var(:,or-1,:) + & + a(3,2) * var(:,or-2,:) + a(4,2) * var(:,or-3,:) + & + a(5,2) * var(:,or-4,:) + a(6,2) * var(:,or-5,:) + & + a(7,2) * var(:,or-6,:) ) * idel + rhs(:,or,:) = rhs(:,or,:) + & + ( a(1,1) * var(:,or,:) + a(2,1) * var(:,or-1,:) + & + a(3,1) * var(:,or-2,:) + a(4,1) * var(:,or-3,:) + & + a(5,1) * var(:,or-4,:) + a(6,1) * var(:,or-5,:) ) * idel - jr = nj - 8 + jr = or - 8 end if rhs(:,jl:jr,:) = rhs(:,jl:jr,:) + & ( -252.0_wp * var(:,jl:jr,:) + & @@ -280,108 +285,110 @@ subroutine dissipation_8_4_alt (var, ni, nj, nk, bb, gsize, delta, epsilon, rhs) if ( bb(5) == 0 ) then kl = 1 + gsize(3) else - rhs(:,:,1) = rhs(:,:,1) + & - ( a(1,1) * var(:,:,1) + a(2,1) * var(:,:,2) + & - a(3,1) * var(:,:,3) + a(4,1) * var(:,:,4) + & - a(5,1) * var(:,:,5) + a(6,1) * var(:,:,6) ) * idel - rhs(:,:,2) = rhs(:,:,2) + & - ( a(1,2) * var(:,:,1) + a(2,2) * var(:,:,2) + & - a(3,2) * var(:,:,3) + a(4,2) * var(:,:,4) + & - a(5,2) * var(:,:,5) + a(6,2) * var(:,:,6) + & - a(7,2) * var(:,:,7) ) * idel - rhs(:,:,3) = rhs(:,:,3) + & - ( a(1,3) * var(:,:,1) + a(2,3) * var(:,:,2) + & - a(3,3) * var(:,:,3) + a(4,3) * var(:,:,4) + & - a(5,3) * var(:,:,5) + a(6,3) * var(:,:,6) + & - a(7,3) * var(:,:,7) + a(8,3) * var(:,:,8) ) * idel - rhs(:,:,4) = rhs(:,:,4) + & - ( a(1,4) * var(:,:,1) + a(2,4) * var(:,:,2) + & - a(3,4) * var(:,:,3) + a(4,4) * var(:,:,4) + & - a(5,4) * var(:,:,5) + a(6,4) * var(:,:,6) + & - a(7,4) * var(:,:,7) + a(8,4) * var(:,:,8) + & - a(9,4) * var(:,:,9) ) * idel - rhs(:,:,5) = rhs(:,:,5) + & - ( a(1,5) * var(:,:,1) + a(2,5) * var(:,:,2) + & - a(3,5) * var(:,:,3) + a(4,5) * var(:,:,4) + & - a(5,5) * var(:,:,5) + a(6,5) * var(:,:,6) + & - a(7,5) * var(:,:,7) + a(8,5) * var(:,:,8) + & - a(9,5) * var(:,:,9) + a(10,5) * var(:,:,10) ) * idel - rhs(:,:,6) = rhs(:,:,6) + & - ( a(1,6) * var(:,:,1) + a(2,6) * var(:,:,2) + & - a(3,6) * var(:,:,3) + a(4,6) * var(:,:,4) + & - a(5,6) * var(:,:,5) + a(6,6) * var(:,:,6) + & - a(7,6) * var(:,:,7) + a(8,6) * var(:,:,8) + & - a(9,6) * var(:,:,9) + a(10,6) * var(:,:,10) + & - a(11,6) * var(:,:,11) ) * idel - rhs(:,:,7) = rhs(:,:,7) + & - ( a(2,7) * var(:,:,2) + a(3,7) * var(:,:,3) + & - a(4,7) * var(:,:,4) + a(5,7) * var(:,:,5) + & - a(6,7) * var(:,:,6) + a(7,7) * var(:,:,7) + & - a(8,7) * var(:,:,8) + a(9,7) * var(:,:,9) + & - a(10,7) * var(:,:,10) + a(11,7) * var(:,:,11) + & - a(12,7) * var(:,:,12) ) * idel - rhs(:,:,8) = rhs(:,:,8) + & - ( a(3,8) * var(:,:,3) + a(4,8) * var(:,:,4) + & - a(5,8) * var(:,:,5) + a(6,8) * var(:,:,6) + & - a(7,8) * var(:,:,7) + a(8,8) * var(:,:,8) + & - a(9,8) * var(:,:,9) + a(10,8) * var(:,:,10) + & - a(11,8) * var(:,:,11) + a(12,8) * var(:,:,12) + & - a(13,8) * var(:,:,13) ) * idel + ol = offset(5); + rhs(:,:,1+ol) = rhs(:,:,1+ol) + & + ( a(1,1) * var(:,:,1+ol) + a(2,1) * var(:,:,2+ol) + & + a(3,1) * var(:,:,3+ol) + a(4,1) * var(:,:,4+ol) + & + a(5,1) * var(:,:,5+ol) + a(6,1) * var(:,:,6+ol ) ) * idel + rhs(:,:,2+ol) = rhs(:,:,2+ol) + & + ( a(1,2) * var(:,:,1+ol) + a(2,2) * var(:,:,2+ol) + & + a(3,2) * var(:,:,3+ol) + a(4,2) * var(:,:,4+ol) + & + a(5,2) * var(:,:,5+ol) + a(6,2) * var(:,:,6+ol) + & + a(7,2) * var(:,:,7+ol ) ) * idel + rhs(:,:,3+ol) = rhs(:,:,3+ol) + & + ( a(1,3) * var(:,:,1+ol) + a(2,3) * var(:,:,2+ol) + & + a(3,3) * var(:,:,3+ol) + a(4,3) * var(:,:,4+ol) + & + a(5,3) * var(:,:,5+ol) + a(6,3) * var(:,:,6+ol) + & + a(7,3) * var(:,:,7+ol) + a(8,3) * var(:,:,8+ol ) ) * idel + rhs(:,:,4+ol) = rhs(:,:,4+ol) + & + ( a(1,4) * var(:,:,1+ol) + a(2,4) * var(:,:,2+ol) + & + a(3,4) * var(:,:,3+ol) + a(4,4) * var(:,:,4+ol) + & + a(5,4) * var(:,:,5+ol) + a(6,4) * var(:,:,6+ol) + & + a(7,4) * var(:,:,7+ol) + a(8,4) * var(:,:,8+ol) + & + a(9,4) * var(:,:,9+ol ) ) * idel + rhs(:,:,5+ol) = rhs(:,:,5+ol) + & + ( a(1,5) * var(:,:,1+ol) + a(2,5) * var(:,:,2+ol) + & + a(3,5) * var(:,:,3+ol) + a(4,5) * var(:,:,4+ol) + & + a(5,5) * var(:,:,5+ol) + a(6,5) * var(:,:,6+ol) + & + a(7,5) * var(:,:,7+ol) + a(8,5) * var(:,:,8+ol) + & + a(9,5) * var(:,:,9+ol) + a(10,5) * var(:,:,10+ol ) ) * idel + rhs(:,:,6+ol) = rhs(:,:,6+ol) + & + ( a(1,6) * var(:,:,1+ol) + a(2,6) * var(:,:,2+ol) + & + a(3,6) * var(:,:,3+ol) + a(4,6) * var(:,:,4+ol) + & + a(5,6) * var(:,:,5+ol) + a(6,6) * var(:,:,6+ol) + & + a(7,6) * var(:,:,7+ol) + a(8,6) * var(:,:,8+ol) + & + a(9,6) * var(:,:,9+ol) + a(10,6) * var(:,:,10+ol) + & + a(11,6) * var(:,:,11+ol ) ) * idel + rhs(:,:,7+ol) = rhs(:,:,7+ol) + & + ( a(2,7) * var(:,:,2+ol) + a(3,7) * var(:,:,3+ol) + & + a(4,7) * var(:,:,4+ol) + a(5,7) * var(:,:,5+ol) + & + a(6,7) * var(:,:,6+ol) + a(7,7) * var(:,:,7+ol) + & + a(8,7) * var(:,:,8+ol) + a(9,7) * var(:,:,9+ol) + & + a(10,7) * var(:,:,10+ol) + a(11,7) * var(:,:,11+ol) + & + a(12,7) * var(:,:,12+ol ) ) * idel + rhs(:,:,8+ol) = rhs(:,:,8+ol) + & + ( a(3,8) * var(:,:,3+ol) + a(4,8) * var(:,:,4+ol) + & + a(5,8) * var(:,:,5+ol) + a(6,8) * var(:,:,6+ol) + & + a(7,8) * var(:,:,7+ol) + a(8,8) * var(:,:,8+ol) + & + a(9,8) * var(:,:,9+ol) + a(10,8) * var(:,:,10+ol) + & + a(11,8) * var(:,:,11+ol) + a(12,8) * var(:,:,12+ol) + & + a(13,8) * var(:,:,13+ol ) ) * idel - kl = 9 + kl = 9 + ol end if if ( bb(6) == 0 ) then kr = nk - gsize(3) else - rhs(:,:,nk-7) = rhs(:,:,nk-7) + & - ( a(3,8) * var(:,:,nk-2) + a(4,8) * var(:,:,nk-3) + & - a(5,8) * var(:,:,nk-4) + a(6,8) * var(:,:,nk-5) + & - a(7,8) * var(:,:,nk-6) + a(8,8) * var(:,:,nk-7) + & - a(9,8) * var(:,:,nk-8) + a(10,8) * var(:,:,nk-9) + & - a(11,8) * var(:,:,nk-10) + a(12,8) * var(:,:,nk-11) + & - a(13,8) * var(:,:,nk-12) ) * idel - rhs(:,:,nk-6) = rhs(:,:,nk-6) + & - ( a(2,7) * var(:,:,nk-1) + a(3,7) * var(:,:,nk-2) + & - a(4,7) * var(:,:,nk-3) + a(5,7) * var(:,:,nk-4) + & - a(6,7) * var(:,:,nk-5) + a(7,7) * var(:,:,nk-6) + & - a(8,7) * var(:,:,nk-7) + a(9,7) * var(:,:,nk-8) + & - a(10,7) * var(:,:,nk-9) + a(11,7) * var(:,:,nk-10) + & - a(12,7) * var(:,:,nk-11) ) * idel - rhs(:,:,nk-5) = rhs(:,:,nk-5) + & - ( a(1,6) * var(:,:,nk) + a(2,6) * var(:,:,nk-1) + & - a(3,6) * var(:,:,nk-2) + a(4,6) * var(:,:,nk-3) + & - a(5,6) * var(:,:,nk-4) + a(6,6) * var(:,:,nk-5) + & - a(7,6) * var(:,:,nk-6) + a(8,6) * var(:,:,nk-7) + & - a(9,6) * var(:,:,nk-8) + a(10,6) * var(:,:,nk-9) + & - a(11,6) * var(:,:,nk-10) ) * idel - rhs(:,:,nk-4) = rhs(:,:,nk-4) + & - ( a(1,5) * var(:,:,nk) + a(2,5) * var(:,:,nk-1) + & - a(3,5) * var(:,:,nk-2) + a(4,5) * var(:,:,nk-3) + & - a(5,5) * var(:,:,nk-4) + a(6,5) * var(:,:,nk-5) + & - a(7,5) * var(:,:,nk-6) + a(8,5) * var(:,:,nk-7) + & - a(9,5) * var(:,:,nk-8) + a(10,5) * var(:,:,nk-9) ) * idel - rhs(:,:,nk-3) = rhs(:,:,nk-3) + & - ( a(1,4) * var(:,:,nk) + a(2,4) * var(:,:,nk-1) + & - a(3,4) * var(:,:,nk-2) + a(4,4) * var(:,:,nk-3) + & - a(5,4) * var(:,:,nk-4) + a(6,4) * var(:,:,nk-5) + & - a(7,4) * var(:,:,nk-6) + a(8,4) * var(:,:,nk-7) + & - a(9,4) * var(:,:,nk-8) ) * idel - rhs(:,:,nk-2) = rhs(:,:,nk-2) + & - ( a(1,3) * var(:,:,nk) + a(2,3) * var(:,:,nk-1) + & - a(3,3) * var(:,:,nk-2) + a(4,3) * var(:,:,nk-3) + & - a(5,3) * var(:,:,nk-4) + a(6,3) * var(:,:,nk-5) + & - a(7,3) * var(:,:,nk-6) + a(8,3) * var(:,:,nk-7) ) * idel - rhs(:,:,nk-1) = rhs(:,:,nk-1) + & - ( a(1,2) * var(:,:,nk) + a(2,2) * var(:,:,nk-1) + & - a(3,2) * var(:,:,nk-2) + a(4,2) * var(:,:,nk-3) + & - a(5,2) * var(:,:,nk-4) + a(6,2) * var(:,:,nk-5) + & - a(7,2) * var(:,:,nk-6) ) * idel - rhs(:,:,nk) = rhs(:,:,nk) + & - ( a(1,1) * var(:,:,nk) + a(2,1) * var(:,:,nk-1) + & - a(3,1) * var(:,:,nk-2) + a(4,1) * var(:,:,nk-3) + & - a(5,1) * var(:,:,nk-4) + a(6,1) * var(:,:,nk-5) ) * idel + or = nk - offset(6) + rhs(:,:,or-7) = rhs(:,:,or-7) + & + ( a(3,8) * var(:,:,or-2) + a(4,8) * var(:,:,or-3) + & + a(5,8) * var(:,:,or-4) + a(6,8) * var(:,:,or-5) + & + a(7,8) * var(:,:,or-6) + a(8,8) * var(:,:,or-7) + & + a(9,8) * var(:,:,or-8) + a(10,8) * var(:,:,or-9) + & + a(11,8) * var(:,:,or-10) + a(12,8) * var(:,:,or-11) + & + a(13,8) * var(:,:,or-12) ) * idel + rhs(:,:,or-6) = rhs(:,:,or-6) + & + ( a(2,7) * var(:,:,or-1) + a(3,7) * var(:,:,or-2) + & + a(4,7) * var(:,:,or-3) + a(5,7) * var(:,:,or-4) + & + a(6,7) * var(:,:,or-5) + a(7,7) * var(:,:,or-6) + & + a(8,7) * var(:,:,or-7) + a(9,7) * var(:,:,or-8) + & + a(10,7) * var(:,:,or-9) + a(11,7) * var(:,:,or-10) + & + a(12,7) * var(:,:,or-11) ) * idel + rhs(:,:,or-5) = rhs(:,:,or-5) + & + ( a(1,6) * var(:,:,or) + a(2,6) * var(:,:,or-1) + & + a(3,6) * var(:,:,or-2) + a(4,6) * var(:,:,or-3) + & + a(5,6) * var(:,:,or-4) + a(6,6) * var(:,:,or-5) + & + a(7,6) * var(:,:,or-6) + a(8,6) * var(:,:,or-7) + & + a(9,6) * var(:,:,or-8) + a(10,6) * var(:,:,or-9) + & + a(11,6) * var(:,:,or-10) ) * idel + rhs(:,:,or-4) = rhs(:,:,or-4) + & + ( a(1,5) * var(:,:,or) + a(2,5) * var(:,:,or-1) + & + a(3,5) * var(:,:,or-2) + a(4,5) * var(:,:,or-3) + & + a(5,5) * var(:,:,or-4) + a(6,5) * var(:,:,or-5) + & + a(7,5) * var(:,:,or-6) + a(8,5) * var(:,:,or-7) + & + a(9,5) * var(:,:,or-8) + a(10,5) * var(:,:,or-9) ) * idel + rhs(:,:,or-3) = rhs(:,:,or-3) + & + ( a(1,4) * var(:,:,or) + a(2,4) * var(:,:,or-1) + & + a(3,4) * var(:,:,or-2) + a(4,4) * var(:,:,or-3) + & + a(5,4) * var(:,:,or-4) + a(6,4) * var(:,:,or-5) + & + a(7,4) * var(:,:,or-6) + a(8,4) * var(:,:,or-7) + & + a(9,4) * var(:,:,or-8) ) * idel + rhs(:,:,or-2) = rhs(:,:,or-2) + & + ( a(1,3) * var(:,:,or) + a(2,3) * var(:,:,or-1) + & + a(3,3) * var(:,:,or-2) + a(4,3) * var(:,:,or-3) + & + a(5,3) * var(:,:,or-4) + a(6,3) * var(:,:,or-5) + & + a(7,3) * var(:,:,or-6) + a(8,3) * var(:,:,or-7) ) * idel + rhs(:,:,or-1) = rhs(:,:,or-1) + & + ( a(1,2) * var(:,:,or) + a(2,2) * var(:,:,or-1) + & + a(3,2) * var(:,:,or-2) + a(4,2) * var(:,:,or-3) + & + a(5,2) * var(:,:,or-4) + a(6,2) * var(:,:,or-5) + & + a(7,2) * var(:,:,or-6) ) * idel + rhs(:,:,or) = rhs(:,:,or) + & + ( a(1,1) * var(:,:,or) + a(2,1) * var(:,:,or-1) + & + a(3,1) * var(:,:,or-2) + a(4,1) * var(:,:,or-3) + & + a(5,1) * var(:,:,or-4) + a(6,1) * var(:,:,or-5) ) * idel - kr = nk - 8 + kr = or - 8 end if rhs(:,:,kl:kr) = rhs(:,:,kl:kr) + & ( -252.0_wp * var(:,:,kl:kr) + & diff --git a/src/call_derivs.c b/src/call_derivs.c index 992e028..aeab3d7 100644 --- a/src/call_derivs.c +++ b/src/call_derivs.c @@ -8,7 +8,6 @@ #include "stencil.h" - void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_REAL *var, CCTK_REAL *dvar, const CCTK_INT table_handle ) @@ -33,6 +32,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_4_2)(const CCTK_REAL *var, @@ -42,6 +42,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_4_3)(const CCTK_REAL *var, @@ -51,6 +52,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_4_3_opt)(const CCTK_REAL *var, @@ -60,6 +62,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_6_3)(const CCTK_REAL *var, @@ -69,6 +72,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_6_3_opt)(const CCTK_REAL *var, @@ -78,6 +82,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_6_5)(const CCTK_REAL *var, @@ -87,6 +92,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_6_5_opt)(const CCTK_REAL *var, @@ -96,6 +102,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_8_4)(const CCTK_REAL *var, @@ -105,6 +112,7 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, const CCTK_INT *dir, const CCTK_INT *bb, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *delta, CCTK_REAL *dvar); void CCTK_FCALL CCTK_FNAME(deriv_gf_8_4_opt)(const CCTK_REAL *var, @@ -225,19 +233,19 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, if ( CCTK_Equals(operator_type,"Minimal Bandwidth") ) { switch(loc_order) { case 2: { - CCTK_FNAME(deriv_gf_2_1)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_2_1)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 4: { - CCTK_FNAME(deriv_gf_4_2)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_4_2)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 6: { - CCTK_FNAME(deriv_gf_6_3)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_6_3)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 8: { - CCTK_FNAME(deriv_gf_8_4)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_8_4)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } default: @@ -246,15 +254,15 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, } else { switch(loc_order) { case 2: { - CCTK_FNAME(deriv_gf_2_1)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_2_1)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 4: { - CCTK_FNAME(deriv_gf_4_2)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_4_2)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 6: { - CCTK_FNAME(deriv_gf_6_3_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_6_3_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 8: { @@ -269,11 +277,11 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, if ( CCTK_Equals(operator_type,"Minimal Bandwidth") ) { switch(loc_order) { case 4: { - CCTK_FNAME(deriv_gf_4_3)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_4_3)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 6: { - CCTK_FNAME(deriv_gf_6_5)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_6_5)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } default: @@ -282,11 +290,11 @@ void DiffGv ( const CCTK_POINTER_TO_CONST cctkGH_, const CCTK_INT dir, } else { switch(loc_order) { case 4: { - CCTK_FNAME(deriv_gf_4_3_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_4_3_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } case 6: { - CCTK_FNAME(deriv_gf_6_5_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,&delta,dvar); + CCTK_FNAME(deriv_gf_6_5_opt)(var,&ni,&nj,&nk,&dir,bb,&gsize,loc_offset,&delta,dvar); break; } default: diff --git a/src/dissipation.c b/src/dissipation.c index bf6fc29..71fcab9 100644 --- a/src/dissipation.c +++ b/src/dissipation.c @@ -19,6 +19,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_4_3_opt) (const CCTK_REAL *var, const CCTK_INT *lbnd, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, const CCTK_REAL *diss_fraction, @@ -31,6 +32,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_4_3_alt) (const CCTK_REAL *var, const CCTK_INT *lbnd, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, const CCTK_REAL *diss_fraction, @@ -43,6 +45,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_6_5_opt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, const CCTK_REAL *diss_fraction, @@ -55,6 +58,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_6_5_alt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, const CCTK_REAL *diss_fraction, @@ -67,6 +71,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_2_1) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -76,6 +81,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_2_1_alt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -85,6 +91,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_4_2) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -94,6 +101,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_4_2_alt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -103,6 +111,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_6_3) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -112,6 +121,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_6_3_alt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -121,6 +131,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_8_4) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -130,6 +141,7 @@ void CCTK_FCALL CCTK_FNAME(dissipation_8_4_alt) (const CCTK_REAL *var, const CCTK_INT *nk, const CCTK_INT *bbox, const CCTK_INT *gsize, + const CCTK_INT *offset, const CCTK_REAL *dx, const CCTK_REAL *epsdis, CCTK_REAL *rhs); @@ -164,6 +176,9 @@ apply (int const varindex, char const * const optstring, void * const arg) CCTK_INT bbox[6]; int onesided[6]; CCTK_INT npatches, patch; + CCTK_INT offset[6]; + int type; + int i; assert (varindex >= 0); @@ -171,12 +186,41 @@ apply (int const varindex, char const * const optstring, void * const arg) dx[d] = CCTK_DELTA_SPACE(d)*h_scaling[d]; gsize[d] = cctk_nghostzones[d]; } - + + for (i=0; i<6; i++) { + offset[i] = 0; + } + if ( use_shiftout ) { + const CCTK_INT* shiftout_x_lower = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_x_lower", "coordbase", &type ); + if (shiftout_x_lower != NULL ) { + offset[0] = *shiftout_x_lower; + } + const CCTK_INT* shiftout_x_upper = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_x_upper", "coordbase", &type ); + if (shiftout_x_upper != NULL ) { + offset[1] = *shiftout_x_upper; + } + const CCTK_INT* shiftout_y_lower = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_y_lower", "coordbase", &type ); + if (shiftout_y_lower != NULL ) { + offset[2] = *shiftout_y_lower; + } + const CCTK_INT* shiftout_y_upper = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_y_upper", "coordbase", &type ); + if (shiftout_y_upper != NULL ) { + offset[3] = *shiftout_y_upper; + } + const CCTK_INT* shiftout_z_lower = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_z_lower", "coordbase", &type ); + if (shiftout_z_lower != NULL ) { + offset[4] = *shiftout_z_lower; + } + const CCTK_INT* shiftout_z_upper = (const CCTK_INT*) CCTK_ParameterGet ( "boundary_shiftout_z_upper", "coordbase", &type ); + if (shiftout_z_upper != NULL ) { + offset[5] = *shiftout_z_upper; + } + } + SBP_determine_onesided_stencil (cctkGH, onesided); for (d=0; d<6; ++d) { bbox[d] = onesided[d]; } - rhsindex = MoLQueryEvolvedRHS (varindex); if (rhsindex < 0) { char * const fullvarname = CCTK_FullName (varindex); @@ -228,11 +272,11 @@ apply (int const varindex, char const * const optstring, void * const arg) if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_2_1) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } else { CCTK_FNAME(dissipation_2_1_alt) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } break; } @@ -240,11 +284,11 @@ apply (int const varindex, char const * const optstring, void * const arg) if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_4_2) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } else { CCTK_FNAME(dissipation_4_2_alt) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } break; } @@ -252,11 +296,11 @@ apply (int const varindex, char const * const optstring, void * const arg) if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_6_3) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } else { CCTK_FNAME(dissipation_6_3_alt) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } break; } @@ -264,11 +308,11 @@ apply (int const varindex, char const * const optstring, void * const arg) if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_8_4) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } else { CCTK_FNAME(dissipation_8_4_alt) (varptr, &cctk_lsh[0], &cctk_lsh[1], &cctk_lsh[2], - bbox, gsize, dx, &epsdis, rhsptr); + bbox, gsize, offset, dx, &epsdis, rhsptr); } break; } @@ -282,11 +326,11 @@ apply (int const varindex, char const * const optstring, void * const arg) case 4: { if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_4_3_opt) - (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, + (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset, dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr); } else { CCTK_FNAME(dissipation_4_3_alt) - (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, + (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset, dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr); } break; @@ -294,11 +338,11 @@ apply (int const varindex, char const * const optstring, void * const arg) case 6: { if ( CCTK_Equals(dissipation_type,"Mattson-Svard-Nordstrom") ) { CCTK_FNAME(dissipation_6_5_opt) - (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, + (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset, dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr); } else { CCTK_FNAME(dissipation_6_5_alt) - (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, + (varptr, cctk_lsh, cctk_gsh, cctk_lbnd, bbox, gsize, offset, dx, &epsdis, diss_fraction, &npatches, &patch, rhsptr); } break; |