gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRALS: Reorder the reconnection rate terms.

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2020-12-27 23:15:49 -03:00
parent 8457574567
commit 04b4d48d39
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sources/integrals.F90
View File

@ -333,12 +333,11 @@ module integrals
! !
write(runit,'("#",a8,20a25)') & write(runit,'("#",a8,20a25)') &
'step', 'time', '|Bx| int', '|Bx| inf' & 'step', 'time', '|Bx| int', '|Bx| inf' &
, '|Bx| y-adv', '|Bx| y-shr', '|Bx| y-dif' & , '|Bx| y-adv', '|Bx| z-adv', '|Bx| y-shr', '|Bx| z-shr' &
, '|Bx| z-adv', '|Bx| z-shr', '|Bx| z-dif' & , '|Bx| y-dif', '|Bx| z-dif', 'Vin lower' , 'Vin upper' &
, 'Vin lower' , 'Vin upper' & , 'Emag', 'Emag inf' &
, 'Emag', 'Emag(inf)' & , 'Emag x-adv', 'Emag y-adv', 'Emag z-adv' &
, 'Emag(x-adv)', 'Emag(y-adv)', 'Emag(z-adv)' & , 'Emag x-dif', 'Emag y-dif', 'Emag z-dif'
, 'Emag(x-dif)', 'Emag(y-dif)', 'Emag(z-dif)'
write(runit,"('#')") write(runit,"('#')")
end if ! store end if ! store
@ -871,12 +870,12 @@ module integrals
! shear of By along X ! shear of By along X
! !
#if NDIMS == 3 #if NDIMS == 3
inarr(14) = inarr(14) & inarr(15) = inarr(15) &
- sum(sign(pdata%q(iby,nb:ne,nbl:nb,nb:ne) & - sum(sign(pdata%q(iby,nb:ne,nbl:nb,nb:ne) &
* pdata%q(ivx,nb:ne,nbl:nb,nb:ne), & * pdata%q(ivx,nb:ne,nbl:nb,nb:ne), &
pdata%q(ibx,nb:ne,nbl:nb,nb:ne))) * dxz pdata%q(ibx,nb:ne,nbl:nb,nb:ne))) * dxz
#else /* NDIMS == 3 */ #else /* NDIMS == 3 */
inarr(14) = inarr(14) & inarr(15) = inarr(15) &
- sum(sign(pdata%q(iby,nb:ne,nbl:nb, : ) & - sum(sign(pdata%q(iby,nb:ne,nbl:nb, : ) &
* pdata%q(ivx,nb:ne,nbl:nb, : ), & * pdata%q(ivx,nb:ne,nbl:nb, : ), &
pdata%q(ibx,nb:ne,nbl:nb, : ))) * dxz pdata%q(ibx,nb:ne,nbl:nb, : ))) * dxz
@ -931,7 +930,7 @@ module integrals
! diffusion of Bx through the lower Y boundary ! diffusion of Bx through the lower Y boundary
! !
inarr(15) = inarr(15) + sum(sign(tmp(:,1,:), & inarr(17) = inarr(17) + sum(sign(tmp(:,1,:), &
pdata%q(ibx,nb:ne,nb,nb:ne))) * dxz pdata%q(ibx,nb:ne,nb,nb:ne))) * dxz
! diffusion of magnetic energy through the lower Y boundary ! diffusion of magnetic energy through the lower Y boundary
@ -954,7 +953,7 @@ module integrals
! diffusion of Bx through the lower Y boundary ! diffusion of Bx through the lower Y boundary
! !
inarr(15) = inarr(15) + sum(sign(tmp(:,1,:), & inarr(17) = inarr(17) + sum(sign(tmp(:,1,:), &
pdata%q(ibx,nb:ne,nb , : ))) * dxz pdata%q(ibx,nb:ne,nb , : ))) * dxz
! diffusion of magnetic energy through the lower Y boundary ! diffusion of magnetic energy through the lower Y boundary
@ -993,12 +992,12 @@ module integrals
! shear of By along X ! shear of By along X
! !
#if NDIMS == 3 #if NDIMS == 3
inarr(14) = inarr(14) & inarr(15) = inarr(15) &
+ sum(sign(pdata%q(iby,nb:ne,ne:neu,nb:ne) & + sum(sign(pdata%q(iby,nb:ne,ne:neu,nb:ne) &
* pdata%q(ivx,nb:ne,ne:neu,nb:ne), & * pdata%q(ivx,nb:ne,ne:neu,nb:ne), &
pdata%q(ibx,nb:ne,ne:neu,nb:ne))) * dxz pdata%q(ibx,nb:ne,ne:neu,nb:ne))) * dxz
#else /* NDIMS == 3 */ #else /* NDIMS == 3 */
inarr(14) = inarr(14) & inarr(15) = inarr(15) &
+ sum(sign(pdata%q(iby,nb:ne,ne:neu, : ) & + sum(sign(pdata%q(iby,nb:ne,ne:neu, : ) &
* pdata%q(ivx,nb:ne,ne:neu, : ), & * pdata%q(ivx,nb:ne,ne:neu, : ), &
pdata%q(ibx,nb:ne,ne:neu, : ))) * dxz pdata%q(ibx,nb:ne,ne:neu, : ))) * dxz
@ -1053,7 +1052,7 @@ module integrals
! diffusion of Bx through the upper Y boundary ! diffusion of Bx through the upper Y boundary
! !
inarr(15) = inarr(15) - sum(sign(tmp(:,1,:), & inarr(17) = inarr(17) - sum(sign(tmp(:,1,:), &
pdata%q(ibx,nb:ne,ne,nb:ne))) * dxz pdata%q(ibx,nb:ne,ne,nb:ne))) * dxz
! diffusion of magnetic energy through the upper Y boundary ! diffusion of magnetic energy through the upper Y boundary
@ -1076,7 +1075,7 @@ module integrals
! diffusion of Bx through the upper Y boundary ! diffusion of Bx through the upper Y boundary
! !
inarr(15) = inarr(15) - sum(sign(tmp(:,1,:), & inarr(17) = inarr(17) - sum(sign(tmp(:,1,:), &
pdata%q(ibx,nb:ne,ne, : ))) * dxz pdata%q(ibx,nb:ne,ne, : ))) * dxz
! diffusion of magnetic energy through the upper Y boundary ! diffusion of magnetic energy through the upper Y boundary
@ -1101,12 +1100,12 @@ module integrals
! advection of Bx along Z ! advection of Bx along Z
! !
inarr(16) = inarr(16) + sum(abs(pdata%q(ibx,nb:ne,nb:ne,nbl:nb)) & inarr(14) = inarr(14) + sum(abs(pdata%q(ibx,nb:ne,nb:ne,nbl:nb)) &
* pdata%q(ivz,nb:ne,nb:ne,nbl:nb)) * dxy * pdata%q(ivz,nb:ne,nb:ne,nbl:nb)) * dxy
! shear of Bz along X ! shear of Bz along X
! !
inarr(17) = inarr(17) - sum(sign(pdata%q(ibz,nb:ne,nb:ne,nbl:nb) & inarr(16) = inarr(16) - sum(sign(pdata%q(ibz,nb:ne,nb:ne,nbl:nb) &
* pdata%q(ivx,nb:ne,nb:ne,nbl:nb), & * pdata%q(ivx,nb:ne,nb:ne,nbl:nb), &
pdata%q(ibx,nb:ne,nb:ne,nbl:nb))) * dxy pdata%q(ibx,nb:ne,nb:ne,nbl:nb))) * dxy
@ -1158,12 +1157,12 @@ module integrals
! advection of Bx along Z ! advection of Bx along Z
! !
inarr(16) = inarr(16) - sum(abs(pdata%q(ibx,nb:ne,nb:ne,ne:neu)) & inarr(14) = inarr(14) - sum(abs(pdata%q(ibx,nb:ne,nb:ne,ne:neu)) &
* pdata%q(ivz,nb:ne,nb:ne,ne:neu)) * dxy * pdata%q(ivz,nb:ne,nb:ne,ne:neu)) * dxy
! shear of Bz along X ! shear of Bz along X
! !
inarr(17) = inarr(17) + sum(sign(pdata%q(ibz,nb:ne,nb:ne,ne:neu) & inarr(16) = inarr(16) + sum(sign(pdata%q(ibz,nb:ne,nb:ne,ne:neu) &
* pdata%q(ivx,nb:ne,nb:ne,ne:neu), & * pdata%q(ivx,nb:ne,nb:ne,ne:neu), &
pdata%q(ibx,nb:ne,nb:ne,ne:neu))) * dxy pdata%q(ibx,nb:ne,nb:ne,ne:neu))) * dxy
@ -1260,10 +1259,8 @@ module integrals
! apply factors to the reconnection rate terms ! apply factors to the reconnection rate terms
! !
inarr(12) = 5.0d-01 * inarr(12) / yarea inarr(12) = 5.0d-01 * inarr(12) / yarea
inarr(13:14) = 5.0d-01 * inarr(13:14) inarr(13:16) = 5.0d-01 * inarr(13:16)
inarr(15) = resistivity * inarr(15) inarr(17:18) = resistivity * inarr(17:18)
inarr(16:17) = 5.0d-01 * inarr(16:17)
inarr(18) = resistivity * inarr(18)
inarr(22) = 2.5d-01 * inarr(22) / yarea inarr(22) = 2.5d-01 * inarr(22) / yarea
inarr(23:25) = 5.0d-01 * inarr(23:25) inarr(23:25) = 5.0d-01 * inarr(23:25)
inarr(26:28) = resistivity * inarr(26:28) inarr(26:28) = resistivity * inarr(26:28)