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

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2020-11-17 17:53:13 -03:00
commit 0abdd577e4
1 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
sources/schemes.F90
View File

@ -2957,16 +2957,14 @@ module schemes
! calculate variables for the Roe intermediate state ! calculate variables for the Roe intermediate state
! !
sdl = sqrt(ql(idn,i)) sdl = sqrt(ql(idn,i))
sdr = sqrt(qr(idn,i)) sdr = sqrt(qr(idn,i))
sds = sdl + sdr sds = sdl + sdr
! prepare the Roe intermediate state vector (eq. 11.60 in [2]) ! prepare the Roe intermediate state vector (eq. 11.60 in [2])
! !
qi(idn) = sdl * sdr qi(idn) = sdl * sdr
qi(ivx) = (sdl * ql(ivx,i) + sdr * qr(ivx,i)) / sds qi(ivx:ivz) = sdl * ql(ivx:ivz,i) / sds + sdr * qr(ivx:ivz,i) / sds
qi(ivy) = (sdl * ql(ivy,i) + sdr * qr(ivy,i)) / sds
qi(ivz) = (sdl * ql(ivz,i) + sdr * qr(ivz,i)) / sds
! obtain eigenvalues and eigenvectors ! obtain eigenvalues and eigenvectors
! !
@ -3080,18 +3078,16 @@ module schemes
! calculate variables for the Roe intermediate state ! calculate variables for the Roe intermediate state
! !
sdl = sqrt(ql(idn,i)) sdl = sqrt(ql(idn,i))
sdr = sqrt(qr(idn,i)) sdr = sqrt(qr(idn,i))
sds = sdl + sdr sds = sdl + sdr
! prepare the Roe intermediate state vector (eq. 11.60 in [2]) ! prepare the Roe intermediate state vector (eq. 11.60 in [2])
! !
qi(idn) = sdl * sdr qi(idn) = sdl * sdr
qi(ivx) = (sdl * ql(ivx,i) + sdr * qr(ivx,i)) / sds qi(ivx:ivz) = sdl * ql(ivx:ivz,i) / sds + sdr * qr(ivx:ivz,i) / sds
qi(ivy) = (sdl * ql(ivy,i) + sdr * qr(ivy,i)) / sds qi(ipr) = ((ul(ien,i) + ql(ipr,i)) / sdl &
qi(ivz) = (sdl * ql(ivz,i) + sdr * qr(ivz,i)) / sds + (ur(ien,i) + qr(ipr,i)) / sdr) / sds
qi(ipr) = ((ul(ien,i) + ql(ipr,i)) / sdl &
+ (ur(ien,i) + qr(ipr,i)) / sdr) / sds
! obtain eigenvalues and eigenvectors ! obtain eigenvalues and eigenvectors
! !
@ -3205,20 +3201,17 @@ module schemes
! calculate variables for the Roe intermediate state ! calculate variables for the Roe intermediate state
! !
sdl = sqrt(ql(idn,i)) sdl = sqrt(ql(idn,i))
sdr = sqrt(qr(idn,i)) sdr = sqrt(qr(idn,i))
sds = sdl + sdr sds = sdl + sdr
! prepare the Roe intermediate state vector (eq. 11.60 in [2]) ! prepare the Roe intermediate state vector (eq. 11.60 in [2])
! !
qi(idn) = sdl * sdr qi(idn) = sdl * sdr
qi(ivx) = (sdl * ql(ivx,i) + sdr * qr(ivx,i)) / sds qi(ivx:ivz) = sdl * ql(ivx:ivz,i) / sds + sdr * qr(ivx:ivz,i) / sds
qi(ivy) = (sdl * ql(ivy,i) + sdr * qr(ivy,i)) / sds qi(ibx) = ql(ibx,i)
qi(ivz) = (sdl * ql(ivz,i) + sdr * qr(ivz,i)) / sds qi(iby:ibz) = sdr * ql(iby:ibz,i) / sds + sdl * qr(iby:ibz,i) / sds
qi(ibx) = ql(ibx,i) qi(ibp) = ql(ibp,i)
qi(iby) = (sdr * ql(iby,i) + sdl * qr(iby,i)) / sds
qi(ibz) = (sdr * ql(ibz,i) + sdl * qr(ibz,i)) / sds
qi(ibp) = ql(ibp,i)
! prepare coefficients ! prepare coefficients
! !
@ -3364,27 +3357,24 @@ module schemes
! calculate variables for the Roe intermediate state ! calculate variables for the Roe intermediate state
! !
sdl = sqrt(ql(idn,i)) sdl = sqrt(ql(idn,i))
sdr = sqrt(qr(idn,i)) sdr = sqrt(qr(idn,i))
sds = sdl + sdr sds = sdl + sdr
! prepare magnetic pressures ! prepare magnetic pressures
! !
pml = 0.5d+00 * sum(ql(ibx:ibz,i)**2) pml = 0.5d+00 * sum(ql(ibx:ibz,i)**2)
pmr = 0.5d+00 * sum(qr(ibx:ibz,i)**2) pmr = 0.5d+00 * sum(qr(ibx:ibz,i)**2)
! prepare the Roe intermediate state vector (eq. 11.60 in [2]) ! prepare the Roe intermediate state vector (eq. 11.60 in [2])
! !
qi(idn) = sdl * sdr qi(idn) = sdl * sdr
qi(ivx) = (sdl * ql(ivx,i) + sdr * qr(ivx,i)) / sds qi(ivx:ivz) = sdl * ql(ivx:ivz,i) / sds + sdr * qr(ivx:ivz,i) / sds
qi(ivy) = (sdl * ql(ivy,i) + sdr * qr(ivy,i)) / sds qi(ipr) = ((ul(ien,i) + ql(ipr,i) + pml) / sdl &
qi(ivz) = (sdl * ql(ivz,i) + sdr * qr(ivz,i)) / sds + (ur(ien,i) + qr(ipr,i) + pmr) / sdr) / sds
qi(ipr) = ((ul(ien,i) + ql(ipr,i) + pml) / sdl & qi(ibx) = ql(ibx,i)
+ (ur(ien,i) + qr(ipr,i) + pmr) / sdr) / sds qi(iby:ibz) = sdr * ql(iby:ibz,i) / sds + sdl * qr(iby:ibz,i) / sds
qi(ibx) = ql(ibx,i) qi(ibp) = ql(ibp,i)
qi(iby) = (sdr * ql(iby,i) + sdl * qr(iby,i)) / sds
qi(ibz) = (sdr * ql(ibz,i) + sdl * qr(ibz,i)) / sds
qi(ibp) = ql(ibp,i)
! prepare coefficients ! prepare coefficients
! !