diff --git a/WENO.F90 b/WENO.F90 index c07cf33d3edf30a8765265549f417a611d4ac390..712b8b773cbce21fb5f00be9b3fc365330225ebb 100644 --- a/WENO.F90 +++ b/WENO.F90 @@ -777,43 +777,14 @@ subroutine oscillation_pos(nvars, characteristic_fluxes, oscillation) real*8 w1sum(1), w2sum(1), w3sum(1), c1sum(1), c2sum(1), c3sum(1) integer i - integer j do i=1,nvars - w1sum(1) = 0.0d0 - do j=0,2 - w1sum(1) = w1sum(1) + weights1(j)*characteristic_fluxes(i,j-2) - end do - w2sum(1) = 0.0d0 - do j=0,2 - w2sum(1) = w2sum(1) + weights2(j)*characteristic_fluxes(i,j-1) - end do - !w3sum(1) = 0.0d0 - !do j=0,2 - ! w3sum(1) = w3sum(1) + weights3(j)*characteristic_fluxes(i,j) - !end do - !call weighted_sum_pos(3, weights3, characteristic_fluxes(i,0:2), w3sum) - call weighted_sum_pos(3, weights3, characteristic_fluxes(i,:), w3sum) - - c1sum(1) = 0.0d0 - do j=0,2 - c1sum(1) = c1sum(1) + weightsc(j)*characteristic_fluxes(i,j-2) - end do - c2sum(1) = 0.0d0 - do j=0,2 - c2sum(1) = c2sum(1) + weightsc(j)*characteristic_fluxes(i,j-1) - end do - c3sum(1) = 0.0d0 - do j=0,2 - c3sum(1) = c3sum(1) + weightsc(j)*characteristic_fluxes(i,j) - end do - - !call weighted_sum(3, weights1, characteristic_fluxes(i,-2:0), w1sum) - !call weighted_sum(3, weightsc, characteristic_fluxes(i,-2:0), c1sum) - !call weighted_sum(3, weights2, characteristic_fluxes(i,-1:1), w2sum) - !call weighted_sum(3, weightsc, characteristic_fluxes(i,-1:1), c2sum) - !call weighted_sum(3, weights3, characteristic_fluxes(i,0:2), w3sum) - !call weighted_sum(3, weightsc, characteristic_fluxes(i,0:2), c3sum) + call weighted_sum(3, weights1, characteristic_fluxes(i,-2:0), w1sum) + call weighted_sum(3, weightsc, characteristic_fluxes(i,-2:0), c1sum) + call weighted_sum(3, weights2, characteristic_fluxes(i,-1:1), w2sum) + call weighted_sum(3, weightsc, characteristic_fluxes(i,-1:1), c2sum) + call weighted_sum(3, weights3, characteristic_fluxes(i,0:2), w3sum) + call weighted_sum(3, weightsc, characteristic_fluxes(i,0:2), c3sum) oscillation(i, 1) = (1.0d0/4)*w1sum(1)**2 + (13.0d0/12)*c1sum(1)**2 oscillation(i, 2) = (1.0d0/4)*w2sum(1)**2 + (13.0d0/12)*c2sum(1)**2 @@ -821,21 +792,6 @@ subroutine oscillation_pos(nvars, characteristic_fluxes, oscillation) end do end subroutine -subroutine weighted_sum_pos(n, w, a, a_sum) - integer, intent(in) :: n - real*8, intent(in) :: w(0:2) - !real*8, intent(in) :: a(0:2) - real*8, intent(in) :: a(-2:3) - real*8, intent(out) :: a_sum(1) - - integer j - - a_sum(1) = 0.0d0 - do j=0,2 - a_sum(1) = a_sum(1) + w(j)*a(j) - end do -end subroutine - subroutine flux_differences_pos(nvars, characteristic_fluxes, flux_differences) implicit none diff --git a/requirements.txt b/requirements.txt index 36d95d70721dcf19677fc5fd2fad9cee4d514ab4..b6462ed615a84e3f73737d7eb6572f7819eb5380 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ git+https://github.com/inducer/pyopencl.git git+https://github.com/inducer/pymbolic.git git+https://github.com/inducer/genpy.git git+https://github.com/inducer/codepy.git -git+https://gitlab.tiker.net/inducer/loopy.git@kernel_callables_v3 +git+https://gitlab.tiker.net/inducer/loopy.git@fix-slice-processing-at-base git+https://github.com/inducer/f2py diff --git a/test.py b/test.py index 79b4b89fe3c7e52bf3321c2d4170ad2f4c6467ec..a3eeb173a911eda68a463fd025b8c1a3abe6d8c6 100644 --- a/test.py +++ b/test.py @@ -15,7 +15,10 @@ from pyopencl.tools import ( # noqa as pytest_generate_tests) import utilities as u -from data_for_test import flux_test_data_fixture # noqa: F401 +from data_for_test import ( # noqa: F401 + flux_test_data_fixture, + single_data as std # "single_test_data", sorry + ) def test_weno_weight_computation(ctx_factory, flux_test_data_fixture):