Adding #include "CalcTmunu_temps.inc".

Thanks to Mitica Vulcanov for noticing it was missing.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@44 b7a48df3-cbbf-4440-997f-b4b717c9f7fc

1 files changed, 22 insertions, 9 deletions

diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F
index 7c61d21..c97828d 100644
--- a/src/ADMConstraints.F
+++ b/src/ADMConstraints.F
@@ -15,17 +15,12 @@ c
 c  @enddesc 
 c@@*/
 
-c --------------------------------------------------------------
-
-c CCTK Header files
 #include "cctk.h"
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
  
 #include "CactusEinstein/Einstein/src/Einstein.h"
 
-c --------------------------------------------------------------
-
 c/*@@
 c  @routine    ADMConstraints
 c  @date       Aug 98
@@ -34,6 +29,7 @@ c    Calculate the ADM Constraints
 c  @enddesc 
 c  @calls     
 c  @calledby   
+
 c  @history 
 c
 c  @endhistory 
@@ -50,21 +46,32 @@ c@@*/
       integer :: i,j,k
       integer :: nx,ny,nz
 
-c     Stencil width used for calculating constraints (for outer boundary condition)
+c     Stencil width used for calculating constraints
+c     (for outer boundary condition)
+
       integer, dimension(3),parameter :: sw = 1
 
-c     Return code from Cactus boundary conditions
+c     Return code from Cactus boundary conditions.
+
       integer ierr
 
+c     Various real variables.
+
       CCTK_REAL :: dx,dy,dz
       CCTK_REAL :: det,uxx,uxy,uxz,uyy,uyz,uzz
       CCTK_REAL :: m_rho,m_sx,m_sy,m_sz
       CCTK_REAL :: pi,ialp,ialp2
 
-c     Temporaries for the Stress-Energy tensor
+c     Temporaries for the Stress-Energy tensor.
+
       CCTK_REAL :: Ttt,Ttx,Tty,Ttz,Txx,Txy,Txz,Tyy,Tyz,Tzz
 
-c     Macros from Standard Einstein
+c     Matter declarations.
+
+#include "CalcTmunu_temps.inc"
+
+c     Macros from Standard Einstein.
+
 #include "CactusEinstein/Einstein/src/macro/HAMADM_declare.h"
 #include "CactusEinstein/Einstein/src/macro/MOMXADM_declare.h"
 #include "CactusEinstein/Einstein/src/macro/MOMYADM_declare.h"
@@ -72,6 +79,8 @@ c     Macros from Standard Einstein
 #include "CactusEinstein/Einstein/src/macro/DETG_declare.h"
 #include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
 
+c --------------------------------------------------------------
+
 c     Grid parameters.
 
       dx = cctk_delta_space(1)
@@ -141,6 +150,7 @@ c                  = (T_00 - 2 beta^i T_{i0} + beta^i beta^j T_{ij})/alpha^2
 
                m_rho = ialp2*Ttt
 
+
                if (shift_state == SHIFT_ACTIVE) then
 
                   m_rho = m_rho + ialp2
@@ -154,6 +164,7 @@ c                  = (T_00 - 2 beta^i T_{i0} + beta^i beta^j T_{ij})/alpha^2
      &               + betay(i,j,k)**2*Tty
      &               + betaz(i,j,k)**2*Ttz)*2.0D0)
 
+
                end if
 
                ham(i,j,k) = HAMADM_HAMADM - 16.0D0*pi*m_rho
@@ -186,6 +197,7 @@ c              S_i = - g_{ia} n_b T^{ab} = - g_i^a n^b T_{ab}
 c                  = - (T_{i0} - beta^j T_{ij})/alpha
 
                m_sx = - ialp*Ttx
+
                m_sy = - ialp*Tty
                m_sz = - ialp*Ttz
 
@@ -230,6 +242,7 @@ c              From thorn MAHC (this overwrites all we just did).
          end do 
       end do
 
+
 #include "CactusEinstein/Einstein/src/macro/DETG_undefine.h"
 #include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
 #include "CactusEinstein/Einstein/src/macro/HAMADM_undefine.h"