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

COORDINATES, MESH: Remove effres.

Browse Source 
The mesh coefficients are calculated in a bit different way in
store_mesh_stats().

Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2014-01-29 14:58:35 -02:00
parent 3b537eb412
commit 4e7b5def3e
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/coordinates.F90
View File

@ -76,10 +76,6 @@ module coordinates
real, save :: zmax = 1.0d0 real, save :: zmax = 1.0d0
real, save :: zlen = 1.0d0 real, save :: zlen = 1.0d0
! the effective resolution of the full domain
!
integer,dimension(3), save :: effres = 1
! the block coordinates for all levels of refinement ! the block coordinates for all levels of refinement
! !
real, dimension(:,:), allocatable, save :: ax , ay , az real, dimension(:,:), allocatable, save :: ax , ay , az
@ -313,10 +309,6 @@ module coordinates
rm(2) = cm(2) * ff rm(2) = cm(2) * ff
rm(3) = cm(3) * ff rm(3) = cm(3) * ff
! the effective resolution
!
effres(1:NDIMS) = rm(1:NDIMS)
! the top level block division ! the top level block division
! !
dm(1) = rm(1) / in dm(1) = rm(1) / in

11
src/mesh.F90
View File

@ -258,7 +258,7 @@ module mesh
! !
use blocks , only : ndims, block_meta, list_meta use blocks , only : ndims, block_meta, list_meta
use blocks , only : get_mblocks, get_nleafs use blocks , only : get_mblocks, get_nleafs
use coordinates , only : ng, nd, im, jm, km, toplev, effres use coordinates , only : ng, nd, in, jn, kn, im, jm, km, ir, jr, kr, toplev
use mpitools , only : master, nprocs use mpitools , only : master, nprocs
! local variables are not implicit by default ! local variables are not implicit by default
@ -273,7 +273,7 @@ module mesh
! local variables ! local variables
! !
integer(kind=4) :: l, n integer(kind=4) :: l, n
real(kind=8) :: cv, ef real(kind=8) :: cv, ef, ff
! local pointers ! local pointers
! !
@ -340,11 +340,12 @@ module mesh
! prepare coverage and efficiency factors ! prepare coverage and efficiency factors
! !
ff = 2**(toplev - 1)
fcv = 1.0d+00 / n fcv = 1.0d+00 / n
fef = 1.0d+00 * im / (effres(1) + nd) fef = 1.0d+00 * im / (ir * in * ff + nd)
fef = fef * jm / (effres(2) + nd) fef = fef * jm / (jr * jn * ff + nd)
#if NDIMS == 3 #if NDIMS == 3
fef = fef * km / (effres(3) + nd) fef = fef * km / (kr * kn * ff + nd)
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
! reset the first execution flag ! reset the first execution flag