Fixed bug in ASCII output -- only the x dimesion was output, and not y and z.

darcs-hash:20010704115523-07bb3-7b9654076c9c8a713187ced500383516a952ef26.gz

3 files changed, 52 insertions, 6 deletions

diff --git a/Carpet/CarpetTest/schedule.ccl b/Carpet/CarpetTest/schedule.ccl
index 49b161fba..ce64a4728 100644
--- a/Carpet/CarpetTest/schedule.ccl
+++ b/Carpet/CarpetTest/schedule.ccl
@@ -1,14 +1,14 @@
 # Schedule definitions for thorn CarpetTest
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/schedule.ccl,v 1.1 2001/07/04 12:29:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/schedule.ccl,v 1.2 2001/07/04 13:55:24 schnetter Exp $
+
+STORAGE: gfg arrg1 arrg2 arrg3
 
 schedule carpettest_check_sizes AT initial
 {
   LANG: C
-  STORAGE: gfg arrg1 arrg2 arrg3
 } "Check grid function and grid array sizes"
 
 schedule carpettest_check_arguments AT initial
 {
   LANG: Fortran
-  STORAGE: gfg arrg1 arrg2 arrg3
 } "Check grid function and grid array arguments"
diff --git a/Carpet/CarpetTest/src/carpettest_check_arguments.F77 b/Carpet/CarpetTest/src/carpettest_check_arguments.F77
index 7c4fab201..d24f2a391 100644
--- a/Carpet/CarpetTest/src/carpettest_check_arguments.F77
+++ b/Carpet/CarpetTest/src/carpettest_check_arguments.F77
@@ -1,4 +1,4 @@
-c     $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/src/carpettest_check_arguments.F77,v 1.1 2001/07/04 12:29:54 schnetter Exp $
+c     $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/src/carpettest_check_arguments.F77,v 1.2 2001/07/04 13:55:25 schnetter Exp $
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
@@ -8,9 +8,32 @@ c     $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/src/carpettest_c
       implicit none
       DECLARE_CCTK_ARGUMENTS
       DECLARE_CCTK_PARAMETERS
+      integer i,j,k
       print *, "gfg ", gfg0, gfg1, gfg2
       print *, "arrg3 ", arrg30, arrg31, arrg32
       print *, "arrg2 ", arrg20, arrg21
       print *, "arrg1 ", arrg10
       print *
+      do k=1,gfg2
+         do j=1,gfg1
+            do i=1,gfg0
+               gf(i,j,k) = i*10000 + j*100 + k
+            end do
+         end do
+      end do
+      do k=1,arrg32
+         do j=1,arrg31
+            do i=1,arrg30
+               arr3(i,j,k) = i*10000 + j*100 + k
+            end do
+         end do
+      end do
+      do j=1,arrg21
+         do i=1,arrg20
+            arr2(i,j) = i*100 + j
+         end do
+      end do
+      do i=1,arrg10
+         arr1(i) = i
+      end do
       end
diff --git a/Carpet/CarpetTest/test/arraysizes.par b/Carpet/CarpetTest/test/arraysizes.par
index 9660c8e36..416bc883c 100644
--- a/Carpet/CarpetTest/test/arraysizes.par
+++ b/Carpet/CarpetTest/test/arraysizes.par
@@ -1,5 +1,28 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/test/arraysizes.par,v 1.1 2001/07/04 12:29:55 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetTest/test/arraysizes.par,v 1.2 2001/07/04 13:55:25 schnetter Exp $
 
 !DESC "Check array sizes"
 
-ActiveThorns = "Carpet CarpetLib CarpetTest"
+ActiveThorns = "Carpet CarpetLib CarpetSlab Cart3d IOUtil CarpetIOASCII CarpetTest"
+
+Cactus::cctk_itlast	= 0
+
+IO::outdir		= "arraysizes"
+
+IOASCII::out1D_every	= 1
+IOASCII::out2D_every	= 1
+IOASCII::out3D_every	= 1
+
+IOASCII::out1D_xline_yi	= 0
+IOASCII::out1D_xline_zi	= 0
+IOASCII::out1D_yline_xi	= 0
+IOASCII::out1D_yline_zi	= 0
+IOASCII::out1D_zline_xi	= 0
+IOASCII::out1D_zline_yi	= 0
+
+IOASCII::out2D_xyplane_zi	= 0
+IOASCII::out2D_xzplane_yi	= 0
+IOASCII::out2D_yzplane_xi	= 0
+
+IOASCII::out1D_vars	= "CarpetTest::gfg CarpetTest::arrg3 CarpetTest::arrg2 CarpetTest::arrg1"
+IOASCII::out2D_vars	= "CarpetTest::gfg CarpetTest::arrg3 CarpetTest::arrg2 CarpetTest::arrg1"
+IOASCII::out3D_vars	= "CarpetTest::gfg CarpetTest::arrg3 CarpetTest::arrg2 CarpetTest::arrg1"