Changeset 2551 in Sophya for trunk/SophyaExt/XephemAstroLib/aberration.c

Timestamp:

Jun 15, 2004, 6:54:12 PM (21 years ago)

Author:

cmv

Message:

nouvelle version de xephem/libastro (3.6) cmv 15/6/04

File:

• trunk/SophyaExt/XephemAstroLib/aberration.c (modified) (7 diffs)

trunk/SophyaExt/XephemAstroLib/aberration.c

@@ -2 +2 @@
  * based on secular unperturbed Kepler orbit
  *
- * the corrections should be applied to ra/dec and lam/beta of the 
+ * the corrections should be applied to ra/dec and lam/beta at the 
  * epoch of date.
  */
@@ -8 +8 @@
 #include <stdio.h>
 #include <math.h>
+#include <stdlib.h>
 
-#if defined(__STDC__)
-#include <stdlib.h>
-#endif
-
-#include "P_.h"
 #include "astro.h"
 
@@ -20 +16 @@
 #define AB_EQ_EOD       1
 
-static void ab_aux P_((double mjd, double *x, double *y, double lsn,
-        int mode));
+static void ab_aux (double mj, double *x, double *y, double lsn, int mode);
 
 /* apply aberration correction to ecliptical coordinates *lam and *bet
- * (in radians) for a given time mjd and handily supplied longitude of sun,
+ * (in radians) for a given time m and handily supplied longitude of sun,
  * lsn (in radians)
  */
 void
-ab_ecl (mjd, lsn, lam, bet)
-double mjd, lsn, *lam, *bet;
+ab_ecl (double mj, double lsn, double *lam, double *bet)
 {
-        ab_aux(mjd, lam, bet, lsn, AB_ECL_EOD);
+        ab_aux(mj, lam, bet, lsn, AB_ECL_EOD);
 }
 
 /* apply aberration correction to equatoreal coordinates *ra and *dec
- * (in radians) for a given time mjd and handily supplied longitude of sun,
+ * (in radians) for a given time m and handily supplied longitude of sun,
  * lsn (in radians)
  */
 void
-ab_eq (mjd, lsn, ra, dec)
-double mjd, lsn, *ra, *dec;
+ab_eq (double mj, double lsn, double *ra, double *dec)
 {
-        ab_aux(mjd, ra, dec, lsn, AB_EQ_EOD);
+        ab_aux(mj, ra, dec, lsn, AB_EQ_EOD);
 }
 
@@ -51 +44 @@
  */
 static void
-ab_aux (mjd, x, y, lsn, mode)
-double mjd, *x, *y, lsn;
-int mode;
+ab_aux (double mj, double *x, double *y, double lsn, int mode)
 {
-        static double lastmjd = -10000;
+        static double lastmj = -10000;
         static double eexc;     /* earth orbit excentricity */
         static double leperi;   /* ... and longitude of perihelion */
         static char dirty = 1;  /* flag for cached trig terms */
 
-        if (mjd != lastmjd) {
+        if (mj != lastmj) {
             double T;           /* centuries since J2000 */
 
-            T = (mjd - J2000)/36525.;
+            T = (mj - J2000)/36525.;
             eexc = 0.016708617 - (42.037e-6 + 0.1236e-6 * T) * T;
             leperi = degrad(102.93735 + (0.71953 + 0.00046 * T) * T);
-            lastmjd = mjd;
+            lastmj = mj;
             dirty = 1;
         }
@@ -99 +90 @@
                     cp = cos(leperi);
                     sp = sin(leperi);
-                    obliquity(mjd, &eps);
+                    obliquity(mj, &eps);
                     se = sin(eps);
                     ce = cos(eps);
@@ -127 +118 @@
         default:
             printf ("ab_aux: bad mode: %d\n", mode);
-            exit (1);
+            abort();
             break;
 
@@ -134 +125 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aberration.c,v $ $Date: 2001-10-22 12:08:26 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aberration.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};