Changeset 2551 in Sophya for trunk/SophyaExt/XephemAstroLib/plans.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/plans.c (modified) (13 diffs)

trunk/SophyaExt/XephemAstroLib/plans.c

@@ -5 +5 @@
 #include <math.h>
 
-#include "P_.h"
 #include "astro.h"
 #include "vsop87.h"
 #include "chap95.h"
 
-static void pluto_ell P_((double mjd, double *ret));
-static void chap_trans P_((double mjd, double *ret));
-static void planpos P_((double mjd, int obj, double prec, double *ret));
+static void pluto_ell (double mj, double *ret);
+static void chap_trans (double mj, double *ret);
+static void planpos (double mj, int obj, double prec, double *ret);
 
 /* coordinate transformation
@@ -21 +20 @@
  */
 static void
-chap_trans (mjd, ret)
-double mjd;     /* destination epoch */
-double *ret;    /* vector to be transformed _IN PLACE_ */
+chap_trans (
+double mj,      /* destination epoch */
+double *ret)    /* vector to be transformed _IN PLACE_ */
 {
         double ra, dec, r, eps;
@@ -29 +28 @@
 
         cartsph(ret[0], ret[1], ret[2], &ra, &dec, &r);
-        precess(J2000, mjd, &ra, &dec);
-        obliquity(mjd, &eps);
+        precess(J2000, mj, &ra, &dec);
+        obliquity(mj, &eps);
         sr = sin(ra); cr = cos(ra);
         sd = sin(dec); cd = cos(dec);
@@ -43 +42 @@
  */
 static void
-pluto_ell (mjd, ret)
-double mjd;     /* epoch */
-double *ret;    /* ecliptic coordinates {l,b,r} at equinox of date */
+pluto_ell (
+double mj,      /* epoch */
+double *ret)    /* ecliptic coordinates {l,b,r} at equinox of date */
 {
         /* mean orbital elements of Pluto.
@@ -55 +54 @@
                 Om0 = 110.307,                  /* long asc node, deg */
                 omeg0 = 113.768,                /* arg of perihel, deg */
-                mjdp = 2448045.539 - MJD0,      /* epoch of perihel */
-                mjdeq = J2000,                  /* equinox of elements */
+                mjp = 2448045.539 - MJD0,       /* epoch of perihel */
+                mjeq = J2000,                   /* equinox of elements */
                 n = 144.9600/36525.;            /* daily motion, deg */
 
@@ -63 +62 @@
         double lo, slo, clo;    /* longitude in orbit from asc node */
 
-        reduce_elements(mjdeq, mjd, degrad(inc0), degrad(omeg0), degrad(Om0),
+        reduce_elements(mjeq, mj, degrad(inc0), degrad(omeg0), degrad(Om0),
                                 &inc, &omeg, &Om);
-        ma = degrad((mjd - mjdp) * n);
+        ma = degrad((mj - mjp) * n);
         anomaly(ma, e, &nu, &ea);
         ret[2] = a * (1.0 - e*cos(ea));                 /* r */
@@ -81 +80 @@
  */
 static void
-planpos (mjd, obj, prec, ret)
-double mjd;
-int obj;
-double prec;
-double *ret;
-{
-        if (mjd >= CHAP_BEGIN && mjd <= CHAP_END) {
+planpos (double mj, int obj, double prec, double *ret)
+{
+        if (mj >= CHAP_BEGIN && mj <= CHAP_END) {
             if (obj >= JUPITER) {               /* prefer Chapront */
-                chap95(mjd, obj, prec, ret);
-                chap_trans (mjd, ret);
+                chap95(mj, obj, prec, ret);
+                chap_trans (mj, ret);
             } else {                            /* VSOP for inner planets */
-                vsop87(mjd, obj, prec, ret);
+                vsop87(mj, obj, prec, ret);
             }
         } else {                                /* outside Chapront time: */
             if (obj != PLUTO) {                 /* VSOP for all but Pluto */
-                vsop87(mjd, obj, prec, ret);
+                vsop87(mj, obj, prec, ret);
             } else {                            /* Pluto mean elliptic orbit */
-                pluto_ell(mjd, ret);
+                pluto_ell(mj, ret);
             }
         }
@@ -126 +121 @@
 };
 
-/* given a modified Julian date, mjd, and a planet, p, find:
+/* given a modified Julian date, mj, and a planet, p, find:
  *   lpd0: heliocentric longitude, 
  *   psi0: heliocentric latitude,
@@ -148 +143 @@
  */
 void
-plans (mjd, p, lpd0, psi0, rp0, rho0, lam, bet, dia, mag)
-double mjd;
-int p;
-double *lpd0, *psi0, *rp0, *rho0, *lam, *bet, *dia, *mag;
-{
-        static double lastmjd = -10000;
+plans (double mj, PLCode p, double *lpd0, double *psi0, double *rp0,
+double *rho0, double *lam, double *bet, double *dia, double *mag)
+{
+        static double lastmj = -10000;
         static double lsn, bsn, rsn;    /* geocentric coords of sun */
         static double xsn, ysn, zsn;    /* cartesian " */
@@ -163 +156 @@
         int pass;
 
-        /* get sun cartesian; needed only once at mjd */
-        if (mjd != lastmjd) {
-            sunpos (mjd, &lsn, &rsn, &bsn);
+        /* get sun cartesian; needed only once at mj */
+        if (mj != lastmj) {
+            sunpos (mj, &lsn, &rsn, &bsn);
             sphcart (lsn, bsn, rsn, &xsn, &ysn, &zsn);
-            lastmjd = mjd;
+            lastmj = mj;
         }
 
-        /* first find the true position of the planet at mjd.
+        /* first find the true position of the planet at mj.
          * then repeat a second time for a slightly different time based
          * on the position found in the first pass to account for light-travel
@@ -183 +176 @@
              * alternative option:  vsop allows calculating rates.
              */
-            planpos(mjd - dt, p, 0.0, ret);
+            planpos(mj - dt, p, 0.0, ret);
 
             lp = ret[0];
@@ -225 +218 @@
         if (p == SATURN) {
             double et, st, set;
-            satrings (bp, lp, rp, lsn+PI, rsn, mjd+MJD0, &et, &st);
+            satrings (bp, lp, rp, lsn+PI, rsn, mj+MJD0, &et, &st);
             set = sin(fabs(et));
             *mag += (-2.60 + 1.25*set)*set;
@@ -232 +225 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plans.c,v $ $Date: 2001-10-22 12:08:27 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plans.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};