diff options
author | allen <allen@b7a48df3-cbbf-4440-997f-b4b717c9f7fc> | 2002-05-16 20:50:12 +0000 |
---|---|---|
committer | allen <allen@b7a48df3-cbbf-4440-997f-b4b717c9f7fc> | 2002-05-16 20:50:12 +0000 |
commit | 0e9d7de52d12fc6f3f2d7179aec4187bae08e90a (patch) | |
tree | 1e1d58e8212d0da47d4caef2ec0a76a214e9e53f /src | |
parent | 4f278f3f1fe3fe32540f1c8e77b7b769fbbef10f (diff) |
changing ifdefs and include files
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@68 b7a48df3-cbbf-4440-997f-b4b717c9f7fc
Diffstat (limited to 'src')
-rw-r--r-- | src/ADMConstraints.F | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F index e6a957b..8eaba09 100644 --- a/src/ADMConstraints.F +++ b/src/ADMConstraints.F @@ -37,7 +37,7 @@ integer :: i,j,k integer :: nx,ny,nz -#ifdef EXCISION2_LEGOEXCISION /* EINSTEIN REVAMP */ +#ifdef EXCISION_LEGOEXCISION CCTK_REAL, allocatable, dimension (:,:,:) :: dirx,diry,dirz,aux #endif @@ -67,12 +67,12 @@ c Matter declarations. c Macros from Standard Einstein. -#include "CactusEinstein2/ADMMacros/src/macro/HAMADM_declare.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMXADM_declare.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMYADM_declare.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMZADM_declare.h" -#include "CactusEinstein2/ADMMacros/src/macro/DETG_declare.h" -#include "CactusEinstein2/ADMMacros/src/macro/UPPERMET_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/HAMADM_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMXADM_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMYADM_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMZADM_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/DETG_declare.h" +#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_declare.h" c -------------------------------------------------------------- @@ -110,11 +110,11 @@ c ------------------------------------------------ c This may be needed for CalcTmunu -#include "CactusEinstein2/ADMMacros/src/macro/DETG_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/DETG_guts.h" det = DETG_DETCG -#include "CactusEinstein2/ADMMacros/src/macro/UPPERMET_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_guts.h" uxx = UPPERMET_UXX; uxy = UPPERMET_UXY; uxz = UPPERMET_UXZ uyy = UPPERMET_UYY; uyz = UPPERMET_UYZ; uzz = UPPERMET_UZZ @@ -137,7 +137,7 @@ c ------------------------------------ c Geometric piece. -#include "CactusEinstein2/ADMMacros/src/macro/HAMADM_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/HAMADM_guts.h" c Add matter terms: - 16*pi*rho c @@ -171,9 +171,9 @@ c ---------------------------------- c Geometric piece. -#include "CactusEinstein2/ADMMacros/src/macro/MOMXADM_guts.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMYADM_guts.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMZADM_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMXADM_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMYADM_guts.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMZADM_guts.h" c Add matter terms: - 8*pi*S_i c @@ -213,18 +213,18 @@ c = - (T_{i0} - beta^j T_{ij})/alpha end do end do -#include "CactusEinstein2/ADMMacros/src/macro/DETG_undefine.h" -#include "CactusEinstein2/ADMMacros/src/macro/UPPERMET_undefine.h" -#include "CactusEinstein2/ADMMacros/src/macro/HAMADM_undefine.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMXADM_undefine.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMYADM_undefine.h" -#include "CactusEinstein2/ADMMacros/src/macro/MOMZADM_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/DETG_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/UPPERMET_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/HAMADM_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMXADM_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMYADM_undefine.h" +#include "CactusEinstein/ADMMacros/src/macro/MOMZADM_undefine.h" c LegoExcision (must be done before symmetries are applied). if (excise==1) then -#ifdef EXCISION2_LEGOEXCISION /* EINSTEIN REVAMP */ +#ifdef EXCISION_LEGOEXCISION allocate(dirx(nx,ny,nz),diry(nx,ny,nz),dirz(nx,ny,nz)) allocate(aux(nx,ny,nz)) |