Changeset 2643 in Sophya for trunk/SophyaExt/XephemAstroLib/jupmoon.c

Timestamp:

Jan 17, 2005, 11:13:08 AM (21 years ago)

Author:

cmv

Message:

update pour version 3.6.3 Xephem cmv 17/01/04

File:

• trunk/SophyaExt/XephemAstroLib/jupmoon.c (modified) (8 diffs)

trunk/SophyaExt/XephemAstroLib/jupmoon.c

@@ -13 +13 @@
     MoonData md[J_NMOONS]);
 static void moonradec (double jupsize, MoonData md[J_NMOONS]);
-static void moonSVis (Obj *eop, Obj *jop, MoonData md[J_NMOONS]);
+static void moonSVis (Obj *sop, Obj *jop, MoonData md[J_NMOONS]);
 static void moonEVis (MoonData md[J_NMOONS]);
+static void moonPShad (Obj *sop, Obj *jop, MoonData md[J_NMOONS]);
+static void moonTrans (MoonData md[J_NMOONS]);
 
 /* moon table and a few other goodies and when it was last computed */
@@ -32 +34 @@
 static char jbdlfn[] = "jupiter.9910";
 
+/* These values are from the Explanatory Supplement.
+ * Precession degrades them gradually over time.
+ */
+#define POLE_RA   degrad(268.05)         /* RA of Jupiter's north pole */
+#define POLE_DEC  degrad(64.50)         /* Dec of Jupiter's north pole */
+
+
 /* get jupiter info in md[0], moon info in md[1..J_NMOONS-1].
  * if !dir always use meeus model.
  * if !jop caller just wants md[] for names
- * N.B. we assume eop and jop are updated.
+ * N.B. we assume sop and jop are updated.
  */
 void
@@ -41 +50 @@
 double Mjd,             /* mjd */
 char dir[],             /* dir in which to look for helper files */
-Obj *eop,               /* earth == Sun */
+Obj *sop,               /* Sun */
 Obj *jop,               /* jupiter */
 double *sizep,          /* jup angular diam, rads */
-double *cmlI, double *cmlII,    /* central meridian longitude, rads */
+double *cmlI, double *cmlII,            /* central meridian longitude, rads */
+double *polera, double *poledec,        /* pole location */
 MoonData md[J_NMOONS])  /* return info */
 {
@@ -51 +61 @@
         /* always copy back at least for name */
         memcpy (md, jmd, sizeof(jmd));
+
+        /* pole */
+        if (polera) *polera = POLE_RA;
+        if (poledec) *poledec = POLE_DEC;
 
         /* nothing else if repeat call or just want names */
@@ -91 +105 @@
 
         /* set visibilities */
-        moonSVis (eop, jop, md);
+        moonSVis (sop, jop, md);
+        moonPShad (sop, jop, md);
         moonEVis (md);
+        moonTrans (md);
 
         /* fill in moon ra and dec */
@@ -168 +184 @@
                          */
 {
-#define POLE_RA         degrad(268.05)  /* RA of Jupiter's north pole */
-#define POLE_DEC        degrad(64.50)   /* Dec of Jupiter's north pole */
 #define dsin(x) sin(degrad(x))
 #define dcos(x) cos(degrad(x))
@@ -296 +310 @@
 static void
 moonSVis(
-Obj *eop,               /* earth == SUN */
+Obj *sop,               /* SUN */
 Obj *jop,               /* jupiter */
 MoonData md[J_NMOONS])
 {
-        double esd = eop->s_edist;
+        double esd = sop->s_edist;
         double eod = jop->s_edist;
         double sod = jop->s_sdist;
@@ -339 +353 @@
 }
 
+/* set pshad and sx,sy shadow info */
+static void
+moonPShad(
+Obj *sop,               /* SUN */
+Obj *jop,               /* jupiter */
+MoonData md[J_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < J_NMOONS; i++) {
+            MoonData *mdp = &md[i];
+            mdp->pshad = !plshadow (jop, sop, POLE_RA, POLE_DEC, mdp->x,
+                                            mdp->y, mdp->z, &mdp->sx, &mdp->sy);
+        }
+}
+
+/* set whether moons are transiting */
+static void
+moonTrans (MoonData md[J_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < J_NMOONS; i++) {
+            MoonData *mdp = &md[i];
+            mdp->trans = mdp->z > 0 && mdp->x*mdp->x + mdp->y*mdp->y < 1;
+        }
+}
+
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: jupmoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: jupmoon.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};