Index: /trunk/psLib/src/astro/psEarthOrientation.c =================================================================== --- /trunk/psLib/src/astro/psEarthOrientation.c (revision 5521) +++ /trunk/psLib/src/astro/psEarthOrientation.c (revision 5522) @@ -8,6 +8,6 @@ * @author Robert Daniel DeSonia, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-15 22:19:29 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-11-16 02:40:13 $ * * Copyright 2005 Maui High Performance Computing Center, University of Hawaii @@ -68,5 +68,5 @@ } -static bool eocInit() +bool p_psEOCInit() { unsigned int nFail = 0; @@ -353,14 +353,4 @@ } -/* -double psEOC_ParallaxFactor(const psSphere *coords, - const psTime *time) -{ - - - return NAN; -} -*/ - psEarthPole *psEOC_PrecessionModel(const psTime *time) { @@ -431,5 +421,5 @@ // Check if EOC data loaded if(! eocInitialized) { - eocInitialized = eocInit(); + eocInitialized = p_psEOCInit(); if(!eocInitialized) { // XXX: Move error message. Index: /trunk/psLib/src/astro/psEarthOrientation.h =================================================================== --- /trunk/psLib/src/astro/psEarthOrientation.h (revision 5521) +++ /trunk/psLib/src/astro/psEarthOrientation.h (revision 5522) @@ -9,6 +9,6 @@ * @author Robert Daniel DeSonia, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-07 20:52:43 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-11-16 02:40:13 $ * * Copyright 2005 Maui High Performance Computing Center, University of Hawaii @@ -44,4 +44,12 @@ } psPrecessMethod; + +bool p_psEOCInit(void); + +/** Finalize EOC after using functions that make calls to eocInit for time table data + * + * @return bool: True if successful, otherwise false. + */ +bool p_psEOCFinalize(void); /** Allocates a new psEarthPole structure. */ @@ -79,16 +87,4 @@ psSphere *sun ///< position of the sun ); - - -/* Calculate the parallax factor for the given position and time. - * - * @return double: the calculated parallax factor. - */ -/* -double psEOC_ParallaxFactor( - const psSphere *coords, ///< specified position - const psTime *time ///< specified time -); -*/ /** Calculates the components of the rotation between the CEO and GCRS frames, X, Y, Index: /trunk/psLib/src/types/psLookupTable.c =================================================================== --- /trunk/psLib/src/types/psLookupTable.c (revision 5521) +++ /trunk/psLib/src/types/psLookupTable.c (revision 5522) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-15 04:03:36 $ +* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-11-16 02:40:13 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -444,5 +444,5 @@ // 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," \t",&parseStatus))) { // Check for %d format sub string @@ -511,6 +511,6 @@ // 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," \t",&parseStatus)) && + (strNum=getToken((char**)&linePtr," \t",&parseStatus)) ) { // Set column vector Index: /trunk/psLib/test/astro/tst_psEarthOrientation.c =================================================================== --- /trunk/psLib/test/astro/tst_psEarthOrientation.c (revision 5521) +++ /trunk/psLib/test/astro/tst_psEarthOrientation.c (revision 5522) @@ -5,6 +5,6 @@ * @author d-Rob, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-11-15 04:03:36 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-11-16 02:40:13 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -171,15 +171,16 @@ 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); - + /* + 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// @@ -227,4 +228,9 @@ psFree(time); + /* if (!p_psEOCFinalize() ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, "EOC failed finalization!\n"); + return 12; + } + */ return 0; } Index: /trunk/psLib/test/astro/verified/tst_psEarthOrientation.stderr =================================================================== --- /trunk/psLib/test/astro/verified/tst_psEarthOrientation.stderr (revision 5521) +++ /trunk/psLib/test/astro/verified/tst_psEarthOrientation.stderr (revision 5522) @@ -1,2 +1,11 @@ +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psEarthOrientation.c * +* TestPoint: psEarthOrientation{psEOCInit_Final} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psEarthOrientation{psEOCInit_Final} | tst_psEarthOrientation.c) + /***************************** TESTPOINT ******************************************\ * TestFile: tst_psEarthOrientation.c * @@ -31,4 +40,8 @@ \**********************************************************************************/ +