USER_PROBLEM: Eliminate variable dvolh.

Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2021-11-26 17:40:58 -03:00
parent 9a5223acb0
commit 2cd3ee7c7f

View File

@ -1523,7 +1523,7 @@ module user_problem
type(block_data), pointer :: pdata
integer :: ni, nl, nu, nm, np, status
real(kind=8) :: dvol, dvolh, dxz
real(kind=8) :: dvol, dxz
real(kind=8), dimension(3) :: dh
real(kind=8), dimension(nn) :: yc
real(kind=8), dimension(32) :: rterms
@ -1569,7 +1569,6 @@ module user_problem
dh(3) = adz(pmeta%level)
dvol = advol(pmeta%level)
dvolh = 5.0d-01 * dvol
dxz = adx(pmeta%level) * adz(pmeta%level)
@ -1603,9 +1602,9 @@ module user_problem
!
rterms(12) = rterms(12) &
#if NDIMS == 3
+ sum(pdata%u(ibx:ibz,nb:ne,nl:nu,nb:ne)**2) * dvolh
+ sum(pdata%u(ibx:ibz,nb:ne,nl:nu,nb:ne)**2) * dvol
#else /* NDIMS == 3 */
+ sum(pdata%u(ibx:ibz,nb:ne,nl:nu, : )**2) * dvolh
+ sum(pdata%u(ibx:ibz,nb:ne,nl:nu, : )**2) * dvol
#endif /* NDIMS == 3 */
if (pmeta%ymin <= ylo .and. ylo < pmeta%ymax) then
@ -1920,6 +1919,7 @@ module user_problem
#endif /* MPI */
rterms(2) = 2.50d-01 * rterms(2) / yarea
rterms(12) = 5.00d-01 * rterms(12)
rterms(13) = 1.25d-01 * rterms(13) / yarea
rterms(3:6) = 5.00d-01 * rterms(3:6)
rterms(14:19) = 5.00d-01 * rterms(14:19)