From abdb6d9a6af1d0ae04d08933a1566805d46394ef Mon Sep 17 00:00:00 2001
From: Roland Haas <rhaas@tapir.caltech.edu>
Date: Fri, 27 Sep 2013 15:11:50 -0700
Subject: CarpetTest: make compile again

---
 .../CarpetTest/src/carpettest_check_arguments.F77  | 26 +++++++++++-----------
 Carpet/CarpetTest/src/carpettest_check_sizes.c     |  1 -
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Carpet/CarpetTest/src/carpettest_check_arguments.F77 b/Carpet/CarpetTest/src/carpettest_check_arguments.F77
index 06f7a8fe0..ee1263ebc 100644
--- a/Carpet/CarpetTest/src/carpettest_check_arguments.F77
+++ b/Carpet/CarpetTest/src/carpettest_check_arguments.F77
@@ -11,32 +11,32 @@ c     -*-Fortran-*-
       DECLARE_CCTK_FUNCTIONS
       DECLARE_CCTK_PARAMETERS
       integer i,j,k
-      print *, "Xgfg ", X0gfg, X1gfg, X2gfg
-      print *, "Xarrg3 ", X0arrg3, X1arrg3, X2arrg3
-      print *, "Xarrg2 ", X0arrg2, X1arrg2
-      print *, "Xarrg1 ", X0arrg1
+      print *, "Xgfg ", cctk_lsh(1), cctk_lsh(2), cctk_lsh(3)
+      print *, "Xarrg3 ", i3,i4,i5
+      print *, "Xarrg2 ", i6,i7
+      print *, "Xarrg1 ", i8
       print *, "Xscg"
       print *
-      do k=1,X2gfg
-         do j=1,X1gfg
-            do i=1,X0gfg
+      do k=1,cctk_lsh(3)
+         do j=1,cctk_lsh(2)
+            do i=1,cctk_lsh(1)
                gf(i,j,k) = i*10000 + j*100 + k
             end do
          end do
       end do
-      do k=1,X2arrg3
-         do j=1,X1arrg3
-            do i=1,X0arrg3
+      do k=1,i5
+         do j=1,i4
+            do i=1,i3
                arr3(i,j,k) = i*10000 + j*100 + k
             end do
          end do
       end do
-      do j=1,X1arrg2
-         do i=1,X0arrg2
+      do j=1,i7
+         do i=1,i6
             arr2(i,j) = i*100 + j
          end do
       end do
-      do i=1,X0arrg1
+      do i=1,i8
          arr1(i) = i
       end do
       sc = 42
diff --git a/Carpet/CarpetTest/src/carpettest_check_sizes.c b/Carpet/CarpetTest/src/carpettest_check_sizes.c
index 50e93643f..c2a2b68df 100644
--- a/Carpet/CarpetTest/src/carpettest_check_sizes.c
+++ b/Carpet/CarpetTest/src/carpettest_check_sizes.c
@@ -47,7 +47,6 @@ void carpettest_check_sizes (CCTK_ARGUMENTS)
     print_scalar_descr ("grouptype", data.grouptype, grouptype_string(data.grouptype));
     print_scalar_descr ("vartype", data.vartype, CCTK_VarTypeName(data.vartype));
     print_scalar_descr ("disttype", data.disttype, disttype_string(data.disttype));
-    print_scalar ("stagtype", data.stagtype);
     print_scalar ("numvars", data.numvars);
     print_scalar ("numtimelevels", data.numtimelevels);
     print_array ("gsh", dim, dyndata.gsh);
-- 
cgit v1.2.3