From 241026cf5b79cc122585f02305e475277ab8c12f Mon Sep 17 00:00:00 2001 From: miguel Date: Fri, 13 Jul 2001 08:09:31 +0000 Subject: Removing obsolete code. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@47 b7a48df3-cbbf-4440-997f-b4b717c9f7fc --- src/ADMConstraints.F | 62 +++++----------------------------------------------- 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F index 453a43c..5ebc07c 100644 --- a/src/ADMConstraints.F +++ b/src/ADMConstraints.F @@ -12,7 +12,7 @@ c Momentum Constraints are: c c Del_j K_i^j - Del_i trK - 8 Pi j_i c -c @enddesc +c @enddesc c@@*/ #include "cctk.h" @@ -21,19 +21,6 @@ c@@*/ #include "CactusEinstein/Einstein/src/Einstein.h" -c/*@@ -c @routine ADMConstraints -c @date Aug 98 -c @desc -c Calculate the ADM Constraints -c @enddesc -c @calls -c @calledby - -c @history -c -c @endhistory -c@@*/ subroutine ADMConstraints(CCTK_ARGUMENTS) @@ -58,7 +45,6 @@ c Return code from Cactus boundary conditions. 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 @@ -76,8 +62,7 @@ c Macros from Standard Einstein. #include "CactusEinstein/Einstein/src/macro/MOMXADM_declare.h" #include "CactusEinstein/Einstein/src/macro/MOMYADM_declare.h" #include "CactusEinstein/Einstein/src/macro/MOMZADM_declare.h" -#include "CactusEinstein/Einstein/src/macro/DETG_declare.h" -#include "CactusEinstein/Einstein/src/macro/UPPERMET_declare.h" + c -------------------------------------------------------------- @@ -115,22 +100,14 @@ c ------------------------------------------------ c Initialize stress-energy tensor components. - Ttt = 0.0D0; Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0 + Ttt = 0.0D0 + + Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0 Txx = 0.0D0; Tyy = 0.0D0; Tzz = 0.0D0 Txy = 0.0D0; Txz = 0.0D0; Tyz = 0.0D0 -c Inverse metric may be needed for CalcTmunu. - -#include "CactusEinstein/Einstein/src/macro/DETG_guts.h" -#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h" - - det = DETG_DETCG - - uxx = UPPERMET_UXX; uyy = UPPERMET_UYY; uzz = UPPERMET_UZZ - uxy = UPPERMET_UXY; uxz = UPPERMET_UXZ; uyz = UPPERMET_UYZ - -c Call macro for stress energy tensor. +c Include macro for stress energy tensor. #include "CalcTmunu.inc" @@ -167,16 +144,6 @@ c = (T_00 - 2 beta^i T_{i0} + beta^i beta^j T_{ij})/alpha^2 ham(i,j,k) = HAMADM_HAMADM - 16.0D0*pi*m_rho -c From thorn MAHC (this overwrites all we just did). - -#ifdef THORN_MAHC - if ((some_hydro.eq.MAHCHYDRO).or. - . (some_hydro.eq.MAHCHYDRODUST)) then - ham(i,j,k) = ADM_ham(i,j,k) - 16.0d0*pi* - . ((rho(i,j,k) + rho(i,j,k)*eps(i,j,k) + press(i,j,k))* - . w_lorentz(i,j,k)**2 - press(i,j,k)) - end if -#endif c Calculate the Momentum constraints c ---------------------------------- @@ -221,27 +188,10 @@ c = - (T_{i0} - beta^j T_{ij})/alpha momy(i,j,k) = MOMYADM_MOMYADM - 8.0D0*pi*m_sy momz(i,j,k) = MOMZADM_MOMZADM - 8.0D0*pi*m_sz -c From thorn MAHC (this overwrites all we just did). - -#ifdef THORN_MAHC - if ((some_hydro.eq.MAHCHYDRO).or. - . (some_hydro.eq.MAHCHYDRODUST)) then - momx(i,j,k) = ADM_momx(i,j,k) - . - 8.0d0*pi*sx(i,j,k)/sqrt(det) - momy(i,j,k) = ADM_momy(i,j,k) - . - 8.0d0*pi*sy(i,j,k)/sqrt(det) - momz(i,j,k) = ADM_momz(i,j,k) - . - 8.0d0*pi*sz(i,j,k)/sqrt(det) - end if -#endif - end do 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" #include "CactusEinstein/Einstein/src/macro/MOMXADM_undefine.h" #include "CactusEinstein/Einstein/src/macro/MOMYADM_undefine.h" -- cgit v1.2.3