Changeset 2600 for trunk/psLib/src/astro

Timestamp:

Dec 2, 2004, 11:12:52 AM (22 years ago)

Author:

gusciora

Message:

Renamed members of the psSphereTransform struct.

Location:

trunk/psLib/src/astro

Files:

• psCoord.c (modified) (6 diffs)
• psCoord.h (modified) (3 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -8 +8 @@
 *  @ingroup CoordinateTransform
 *
-*  @author George Gusciora, MHPCC
+*  @author GLG, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-01 19:56:05 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-02 21:12:51 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
 This function prototype has been modified since the SDRS.
  *****************************************************************************/
-psSphereTransform* psSphereTransformAlloc(double NPlat,
-        double Xo,
-        double xo)
+psSphereTransform* psSphereTransformAlloc(double alphaP,
+        double deltaP,
+        double phiP)
 {
     psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform));
 
-    tmp->sinPhi = sin(NPlat);
-    tmp->cosPhi = cos(NPlat);
-    tmp->Xo = Xo;
-    tmp->xo = xo;
+    tmp->cosDeltaP = cos(deltaP);
+    tmp->sinDeltaP = cos(deltaP);
+    tmp->alphaP = alphaP;
+    tmp->phiP = phiP;
 
     return (tmp);
@@ -207 +207 @@
     x = coord->r;
     y = coord->d;
-    dx = x - transform->xo;
-    sinY = cos(y) * sin(dx) * transform->sinPhi + sin(y) * transform->cosPhi;
+    dx = x - transform->phiP;
+    sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP;
     cosY = sqrt(1.0 - sinY * sinY);
-    sinX = (cos(y) * sin(dx) * transform->cosPhi - sin(y) * transform->sinPhi) / cos(y);
+    sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y);
     cosX = cos(y) * cos(dx) / cos(y);
 
-    out->r = atan2(sinX, cosX) + transform->Xo;
+    out->r = atan2(sinX, cosX) + transform->alphaP;
     out->d = atan2(sinY, cosY);
 
@@ -227 +227 @@
     double T = year / 100.0;
     double phi = -23.452294 + 0.013013 * T + 0.000001639 * T * T - 0.000000503 * T * T * T;
-    double Xo = 0.0;
-    double xo = 0.0;
+    double alphaP = 0.0;
+    double phiP = 0.0;
 
     psFree(tmTime);
-    return (psSphereTransformAlloc(phi, Xo, xo));
+    return (psSphereTransformAlloc(phi, alphaP, phiP));
 }
 
@@ -242 +242 @@
     double T = year / 100.0;
     double phi = +23.452294 - 0.013013 * T - 0.000001639 * T * T + 0.000000503 * T * T * T;
-    double Xo = 0.0;
-    double xo = 0.0;
+    double alphaP = 0.0;
+    double phiP = 0.0;
 
     psFree(tmTime);
-    return (psSphereTransformAlloc(phi, Xo, xo));
+    return (psSphereTransformAlloc(phi, alphaP, phiP));
 }
 
@@ -536 +536 @@
                           const psTime *toTime)
 {
-    psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0;
-    psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0;
-    psF64 = (toMJD - fromMJD) / 36525.0;
-
-
-
+    /*
+        psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0;
+        psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0;
+        psF64 = (toMJD - fromMJD) / 36525.0;
+    */
     return(NULL);
 }

trunk/psLib/src/astro/psCoord.h

@@ -8 +8 @@
 *  @ingroup CoordinateTransform
 *
-*  @author George Gusciora, MHPCC
-*
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 19:48:17 $
+*  @author GLG, MHPCC
+*
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-02 21:12:51 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -107 +107 @@
 typedef struct
 {
-    double sinPhi;              ///< sin of North Pole lattitude
-    double cosPhi;              ///< cos of North Pole lattitude
-    double Xo;                  ///< First PT of Ares lon
-    double xo;                  ///< First PT of Ares equiv lon
+    double cosDeltaP;                 ///< Cosine of target pole latitude in the source system
+    double sinDeltaP;                 ///< Sine of target pole latitude in the source system
+    double alphaP;                    ///< Longitude of the target system pole in the source system
+    double phiP;                      ///< Longitude of the ascending node in the target system
 }
 psSphereTransform;
@@ -216 +216 @@
  *  @return psSphereTransform*         newly allocated struct
  */
+
 psSphereTransform* psSphereTransformAlloc(
-    double NPlat,                      ///< north pole latitude
-    double Xo,                         ///< First PT of Ares lon
-    double xo                          ///< First PT of Ares equiv lon
+    double alphaP,                      ///< north pole latitude
+    double deltaP,                      ///< north pole longitude?
+    double phiP                         ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares).
 );