Changeset 6184 for trunk/psLib/test/astro

Timestamp:

Jan 23, 2006, 10:04:31 AM (21 years ago)

Author:

drobbin

Message:

updated PrecessMethod. Fixed MetadataAddStr to error on NULL input. Time_TideUT1Corr?

Location:

trunk/psLib/test/astro

Files:

• tst_psEarthOrientation.c (modified) (10 diffs)
• tst_psTime_04.c (modified) (2 diffs)

trunk/psLib/test/astro/tst_psEarthOrientation.c

@@ -5 +5 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-18 23:49:06 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-23 20:04:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -132 +132 @@
     speed /= c;
 
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     empty = psAberration(empty, apparent, direction, speed);
     if (empty != NULL) {
@@ -138 +139 @@
         return 1;
     }
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     empty = psAberration(empty, actual, apparent, speed);
     if (empty != NULL) {
@@ -951 +953 @@
     psTime*       fromTime    = psTimeFromMJD(MJD_2100);
     psTime*       toTime      = psTimeFromMJD(MJD_1900);
-
+    psSphereRot *rot = NULL;
     // Set input coordinate
     inputCoord->r = SPHERE_PRECESS_TP1_R;
@@ -959 +961 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -977 +984 @@
     }
     psFree(outputCoord);
+    psFree(rot);
 
     // Set input coordinate
@@ -985 +993 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -1003 +1016 @@
     }
     psFree(outputCoord);
+    psFree(rot);
 
     // Set input coordinate
@@ -1011 +1025 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -1029 +1048 @@
     }
     psFree(outputCoord);
-
+    psFree(rot);
+
+    // Invoke precess with invalid parameter
+    /*
+        psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
+        outputCoord = psSpherePrecess(inputCoord, fromTime, NULL);
+        if(outputCoord != NULL) {
+            psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
+            return 10;
+        }
+     
+        // Invoke precess with invalid parameter
+        psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
+        outputCoord = psSpherePrecess(inputCoord, NULL, toTime);
+        if(outputCoord != NULL) {
+            psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
+            return 11;
+        }
+    */
     // Invoke precess with invalid parameter
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, fromTime, NULL);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 10;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, NULL, toTime);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 11;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(NULL, fromTime, toTime);
-    if(outputCoord != NULL) {
+    rot = psSpherePrecess(fromTime, toTime, 10);
+    //    outputCoord = psSpherePrecess(NULL, fromTime, toTime, PS_PRECESS_ROUGH);
+    if(rot != NULL) {
+        //    if(outputCoord != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
         return 12;
     }
+    psFree(rot);
 
     // Free objects

trunk/psLib/test/astro/tst_psTime_04.c

@@ -18 +18 @@
  *  @author  David Robbins, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-01-18 20:59:32 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
 
 testDescription tests[] = {
-                              {testTimeInit1,-1,"p_psTimeInit",0,false},
-                              {testTimeInit2,-2,"p_psTimeInit",0,false},
-                              {testTimeInit3,-3,"p_psTimeInit",0,false},
-                              {testTimeInit4,-4,"p_psTimeInit",0,false},
-                              {testTimeInit5,-5,"p_psTimeInit",0,false},
-                              {testTimeInit6,-6,"p_psTimeInit",0,false},
-                              {testTimer1,-7,"psTimer",0,false},
-                              {testTideUT1Corr,-8,"psTime_TideUT1Corr",0,false},
+                              {testTimeInit1,1,"p_psTimeInit",0,false},
+                              {testTimeInit2,2,"p_psTimeInit",0,false},
+                              {testTimeInit3,3,"p_psTimeInit",0,false},
+                              {testTimeInit4,4,"p_psTimeInit",0,false},
+                              {testTimeInit5,5,"p_psTimeInit",0,false},
+                              {testTimeInit6,6,"p_psTimeInit",0,false},
+                              {testTimer1,8,"psTimer",0,false},
+                              {testTideUT1Corr,9,"psTime_TideUT1Corr",0,false},
                               {NULL}
                           };