Merge branch 'master' into reconnection

Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>

Conflicts:
	src/coordinates.F90
This commit is contained in:
Grzegorz Kowal 2014-08-29 09:09:15 -03:00
commit a079bbb5fb

View File

@ -88,6 +88,12 @@ module coordinates
real(kind=8), save :: vol = 1.0d+00
real(kind=8), save :: voli = 1.0d+00
! the domain boundary areas
!
real(kind=8), save :: xarea = 1.0d+00
real(kind=8), save :: yarea = 1.0d+00
real(kind=8), save :: zarea = 1.0d+00
! the characteristic decay length
!
real(kind=8), save :: ldec = 1.0d-03
@ -256,6 +262,12 @@ module coordinates
vol = xlen * ylen * zlen
voli = 1.0d+00 / vol
! calculate the boundary areas
!
xarea = ylen * zlen
yarea = xlen * zlen
zarea = xlen * ylen
! allocate space for coordinate variables
!
allocate(ax (toplev, im))