Index: trunk/psLib/test/astro/tst_psCoord.c
===================================================================
--- trunk/psLib/test/astro/tst_psCoord.c	(revision 5254)
+++ trunk/psLib/test/astro/tst_psCoord.c	(revision 5294)
@@ -6,6 +6,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-22 22:24:58 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-12 21:02:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52,22 +52,22 @@
 
     // Verify returned transform has members set properly
-    if ((1 + myPT->x->COOL_2D_nX) != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->x->COOL_2D_nX is %d, should be %d",
-                myPT->x->COOL_2D_nX, NX_TERMS-1);
+    if ((1 + myPT->x->nX) != NX_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPT->x->nX is %d, should be %d",
+                myPT->x->nX, NX_TERMS-1);
         return 2;
     }
-    if ((1 + myPT->y->COOL_2D_nX) != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->y->COOL_2D_nX is %d, should be %d",
-                myPT->y->COOL_2D_nX, NX_TERMS-1);
+    if ((1 + myPT->y->nX) != NX_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPT->y->nX is %d, should be %d",
+                myPT->y->nX, NX_TERMS-1);
         return 3;
     }
-    if ((1 + myPT->x->COOL_2D_nY) != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->x->COOL_2D_nY is %d, should be %d",
-                myPT->x->COOL_2D_nY, NY_TERMS-1);
+    if ((1 + myPT->x->nY) != NY_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPT->x->nY is %d, should be %d",
+                myPT->x->nY, NY_TERMS-1);
         return 4;
     }
-    if ((1 + myPT->y->COOL_2D_nY) != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->y->COOL_2D_nY is %d, should be %d",
-                myPT->y->COOL_2D_nY, NY_TERMS-1);
+    if ((1 + myPT->y->nY) != NY_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPT->y->nY is %d, should be %d",
+                myPT->y->nY, NY_TERMS-1);
         return 5;
     }
@@ -109,42 +109,42 @@
     }
     // Verify the terms are properly set after allocation
-    if ((1 + myPD->x->COOL_4D_nX) != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->COOL_4D_nX is %d, should be %d",
-                myPD->x->COOL_4D_nX, NX_TERMS-1);
+    if ((1 + myPD->x->nX) != NX_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->x->nX is %d, should be %d",
+                myPD->x->nX, NX_TERMS-1);
         return 2;
     }
-    if ((1 + myPD->y->COOL_4D_nX) != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->COOL_4D_nX is %d, should be %d",
-                myPD->y->COOL_4D_nX, NX_TERMS-1);
+    if ((1 + myPD->y->nX) != NX_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->y->nX is %d, should be %d",
+                myPD->y->nX, NX_TERMS-1);
         return 3;
     }
-    if ((1 + myPD->x->COOL_4D_nY) != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->COOL_4D_nY is %d, should be %d",
-                myPD->x->COOL_4D_nY, NY_TERMS-1);
+    if ((1 + myPD->x->nY) != NY_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->x->nY is %d, should be %d",
+                myPD->x->nY, NY_TERMS-1);
         return 4;
     }
-    if ((1 + myPD->y->COOL_4D_nY) != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->COOL_4D_nY is %d, should be %d",
-                myPD->y->COOL_4D_nY, NY_TERMS-1);
+    if ((1 + myPD->y->nY) != NY_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->y->nY is %d, should be %d",
+                myPD->y->nY, NY_TERMS-1);
         return 5;
     }
-    if ((1 + myPD->x->COOL_4D_nZ) != NZ_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->COOL_4D_nZ is %d, should be %d",
-                myPD->x->COOL_4D_nX, NZ_TERMS-1);
+    if ((1 + myPD->x->nZ) != NZ_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->x->nZ is %d, should be %d",
+                myPD->x->nX, NZ_TERMS-1);
         return 6;
     }
-    if ((1 + myPD->y->COOL_4D_nZ) != NZ_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->COOL_4D_nZ is %d, should be %d",
-                myPD->y->COOL_4D_nZ, NZ_TERMS-1);
+    if ((1 + myPD->y->nZ) != NZ_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->y->nZ is %d, should be %d",
+                myPD->y->nZ, NZ_TERMS-1);
         return 7;
     }
-    if ((1 + myPD->x->COOL_4D_nT) != NT_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->COOL_4D_nT is %d, should be %d",
-                myPD->x->COOL_4D_nT, NT_TERMS-1);
+    if ((1 + myPD->x->nT) != NT_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->x->nT is %d, should be %d",
+                myPD->x->nT, NT_TERMS-1);
         return 8;
     }
-    if ((1 + myPD->y->COOL_4D_nT) != NT_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->COOL_4D_nT is %d, should be %d",
-                myPD->y->COOL_4D_nT, NT_TERMS-1);
+    if ((1 + myPD->y->nT) != NT_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->y->nT is %d, should be %d",
+                myPD->y->nT, NT_TERMS-1);
         return 9;
     }