Changeset 1719 in Sophya for trunk/SophyaExt/XephemAstroLib/circum.c

Timestamp:

Oct 22, 2001, 2:08:28 PM (24 years ago)

Author:

cmv

Message:

Adapted to version 3.5 xephem cmv 22/10/2001

File:

• trunk/SophyaExt/XephemAstroLib/circum.c (modified) (17 diffs)

trunk/SophyaExt/XephemAstroLib/circum.c

@@ -67 +67 @@
         double lam, bet;        /* geocentric ecliptic long and lat */
         double dia, mag;        /* angular diameter at 1 AU and magnitude */
-        double f;               /* fractional phase from earth */
         int p;
 
@@ -84 +83 @@
         sunpos (mjed, &lsn, &rsn, 0);
 
-        /* find helio long/lat; sun/planet and earth/plant dist; ecliptic
+        /* find helio long/lat; sun/planet and earth/planet dist; ecliptic
          * long/lat; diameter and mag.
          */
@@ -92 +91 @@
         cir_sky (np, lpd, psi, rp, &rho, lam, bet, lsn, rsn, op);
 
-        /* compute magnitude and angular size */
-        f = op->s_phase ? 5*log10(rp*rho) - 5*log10(op->s_phase/100) : 100;
-        set_smag (op, mag+f);
+        /* set magnitude and angular size */
+        set_smag (op, mag);
         op->s_size = (float)(dia/rho);
 
@@ -129 +127 @@
         ra = op->f_RA;
         dec = op->f_dec;
-        precess (op->f_epoch, mjd, &ra, &dec);
+        precess (op->f_epoch, mjed, &ra, &dec);
 
         /* convert equatoreal ra/dec to mean geocentric ecliptic lat/long */
-        eq_ecl (mjd, ra, dec, &bet, &lam);
+        eq_ecl (mjed, ra, dec, &bet, &lam);
 
         /* find solar ecliptical long.(mean equinox) and distance from earth */
@@ -138 +136 @@
 
         /* allow for relativistic light bending near the sun */
-        deflect (mjd, lam, bet, lsn, rsn, 1e10, &ra, &dec);
+        deflect (mjed, lam, bet, lsn, rsn, 1e10, &ra, &dec);
 
         /* TODO: correction for annual parallax would go here */
@@ -145 +143 @@
          * geocentric
          */
-        nut_eq(mjd, &ra, &dec);
-        ab_eq(mjd, lsn, &ra, &dec);
+        nut_eq(mjed, &ra, &dec);
+        ab_eq(mjed, lsn, &ra, &dec);
         op->s_gaera = (float)ra;
         op->s_gaedec = (float)dec;
@@ -193 +191 @@
         double dt;              /* light travel time to object */
         double lg;              /* helio long of earth */
-        double nu, ea;          /* true anomaly and eccentric anomaly */
-        double ma;              /* mean anomaly */
+        double nu;              /* true anomaly */
         double rp=0;            /* distance from the sun */
         double lo, slo, clo;    /* angle from ascending node */
@@ -206 +203 @@
         double lam;             /* geocentric ecliptic longitude */
         double bet;             /* geocentric ecliptic latitude */
-        double e;               /* fast eccentricity */
         double ll=0, sll, cll;  /* helio angle between object and earth */
         double mag;             /* magnitude */
         double e_n;             /* mean daily motion */
+        double tp;              /* time from perihelion (days) */
         double rpd=0;
         double y;
@@ -217 +214 @@
         sunpos (mjed, &lsn, &rsn, 0);
         lg = lsn + PI;
-
-        /* faster access to eccentricty */
-        e = op->e_e;
 
         /* mean daily motion is derived fro mean distance */
@@ -235 +229 @@
                                         &inc, &om, &Om);
 
-            ma = degrad (op->e_M + (mjed - op->e_cepoch - dt) * e_n);
-            anomaly (ma, e, &nu, &ea);
-            rp = op->e_a * (1-e*e) / (1+e*cos(nu));
+            tp = mjed - dt - (op->e_cepoch - op->e_M/e_n);
+            vrc (&nu, &rp, tp, op->e_e, op->e_a*(1-op->e_e));
+            nu = degrad(nu);
             lo = nu + om;
             slo = sin(lo);
@@ -301 +295 @@
         double dt;              /* light travel time to object */
         double lg;              /* helio long of earth */
-        double nu, ea;          /* true anomaly and eccentric anomaly */
-        double ma;              /* mean anomaly */
+        double nu;              /* true anomaly and eccentric anomaly */
         double rp=0;            /* distance from the sun */
         double lo, slo, clo;    /* angle from ascending node */
@@ -319 +312 @@
         double mag;             /* magnitude */
         double a;               /* mean distance */
+        double tp;              /* time from perihelion (days) */
         double rpd=0;
         double y;
@@ -342 +336 @@
                             &inc, &om, &Om);
 
-            ma = degrad ((mjed - op->h_ep - dt) * n);
-            anomaly (ma, e, &nu, &ea);
-            rp = a * (e*e-1.0) / (1.0+e*cos(nu));
+            tp = mjed - dt - op->h_ep;
+            vrc (&nu, &rp, tp, op->h_e, op->h_qp);
+            nu = degrad(nu);
             lo = nu + om;
             slo = sin(lo);
@@ -581 +575 @@
 
         /* convert to equatoreal [mean equator, with mean obliquity] */
-        ecl_eq (mjd, bet, lam, &ra, &dec);
+        ecl_eq (mjed, bet, lam, &ra, &dec);
         tra = ra;       /* keep mean coordinates */
         tdec = dec;
@@ -592 +586 @@
          */
         if (!is_planet(op,SUN) && !is_planet(op,MOON))
-            deflect (mjd, op->s_hlong, op->s_hlat, lsn, rsn, *rho, &ra, &dec);
+            deflect (mjed, op->s_hlong, op->s_hlat, lsn, rsn, *rho, &ra, &dec);
 
         /* correct ra/dec to form geocentric apparent */
-        nut_eq (mjd, &ra, &dec);
+        nut_eq (mjed, &ra, &dec);
         if (!is_planet(op,MOON))
-            ab_eq (mjd, lsn, &ra, &dec);
+            ab_eq (mjed, lsn, &ra, &dec);
         op->s_gaera = (float)ra;
         op->s_gaedec = (float)dec;
@@ -635 +629 @@
             ra = tra + dra;
             dec = tdec + ddec;
-            precess (mjd, epoch, &ra, &dec);
+            precess (mjed, epoch, &ra, &dec);
         }
         range(&ra, 2*PI);
@@ -755 +749 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: circum.c,v $ $Date: 2001-04-10 14:40:46 $ $Revision: 1.1.1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: circum.c,v $ $Date: 2001-10-22 12:08:26 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};