Merge branch 'master' into flux-tubes

This commit is contained in:
Grzegorz Kowal 2023-09-18 09:25:38 -03:00
commit 3112b82258

View File

@ -355,7 +355,6 @@ module evolution
registers = 4
order = 3
stages = 5
cfl = 2.5d+00 * cfl
name_int = "Optimized 3ʳᵈ-order 5-step embedded RK3(2)5"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -421,7 +420,6 @@ module evolution
registers = 4
order = 3
stages = 5
cfl = 2.5d+00 * cfl
name_int = "Optimized 3ʳᵈ-order 5-step embedded RK3(2)5 FSAL"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -486,7 +484,6 @@ module evolution
registers = 4
order = 4
stages = 9
cfl = 3.5d+00 * cfl
name_int = "Optimized 4ᵗʰ-order 9-step embedded RK4(3)9"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -580,7 +577,6 @@ module evolution
registers = 4
order = 4
stages = 9
cfl = 3.5d+00 * cfl
name_int = "Optimized 4ᵗʰ-order 9-step embedded RK4(3)9 FSAL"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -673,7 +669,6 @@ module evolution
registers = 4
order = 5
stages = 10
cfl = 4.2d+00 * cfl
name_int = "Optimized 5ᵗʰ-order 10-step embedded RK5(4)10"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -774,7 +769,6 @@ module evolution
registers = 4
order = 5
stages = 10
cfl = 4.2d+00 * cfl
name_int = "Optimized 5ᵗʰ-order 10-step embedded RK5(4)10 FSAL"
allocate(c(stages+1), dl(stages), bt(stages), bh(stages+1), gm(3,stages))
@ -2722,9 +2716,9 @@ module evolution
do l = 1, n
pdata => data_blocks(l)%ptr
pdata%uu(:,:,:,:,2) = pdata%uu(:,:,:,:,3) &
+ 6.0d-01 * pdata%uu(:,:,:,:,2) &
+ 1.0d-01 * dt * pdata%du(:,:,:,:)
pdata%uu(:,:,:,:,2) = (1.0d+01 * pdata%uu(:,:,:,:,3) &
+ 6.0d+00 * pdata%uu(:,:,:,:,2) &
+ dt * pdata%du(:,:,:,:)) / 1.0d+01
end do
!$omp end parallel do