From cad3c5138ec4d783e0465b629e6cffbf9d026006 Mon Sep 17 00:00:00 2001 From: diener Date: Tue, 30 Oct 2007 18:28:40 +0000 Subject: This operator is now implemented correctly. git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/SummationByParts/trunk@90 f69c4107-0314-4c4f-9ad4-17e986b73f4a --- src/Derivatives2_4_2_min_err_coeff.F90 | 78 ++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 27 deletions(-) diff --git a/src/Derivatives2_4_2_min_err_coeff.F90 b/src/Derivatives2_4_2_min_err_coeff.F90 index ed3d81f..b05417f 100644 --- a/src/Derivatives2_4_2_min_err_coeff.F90 +++ b/src/Derivatives2_4_2_min_err_coeff.F90 @@ -40,21 +40,24 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) il = 1 + gsize else dvar2(1,:,:) = ( q(1,1) * var(1,:,:) + q(2,1) * var(2,:,:) + & - q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) ) * idel2 + q(3,1) * var(3,:,:) + q(4,1) * var(4,:,:) + & + q(6,1) * var(6,:,:) ) * idel2 dvar2(2,:,:) = ( q(1,2) * var(1,:,:) + q(2,2) * var(2,:,:) + & - q(3,2) * var(3,:,:) ) * idel2 + q(3,2) * var(3,:,:) + q(4,2) * var(4,:,:) + & + q(5,2) * var(5,:,:) + q(6,2) * var(6,:,:) ) * idel2 dvar2(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,:,:) ) * idel2 - dvar2(4,:,:) = ( q(1,4) * var(1,:,:) + q(3,4) * var(3,:,:) + & - q(4,4) * var(4,:,:) + q(5,4) * var(5,:,:) + & - q(6,4) * var(6,:,:) ) * idel2 + q(5,3) * var(5,:,:) + q(6,3) * var(6,:,:) ) * idel2 + dvar2(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,:,:) ) * idel2 il = 5 end if if ( bb(2) == 0 ) then ir = ni - gsize else dvar2(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,:,:) + & @@ -63,14 +66,19 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) q(2,3) * var(ni-1,:,:) + & q(3,3) * var(ni-2,:,:) + & q(4,3) * var(ni-3,:,:) + & - q(5,3) * var(ni-4,:,:) ) * idel2 + q(5,3) * var(ni-4,:,:) + & + q(6,3) * var(ni-5,:,:) ) * idel2 dvar2(ni-1,:,:) = ( q(1,2) * var(ni,:,:) + & q(2,2) * var(ni-1,:,:) + & - q(3,2) * var(ni-2,:,:) ) * idel2 + q(3,2) * var(ni-2,:,:) + & + q(4,2) * var(ni-3,:,:) + & + q(5,2) * var(ni-4,:,:) + & + q(6,2) * var(ni-5,:,:) ) * idel2 dvar2(ni,:,:) = ( q(1,1) * var(ni,:,:) + & q(2,1) * var(ni-1,:,:) + & q(3,1) * var(ni-2,:,:) + & - q(4,1) * var(ni-3,:,:) ) * idel2 + q(4,1) * var(ni-3,:,:) + & + q(6,1) * var(ni-5,:,:) ) * idel2 ir = ni - 4 end if dvar2(il:ir,:,:) = ( a(1) * var(il:ir,:,:) + & @@ -86,21 +94,24 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) jl = 1 + gsize else dvar2(:,1,:) = ( q(1,1) * var(:,1,:) + q(2,1) * var(:,2,:) + & - q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) ) * idel2 + q(3,1) * var(:,3,:) + q(4,1) * var(:,4,:) + & + q(6,1) * var(:,6,:) ) * idel2 dvar2(:,2,:) = ( q(1,2) * var(:,1,:) + q(2,2) * var(:,2,:) + & - q(3,2) * var(:,3,:) ) * idel2 + q(3,2) * var(:,3,:) + q(4,2) * var(:,4,:) + & + q(5,2) * var(:,5,:) + q(6,2) * var(:,6,:) ) * idel2 dvar2(:,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,:) ) * idel2 - dvar2(:,4,:) = ( q(1,4) * var(:,1,:) + q(3,4) * var(:,3,:) + & - q(4,4) * var(:,4,:) + q(5,4) * var(:,5,:) + & - q(6,4) * var(:,6,:) ) * idel2 + q(5,3) * var(:,5,:) + q(6,3) * var(:,6,:) ) * idel2 + dvar2(:,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,:) ) * idel2 jl = 5 end if if ( bb(2) == 0 ) then jr = nj - gsize else dvar2(:,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,:) + & @@ -109,14 +120,19 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) q(2,3) * var(:,nj-1,:) + & q(3,3) * var(:,nj-2,:) + & q(4,3) * var(:,nj-3,:) + & - q(5,3) * var(:,nj-4,:) ) * idel2 + q(5,3) * var(:,nj-4,:) + & + q(6,3) * var(:,nj-5,:) ) * idel2 dvar2(:,nj-1,:) = ( q(1,2) * var(:,nj,:) + & q(2,2) * var(:,nj-1,:) + & - q(3,2) * var(:,nj-2,:) ) * idel2 + q(3,2) * var(:,nj-2,:) + & + q(4,2) * var(:,nj-3,:) + & + q(5,2) * var(:,nj-4,:) + & + q(6,2) * var(:,nj-5,:) ) * idel2 dvar2(:,nj,:) = ( q(1,1) * var(:,nj,:) + & q(2,1) * var(:,nj-1,:) + & q(3,1) * var(:,nj-2,:) + & - q(4,1) * var(:,nj-3,:) ) * idel2 + q(4,1) * var(:,nj-3,:) + & + q(6,1) * var(:,nj-5,:) ) * idel2 jr = nj - 4 end if dvar2(:,jl:jr,:) = ( a(1) * var(:,jl:jr,:) + & @@ -134,21 +150,24 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) kl = 1 + gsize else dvar2(:,:,1) = ( q(1,1) * var(:,:,1) + q(2,1) * var(:,:,2) + & - q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) ) * idel2 + q(3,1) * var(:,:,3) + q(4,1) * var(:,:,4) + & + q(6,1) * var(:,:,6) ) * idel2 dvar2(:,:,2) = ( q(1,2) * var(:,:,1) + q(2,2) * var(:,:,2) + & - q(3,2) * var(:,:,3) ) * idel2 + q(3,2) * var(:,:,3) + q(4,2) * var(:,:,4) + & + q(5,2) * var(:,:,5) + q(6,2) * var(:,:,6) ) * idel2 dvar2(:,:,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) ) * idel2 - dvar2(:,:,4) = ( q(1,4) * var(:,:,1) + q(3,4) * var(:,:,3) + & - q(4,4) * var(:,:,4) + q(5,4) * var(:,:,5) + & - q(6,4) * var(:,:,6) ) * idel2 + q(5,3) * var(:,:,5) + q(6,3) * var(:,:,6) ) * idel2 + dvar2(:,:,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) ) * idel2 kl = 5 end if if ( bb(2) == 0 ) then kr = nk - gsize else dvar2(:,:,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) + & @@ -157,14 +176,19 @@ subroutine deriv2_gf_4_2_opt ( var, ni, nj, nk, dir, bb, gsize, delta, dvar2 ) q(2,3) * var(:,:,nk-1) + & q(3,3) * var(:,:,nk-2) + & q(4,3) * var(:,:,nk-3) + & - q(5,3) * var(:,:,nk-4) ) * idel2 + q(5,3) * var(:,:,nk-4) + & + q(6,3) * var(:,:,nk-5) ) * idel2 dvar2(:,:,nk-1) = ( q(1,2) * var(:,:,nk) + & q(2,2) * var(:,:,nk-1) + & - q(3,2) * var(:,:,nk-2) ) * idel2 + q(3,2) * var(:,:,nk-2) + & + q(4,2) * var(:,:,nk-3) + & + q(5,2) * var(:,:,nk-4) + & + q(6,2) * var(:,:,nk-5) ) * idel2 dvar2(:,:,nk) = ( q(1,1) * var(:,:,nk) + & q(2,1) * var(:,:,nk-1) + & q(3,1) * var(:,:,nk-2) + & - q(4,1) * var(:,:,nk-3) ) * idel2 + q(4,1) * var(:,:,nk-3) + & + q(6,1) * var(:,:,nk-5) ) * idel2 kr = nk - 4 end if dvar2(:,:,kl:kr) = ( a(1) * var(:,:,kl:kr) + & -- cgit v1.2.3