From b2eba0d09dd8fdb5829a8a263c3eadc419ca7141 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <tasmith4@illinois.edu>
Date: Mon, 19 Aug 2019 14:20:55 -0500
Subject: [PATCH] for now, make some things explicit in WENO weight computation
---
WENO.F90 | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/WENO.F90 b/WENO.F90
index 1f66c0b..bf784bb 100644
--- a/WENO.F90
+++ b/WENO.F90
@@ -757,33 +757,35 @@ subroutine weno_weights_pos(nvars, characteristic_fluxes, combined_frozen_metric
p = 2
do i=1,nvars
- !w1sum(1) = characteristic_fluxes(i,-2) - 4*characteristic_fluxes(i,-1) &
- ! + 3*characteristic_fluxes(i,0)
- w2sum(1) = -characteristic_fluxes(i,-1) - characteristic_fluxes(i,1) !!! BUG !!!
- !w3sum(1) = -3*characteristic_fluxes(i,0) + 4*characteristic_fluxes(i,1) &
- ! - characteristic_fluxes(i,2)
- !c1sum(1) = characteristic_fluxes(i,-2) &
- ! - 2*characteristic_fluxes(i,-1) + characteristic_fluxes(i,0)
- !c2sum(1) = characteristic_fluxes(i,-1) &
- ! - 2*characteristic_fluxes(i,0) + characteristic_fluxes(i,1)
+ w1sum(1) = characteristic_fluxes(i,-2) - 4*characteristic_fluxes(i,-1) &
+ + 3*characteristic_fluxes(i,0)
+ w2sum(1) = -characteristic_fluxes(i,-1) + characteristic_fluxes(i,1)
+ w3sum(1) = -3*characteristic_fluxes(i,0) + 4*characteristic_fluxes(i,1) &
+ - characteristic_fluxes(i,2)
+ c1sum(1) = characteristic_fluxes(i,-2) &
+ - 2*characteristic_fluxes(i,-1) + characteristic_fluxes(i,0)
+ c2sum(1) = characteristic_fluxes(i,-1) &
+ - 2*characteristic_fluxes(i,0) + characteristic_fluxes(i,1)
c3sum(1) = characteristic_fluxes(i,0) &
- 2*characteristic_fluxes(i,1) + characteristic_fluxes(i,2)
- 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, 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,-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)
IS(1) = (1.0d0/4)*w1sum(1)**2 + (13.0d0/12)*c1sum(1)**2
IS(2) = (1.0d0/4)*w2sum(1)**2 + (13.0d0/12)*c2sum(1)**2
IS(3) = (1.0d0/4)*w3sum(1)**2 + (13.0d0/12)*c3sum(1)**2
+ sum_alpha(1) = 0.0d0
do j=1,3
alpha(j) = C(j)/(IS(j) + eps)**p
+ sum_alpha(1) = sum_alpha(1) + alpha(j)
end do
- call sum_array(3, alpha, sum_alpha)
+ !call sum_array(3, alpha, sum_alpha)
do j=1,3
w(i,j) = alpha(j)/sum_alpha(1)
end do
--
GitLab