Implementing new naming convention for variables on the cGH. See cGH.h for

details.


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

1 files changed, 25 insertions, 26 deletions

diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F
index d88a020..7296ece 100644
--- a/src/ADMConstraints.F
+++ b/src/ADMConstraints.F
@@ -22,8 +22,7 @@ c CCTK Header files
 #include "declare_parameters.h"
 #include "declare_arguments.h"
  
-c Using macro definitions from Einstein
-#include "../../packages/CactusEinstein/Einstein/src/Einstein.h"
+#include "CactusEinstein/Einstein/src/Einstein.h"
 
 c --------------------------------------------------------------
 
@@ -65,23 +64,23 @@ c     Temporaries for the Stress-Energy tensor
 #include "CalcTmunu_temps.inc"
 
 c     Macros from Standard Einstein
-#include "../../packages/CactusEinstein/Einstein/src/macro/HAMADM_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMXADM_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMYADM_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMZADM_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_declare.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_declare.h"
+#include "CactusEinstein/Einstein/src/macro/HAMADM_declare.h"
+#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"
 
-      dx = delta_space(1)
-      dy = delta_space(2)
-      dz = delta_space(3)
+      dx = cctk_delta_space(1)
+      dy = cctk_delta_space(2)
+      dz = cctk_delta_space(3)
 
       i1 = 2
-      i2 = sh(1)-1
+      i2 = cctk_lsh(1)-1
       j1 = 2
-      j2 = sh(2)-1
+      j2 = cctk_lsh(2)-1
       k1 = 2
-      k2 = sh(2)-1
+      k2 = cctk_lsh(3)-1
   
       do i=i1,i2
         do j=j1,j2
@@ -108,9 +107,9 @@ c              ------------------------------------------------
                Tyz = 0.0D0; Tzz = 0.0D0
                
 c              This may be needed for CalcTmunu etc
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_guts.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_guts.h"
                det = DETG_DETCG
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_guts.h"
                uxx = UPPERMET_UXX; uxy = UPPERMET_UXY; uxz = UPPERMET_UXZ
                uyy = UPPERMET_UYY; uyz = UPPERMET_UYZ; uzz = UPPERMET_UZZ
 #include "CalcTmunu.inc"
@@ -119,7 +118,7 @@ c              This may be needed for CalcTmunu etc
 c              Calculate the hamiltonian constraint
 c              ------------------------------------
 
-#include "../../packages/CactusEinstein/Einstein/src/macro/HAMADM_guts.h"
+#include "CactusEinstein/Einstein/src/macro/HAMADM_guts.h"
 
                ham(i,j,k) = HAMADM_HAMADM - 16D0*Pi*Ttt/alp(i,j,k)**2
 
@@ -136,9 +135,9 @@ c              ------------------------------------
 c              Calculate the Momentum constraints
 c              ----------------------------------
 
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMXADM_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMYADM_guts.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMZADM_guts.h"
+#include "CactusEinstein/Einstein/src/macro/MOMXADM_guts.h"
+#include "CactusEinstein/Einstein/src/macro/MOMYADM_guts.h"
+#include "CactusEinstein/Einstein/src/macro/MOMZADM_guts.h"
 
                momx(i,j,k) = MOMXADM_MOMXADM - 8D0*Pi*Ttx/alp(i,j,k)**2
                momy(i,j,k) = MOMYADM_MOMYADM - 8D0*Pi*Tty/alp(i,j,k)**2
@@ -161,12 +160,12 @@ c              ----------------------------------
          enddo
       enddo
 
-#include "../../packages/CactusEinstein/Einstein/src/macro/DETG_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/HAMADM_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMXADM_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMYADM_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/MOMZADM_undefine.h"
-#include "../../packages/CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/DETG_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"
+#include "CactusEinstein/Einstein/src/macro/MOMZADM_undefine.h"
+#include "CactusEinstein/Einstein/src/macro/UPPERMET_undefine.h"
 
 
 c     Synchronize and apply flat boundary conditions