User: rhaas Date: 2011/09/19 06:16 PM
Modified: /trunk/src/ GRHydro_Source.F90
Log: fix non-multipatch source terms
File Changes:
Directory: /trunk/src/ ======================
File [modified]: GRHydro_Source.F90 Delta lines: +26 -11 =================================================================== --- trunk/src/GRHydro_Source.F90 2011-09-19 23:16:09 UTC (rev 276) +++ trunk/src/GRHydro_Source.F90 2011-09-19 23:16:38 UTC (rev 277) @@ -80,10 +80,13 @@ CCTK_INT :: GRHydro_UseGeneralCoordinates TARGET gaa, gab, gac, gbb, gbc, gcc TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET kaa, kab, kac, kbb, kbc, kcc + TARGET kxx, kxy, kxz, kyy, kyz, kzz TARGET betaa, betab, betac TARGET betax, betay, betaz TARGET lvel, vel CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 + CCTK_REAL, DIMENSION(:,:,:), POINTER :: k11, k12, k13, k22, k23, k33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup
@@ -94,6 +97,12 @@ g22 => gbb g23 => gbc g33 => gcc + k11 => kaa + k12 => kab + k13 => kac + k22 => kbb + k23 => kbc + k33 => kcc beta1 => betaa beta2 => betab beta3 => betac @@ -105,6 +114,12 @@ g22 => gyy g23 => gyz g33 => gzz + k11 => kxx + k12 => kxy + k13 => kxz + k22 => kyy + k23 => kyz + k33 => kzz beta1 => betax beta2 => betay beta3 => betaz @@ -340,21 +355,21 @@
!!$ Contract the shift with the eatrinsic curvature
- shiftshiftk = shifta*shifta*kaa(i,j,k) + & - shiftb*shiftb*kbb(i,j,k) + & - shiftc*shiftc*kcc(i,j,k) + & - two*(shifta*shiftb*kab(i,j,k) + & - shifta*shiftc*kac(i,j,k) + & - shiftb*shiftc*kbc(i,j,k)) + shiftshiftk = shifta*shifta*k11(i,j,k) + & + shiftb*shiftb*k22(i,j,k) + & + shiftc*shiftc*k33(i,j,k) + & + two*(shifta*shiftb*k12(i,j,k) + & + shifta*shiftc*k13(i,j,k) + & + shiftb*shiftc*k23(i,j,k))
- shiftka = shifta*kaa(i,j,k) + shiftb*kab(i,j,k) + shiftc*kac(i,j,k) - shiftkb = shifta*kab(i,j,k) + shiftb*kbb(i,j,k) + shiftc*kbc(i,j,k) - shiftkc = shifta*kac(i,j,k) + shiftb*kbc(i,j,k) + shiftc*kcc(i,j,k) + shiftka = shifta*k11(i,j,k) + shiftb*k12(i,j,k) + shiftc*k13(i,j,k) + shiftkb = shifta*k12(i,j,k) + shiftb*k22(i,j,k) + shiftc*k23(i,j,k) + shiftkc = shifta*k13(i,j,k) + shiftb*k23(i,j,k) + shiftc*k33(i,j,k)
!!$ Contract the matter terms with the extrinsic curvature
- sumTK = taa*kaa(i,j,k) + tbb*kbb(i,j,k) + tcc*kcc(i,j,k) & - + two*(tab*kab(i,j,k) + tac*kac(i,j,k) + tbc*kbc(i,j,k)) + sumTK = taa*k11(i,j,k) + tbb*k22(i,j,k) + tcc*k33(i,j,k) & + + two*(tab*k12(i,j,k) + tac*k13(i,j,k) + tbc*k23(i,j,k))
!!$ Update term for tau