Changeset 5515

Timestamp:

Nov 14, 2005, 6:03:36 PM (21 years ago)

Author:

drobbin

Message:

edited VectorsReadFromFile per bug 577 and added Precession Model to EOC testing but fails to init correct tables

Location:

trunk/psLib

Files:

• src/types/psLookupTable.c (modified) (7 diffs)
• test/astro/tst_psEarthOrientation.c (modified) (5 diffs)

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-30 01:14:13 $
+*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-15 04:03:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -152 +152 @@
 
     value = (psS32)strtol(inString, &end, 0);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -169 +169 @@
 
     value = (psS64)strtoll(inString, &end, 0);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -186 +186 @@
 
     value = (psF32)strtof(inString, &end);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -203 +203 @@
 
     value = (psF64)strtod(inString, &end);
-    if(*end != '\0') {
+    if(*end != '\0' && !isspace(*end)) {
         *status = PS_PARSE_ERROR_VALUE;
     } else if(inString==end) {
@@ -444 +444 @@
     // Parse the format string to determine how many vectors
     // and whether the format string is valid
-    while((strValue=getToken((char**)&tempFormat," ",&parseStatus))) {
+    while((strValue=getToken((char**)&tempFormat,"    ",&parseStatus))) {
 
         // Check for %d format sub string
@@ -511 +511 @@
 
                     // Loop through format and line strings to get values in text table file
-                    while((strValue=getToken((char**)&tempFormat," ",&parseStatus)) &&
-                            (strNum=getToken((char**)&linePtr," ",&parseStatus)) ) {
+                    while((strValue=getToken((char**)&tempFormat,"    ",&parseStatus)) &&
+                            (strNum=getToken((char**)&linePtr,"    ",&parseStatus)) ) {
 
                         // Set column vector

trunk/psLib/test/astro/tst_psEarthOrientation.c

@@ -5 +5 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-12 03:37:34 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-15 04:03:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 
 //static psS32 testEOCParallax(void);
+static psS32 testEOCInit_Final(void);
 static psS32 testAberration(void);
 static psS32 testGravityDeflect(void);
@@ -25 +26 @@
 
 testDescription tests[] = {
+                              {testEOCInit_Final, 665, "psEOCInit_Final", 0, false},
                               {testAberration, 666, "psAberration()", 0, false},
                               {testGravityDeflect, 667, "psGravityDeflect()", 0, false},
@@ -56 +58 @@
 }
 
+psS32 testEOCInit_Final(void)
+{
+    return 0;
+}
+
 psS32 testAberration(void)
 {
@@ -145 +152 @@
     time->leapsecond = false;
 
+    //Tests for Precession Model //
+    psEarthPole *pmodel = NULL;
+    //Return NULL for NULL time input
+    pmodel = psEOC_PrecessionModel(empty);
+    if (pmodel != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psEOC_PrecessionModel failed to return NULL for NULL time input.\n");
+        return 1;
+    }
+    //Return NULL for UT1 time input
+    psTime *UT1time = psTimeAlloc(PS_TIME_UT1);
+    pmodel = psEOC_PrecessionModel(UT1time);
+    if (pmodel != NULL) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, false,
+                "psEOC_PrecessionModel failed to return NULL for UT1 input time.\n");
+        return 2;
+    }
+    psFree(UT1time);
+    //Check return values from valid precession input
+    pmodel = psEOC_PrecessionModel(time);
+    if ( pmodel == NULL ) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, false,
+                "psEOC_PrecessionModel returned NULL for valid input.\n");
+        return 3;
+    } else {
+        printf("Precession Model output = x,y,s = %.8g, %.8g, %.8g\n",
+               pmodel->x, pmodel->y, pmodel->s);
+    }
+    psFree(pmodel);
+
 
     //Tests for Precession Correction function//