diff options
Diffstat (limited to 'src/Derivatives_2_1.F90')
| -rw-r--r-- | src/Derivatives_2_1.F90 | 77 |
1 files changed, 33 insertions, 44 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 |