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

Make GNU compiler happy and fix indexing of emf.

Browse Source
This commit is contained in:
Grzegorz Kowal 2010-09-18 11:42:09 +02:00
parent ed88bc2526
commit b6dc6095ac
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blocks.F90
View File

@ -238,7 +238,7 @@ module blocks
! !
!=============================================================================== !===============================================================================
! !
function increase_id function increase_id()
implicit none implicit none

5
src/mesh.F90
View File

@ -873,7 +873,10 @@ module mesh
! expand the staggered magnetic field components preserving divergence-free ! expand the staggered magnetic field components preserving divergence-free
! condition ! condition
! !
call expand_mag(dm, fm, ng, pblock%data%u(ibx,:,:,:), pblock%data%u(iby,:,:,:), pblock%data%u(ibz,:,:,:), u(ibx,:,:,:), u(iby,:,:,:), u(ibz,:,:,:)) call expand_mag(dm, fm, ng, pblock%data%u(ibx,:,:,:) &
, pblock%data%u(iby,:,:,:) &
, pblock%data%u(ibz,:,:,:) &
, u(ibx,:,:,:), u(iby,:,:,:), u(ibz,:,:,:))
#endif /* FLUXCT */ #endif /* FLUXCT */
#endif /* MHD */ #endif /* MHD */
! iterate over all children ! iterate over all children

37
src/scheme.F90
View File

@ -153,15 +153,15 @@ module scheme
f(1,ien,1:im,j,k) = fx(ien,1:im) f(1,ien,1:im,j,k) = fx(ien,1:im)
#endif /* ADI */ #endif /* ADI */
#ifdef MHD #ifdef MHD
e(ibx,1:im,j ,k ) = e(ibx,1:im,j ,k ) + fx(ibx,1:im) #if NDIMS == 2
e(2,1:im,j ,k ) = e(2,1:im,j ,k ) + fx(ibz,1:im)
#endif /* NDIMS == 2 */
#if NDIMS == 3 #if NDIMS == 3
e(iby,1:im,j ,k ) = e(iby,1:im,j ,k ) - 0.25 * fx(ibz,1:im) e(2,1:im,j ,k ) = e(2,1:im,j ,k ) + 0.25 * fx(ibz,1:im)
e(iby,1:im,j ,km1) = e(iby,1:im,j ,km1) - 0.25 * fx(ibz,1:im) e(2,1:im,j ,km1) = e(2,1:im,j ,km1) + 0.25 * fx(ibz,1:im)
#else /* NDIMS == 3 */
e(iby,1:im,j ,k ) = e(iby,1:im,j ,k ) - fx(ibz,1:im)
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
e(ibz,1:im,j ,k ) = e(ibz,1:im,j ,k ) + 0.25 * fx(iby,1:im) e(3,1:im,j ,k ) = e(3,1:im,j ,k ) - 0.25 * fx(iby,1:im)
e(ibz,1:im,jm1,k ) = e(ibz,1:im,jm1,k ) + 0.25 * fx(iby,1:im) e(3,1:im,jm1,k ) = e(3,1:im,jm1,k ) - 0.25 * fx(iby,1:im)
#endif /* MHD */ #endif /* MHD */
end do end do
end do end do
@ -216,15 +216,15 @@ module scheme
f(2,ien,i,1:jm,k) = fy(ien,1:jm) f(2,ien,i,1:jm,k) = fy(ien,1:jm)
#endif /* ADI */ #endif /* ADI */
#ifdef MHD #ifdef MHD
#if NDIMS == 2
e(1,i ,1:jm,k ) = e(1,i ,1:jm,k ) - fy(iby,1:jm)
#endif /* NDIMS == 2 */
#if NDIMS == 3 #if NDIMS == 3
e(ibx,i ,1:jm,k ) = e(ibx,i ,1:jm,k ) + 0.25 * fy(ibz,1:jm) e(1,i ,1:jm,k ) = e(1,i ,1:jm,k ) - 0.25 * fy(iby,1:jm)
e(ibx,i ,1:jm,km1) = e(ibx,i ,1:jm,km1) + 0.25 * fy(ibz,1:jm) e(1,i ,1:jm,km1) = e(1,i ,1:jm,km1) - 0.25 * fy(iby,1:jm)
#else /* NDIMS == 3 */
e(ibx,i ,1:jm,k ) = e(ibx,i ,1:jm,k ) + fy(ibz,1:jm)
#endif /* NDIMS == 3 */ #endif /* NDIMS == 3 */
e(iby,i ,1:jm,k ) = e(iby,i ,1:jm,k ) + fy(iby,1:jm) e(3,i ,1:jm,k ) = e(3,i ,1:jm,k ) + 0.25 * fy(ibz,1:jm)
e(ibz,i ,1:jm,k ) = e(ibz,i ,1:jm,k ) - 0.25 * fy(ibx,1:jm) e(3,im1,1:jm,k ) = e(3,im1,1:jm,k ) + 0.25 * fy(ibz,1:jm)
e(ibz,im1,1:jm,k ) = e(ibz,im1,1:jm,k ) - 0.25 * fy(ibx,1:jm)
#endif /* MHD */ #endif /* MHD */
end do end do
end do end do
@ -280,11 +280,10 @@ module scheme
f(3,ien,i,j,1:km) = fz(ien,1:km) f(3,ien,i,j,1:km) = fz(ien,1:km)
#endif /* ADI */ #endif /* ADI */
#ifdef MHD #ifdef MHD
e(ibx,i ,j ,1:km) = e(ibx,i ,j ,1:km) - 0.25 * fz(iby,1:km) e(1,i ,j ,1:km) = e(1,i ,j ,1:km) + 0.25 * fz(ibz,1:km)
e(ibx,i ,jm1,1:km) = e(ibx,i ,jm1,1:km) - 0.25 * fz(iby,1:km) e(1,i ,jm1,1:km) = e(1,i ,jm1,1:km) + 0.25 * fz(ibz,1:km)
e(iby,i ,j ,1:km) = e(iby,i ,j ,1:km) + 0.25 * fz(ibx,1:km) e(2,i ,j ,1:km) = e(2,i ,j ,1:km) - 0.25 * fz(iby,1:km)
e(iby,im1,j ,1:km) = e(iby,im1,j ,1:km) + 0.25 * fz(ibx,1:km) e(2,im1,j ,1:km) = e(2,im1,j ,1:km) - 0.25 * fz(iby,1:km)
e(ibz,i ,j ,1:km) = e(ibz,i ,j ,1:km) + fz(ibz,1:km)
#endif /* MHD */ #endif /* MHD */
end do end do
end do end do

2
src/timer.F90
View File

@ -140,7 +140,7 @@ module timer
! !
!=============================================================================== !===============================================================================
! !
function get_timer_total function get_timer_total()
implicit none implicit none