[Chasm-interop-cvs] chasm/test/descriptors test_types.c,1.9,1.10

[<ras...@us...>]

Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv6419

Modified Files:
	test_types.c 
Log Message:
Modified for F90_MIN_ELEMENT_SIZE on Cray.

Index: test_types.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/test_types.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_types.c	6 Sep 2003 23:48:07 -0000	1.9
--- test_types.c	30 Oct 2003 22:30:13 -0000	1.10
***************
*** 65,72 ****
--- 65,77 ----
    void *desc, *dv, *dv_hidden;
    int i, rank, rc;
+ #if F90_MIN_ELEMENT_SIZE == 4
+   int sa[10];
+ #else
    short sa[10];
+ #endif
    int ia[10];
    long la[10];
    long lb[7], stride[7];
+   unsigned long elem_size;
    unsigned long extent[7];
  
***************
*** 89,95 ****
    /* create short array descriptor */
  
!   stride[0] = sizeof(short);
    rc = cc.setArrayDesc(desc, sa, rank, F90_Array,
! 		       F90_Integer2, sizeof(short), lb, extent, stride);
    if (rc) {
      fprintf(stderr, "ERROR in setting array descriptor\n");
--- 94,102 ----
    /* create short array descriptor */
  
!   elem_size = sizeof(short);
!   if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
!   stride[0] = elem_size;
    rc = cc.setArrayDesc(desc, sa, rank, F90_Array,
! 		       F90_Integer2, elem_size, lb, extent, stride);
    if (rc) {
      fprintf(stderr, "ERROR in setting array descriptor\n");
***************
*** 153,159 ****
    /* create int array descriptor */
  
!   stride[0] = sizeof(int);
    rc = cc.setArrayDesc(desc, ia, rank, F90_Array,
! 		       F90_Integer, sizeof(int), lb, extent, stride);
    if (rc) {
      fprintf(stderr, "ERROR in setting array descriptor\n");
--- 160,167 ----
    /* create int array descriptor */
  
!   elem_size = sizeof(int);
!   stride[0] = elem_size;
    rc = cc.setArrayDesc(desc, ia, rank, F90_Array,
! 		       F90_Integer, elem_size, lb, extent, stride);
    if (rc) {
      fprintf(stderr, "ERROR in setting array descriptor\n");
***************
*** 217,227 ****
    /* create long array descriptor */
  
!   stride[0] = sizeof(long);
!   if (sizeof(long) == 4) {
      rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! 			 F90_Integer4, sizeof(long), lb, extent, stride);
!   } else if (sizeof(long) == 8) {
      rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! 			 F90_Integer8, sizeof(long), lb, extent, stride);
    } else {
      fprintf(stderr, "ERROR, sizeof(long) neither 4 nor 8\n");
--- 225,236 ----
    /* create long array descriptor */
  
!   elem_size = sizeof(int);
!   stride[0] = elem_size;
!   if (elem_size == 4) {
      rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! 			 F90_Integer4, elem_size, lb, extent, stride);
!   } else if (elem_size == 8) {
      rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! 			 F90_Integer8, elem_size, lb, extent, stride);
    } else {
      fprintf(stderr, "ERROR, sizeof(long) neither 4 nor 8\n");