Changeset 4937 for trunk/psLib/src/astro

Timestamp:

Aug 31, 2005, 12:28:35 PM (21 years ago)

Author:

drobbin

Message:

fixed psSphere struct, changed psPolynomial to unsigned int's

Location:

trunk/psLib/src/astro

Files:

• psCoord.h (modified) (3 diffs)
• psSphereOps.h (modified) (2 diffs)
• psTime.c (modified) (8 diffs)
• psTime.h (modified) (3 diffs)

trunk/psLib/src/astro/psCoord.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-30 01:14:10 $
+*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-08-31 22:28:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 #include "psList.h"
 #include "psFunctions.h"
-#include "psTime.h"
+//#include "psTime.h"
 
 /// @addtogroup CoordinateTransform
@@ -52 +52 @@
  *
  */
-typedef struct psSphere
+typedef struct
 {
     double r;                          ///< RA

trunk/psLib/src/astro/psSphereOps.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:10 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 22:28:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -19 +19 @@
 /// @{
 
-#include "psCoord.h"
+//#include "psCoord.h"
+#include "psTime.h"
 
 /** Spherical Rotation Definition

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:10 $
+ *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 22:28:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 #include "psAbort.h"
 #include "psImage.h"
-#include "psCoord.h"
 #include "psString.h"
 #include "psMetadata.h"
@@ -899 +898 @@
 }
 
-struct psSphere* p_psTimeGetPoleCoords(const psTime* time)
+psSphere* p_psTimeGetPoleCoords(const psTime* time)
 {
     psU32 nTables = 3;
@@ -908 +907 @@
     psF64 c = 0.0;
     psF64 mjdPred = 0.0;
-    struct psSphere* output = NULL;
+    psSphere* output = NULL;
     psLookupStatusType xStatus = PS_LOOKUP_SUCCESS;
     psLookupStatusType yStatus = PS_LOOKUP_SUCCESS;
@@ -920 +919 @@
     PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,(psU32)((1e9)-1),NULL);
 
-    if(time->type != PS_TIME_TAI)
-    {
+    if(time->type != PS_TIME_TAI) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_INCORRECT, time->type);
         return NULL;
@@ -934 +932 @@
 
     // Value could not be found through table lookup and interpolation
-    if(xStatus==PS_LOOKUP_PAST_TOP && yStatus==PS_LOOKUP_PAST_TOP)
-    {
+    if(xStatus==PS_LOOKUP_PAST_TOP && yStatus==PS_LOOKUP_PAST_TOP) {
 
         // Date too earlier for tables. Get default polar coodinate values from metadata, and issue warning.
@@ -954 +951 @@
         y = tableMetadataItem->data.F64;
 
-    } else if(xStatus==PS_LOOKUP_PAST_BOTTOM && yStatus==PS_LOOKUP_PAST_BOTTOM)
-    {
+    } else if(xStatus==PS_LOOKUP_PAST_BOTTOM && yStatus==PS_LOOKUP_PAST_BOTTOM) {
 
         /* Date too late for tables. Issue warning and use following formulae for predicting
@@ -1012 +1008 @@
             yp->data.F64[4]*sin(c);
 
-    } else if(xStatus!=PS_LOOKUP_SUCCESS || yStatus!=PS_LOOKUP_SUCCESS)
-    {
+    } else if(xStatus!=PS_LOOKUP_SUCCESS || yStatus!=PS_LOOKUP_SUCCESS) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED);
         return NULL;

trunk/psLib/src/astro/psTime.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:09 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 22:28:35 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psType.h"
 #include "psImage.h"
+#include "psCoord.h"
 
 struct psSphere;
@@ -173 +174 @@
  *  @return  psSphere*: Spherical coordinates of Earth's polar axias.
  */
-struct psSphere* p_psTimeGetPoleCoords(
-                const psTime *time      ///< psTime determine polar orientation.
-            );
+psSphere* p_psTimeGetPoleCoords(
+    const psTime *time      ///< psTime determine polar orientation.
+);
 
 /** Calculate the number of leapseconds between two times.