Reorganize variable indices in variables.F90.
This commit is contained in:
parent
970293c024
commit
fb8f3e2da4
@ -33,30 +33,26 @@ module variables
|
|||||||
integer(kind=4), parameter :: inx = 1, iny = 2, inz = 3
|
integer(kind=4), parameter :: inx = 1, iny = 2, inz = 3
|
||||||
integer(kind=4), parameter :: idn = 1, imx = 2, imy = 3, imz = 4 &
|
integer(kind=4), parameter :: idn = 1, imx = 2, imy = 3, imz = 4 &
|
||||||
, ivx = 2, ivy = 3, ivz = 4
|
, ivx = 2, ivy = 3, ivz = 4
|
||||||
#ifdef HYDRO
|
|
||||||
#ifdef ISO
|
#ifdef ISO
|
||||||
integer(kind=4), parameter :: nvr = 4, nfl = 4, nqt = 4
|
integer(kind=4), parameter :: nfl = 4
|
||||||
#endif /* ISO */
|
#endif /* ISO */
|
||||||
#ifdef ADI
|
#ifdef ADI
|
||||||
integer(kind=4), parameter :: ien = 5, ipr = 5
|
integer(kind=4), parameter :: ien = 5, ipr = 5
|
||||||
integer(kind=4), parameter :: nvr = 5, nfl = 5, nqt = 5
|
integer(kind=4), parameter :: nfl = 5
|
||||||
#endif /* ADI */
|
#endif /* ADI */
|
||||||
|
#ifdef HYDRO
|
||||||
|
integer(kind=4), parameter :: nqt = nfl
|
||||||
#endif /* HYDRO */
|
#endif /* HYDRO */
|
||||||
#ifdef MHD
|
#ifdef MHD
|
||||||
|
integer(kind=4), parameter :: ibx = nfl + 1, iby = ibx + 1, ibz = iby + 1
|
||||||
#ifdef GLM
|
#ifdef GLM
|
||||||
#ifdef ISO
|
integer(kind=4), parameter :: iph = ibz + 1
|
||||||
integer(kind=4), parameter :: ibx = 5, iby = 6, ibz = 7
|
integer(kind=4), parameter :: nqt = iph
|
||||||
integer(kind=4), parameter :: iph = 8
|
#else /* GLM */
|
||||||
integer(kind=4), parameter :: nvr = 8, nfl = 4, nqt = 8
|
integer(kind=4), parameter :: nqt = ibz
|
||||||
#endif /* ISO */
|
|
||||||
#ifdef ADI
|
|
||||||
integer(kind=4), parameter :: ien = 5, ipr = 5
|
|
||||||
integer(kind=4), parameter :: ibx = 6, iby = 7, ibz = 8
|
|
||||||
integer(kind=4), parameter :: iph = 9
|
|
||||||
integer(kind=4), parameter :: nvr = 9, nfl = 5, nqt = 9
|
|
||||||
#endif /* ADI */
|
|
||||||
#endif /* GLM */
|
#endif /* GLM */
|
||||||
#endif /* MHD */
|
#endif /* MHD */
|
||||||
|
integer(kind=4), parameter :: nvr = nqt
|
||||||
!
|
!
|
||||||
!===============================================================================
|
!===============================================================================
|
||||||
!
|
!
|
||||||
|
Loading…
x
Reference in New Issue
Block a user