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

trunk/SophyaExt/XephemAstroLib/umoon.c

@@ -11 +11 @@
 static int use_bdl (double jd, char *dir, MoonData md[U_NMOONS]);
 static void moonradec (double usize, MoonData md[U_NMOONS]);
-static void moonSVis (Obj *eop, Obj *uop, MoonData md[U_NMOONS]);
+static void moonSVis (Obj *sop, Obj *uop, MoonData md[U_NMOONS]);
 static void moonEVis (MoonData md[U_NMOONS]);
+static void moonPShad (Obj *sop, Obj *uop, MoonData md[U_NMOONS]);
+static void moonTrans (MoonData md[U_NMOONS]);
 
 /* moon table and a few other goodies and when it was last computed */
@@ -29 +31 @@
 static char ubdlfn[] = "uranus.9910";
 
+/* These values are from the Explanatory Supplement.
+ * Precession degrades them gradually over time.
+ */
+#define POLE_RA         degrad(257.43)  /* RA of Uranus' north pole */
+#define POLE_DEC        degrad(-15.10)  /* Dec of Uranus' north pole */
+
+
 /* get uranus info in md[0], moon info in md[1..U_NMOONS-1].
  * if !uop caller just wants md[] for names
- * N.B. we assume eop and uop are updated.
+ * N.B. we assume sop and uop are updated.
  */
 void
@@ -37 +46 @@
 double Mjd,             /* mjd */
 char dir[],             /* dir in which to look for helper files */
-Obj *eop,               /* earth == Sun */
+Obj *sop,               /* Sun */
 Obj *uop,               /* uranus */
 double *sizep,          /* u angular diam, rads */
+double *polera, double *poledec,      /* pole location */
 MoonData md[U_NMOONS])  /* return info */
 {
@@ -46 +56 @@
         /* always copy back at least for name */
         memcpy (md, umd, sizeof(umd));
+
+        /* pole */
+        if (polera) *polera = POLE_RA;
+        if (poledec) *poledec = POLE_DEC;
 
         /* nothing else if repeat call or just want names */
@@ -86 +100 @@
 
         /* set visibilities */
-        moonSVis (eop, uop, md);
+        moonSVis (sop, uop, md);
+        moonPShad (sop, uop, md);
         moonEVis (md);
+        moonTrans (md);
 
         /* fill in moon ra and dec */
@@ -172 +188 @@
 static void
 moonSVis(
-Obj *eop,               /* earth == SUN */
+Obj *sop,               /* SUN */
 Obj *uop,               /* uranus */
 MoonData md[U_NMOONS])
 {
-        double esd = eop->s_edist;
+        double esd = sop->s_edist;
         double eod = uop->s_edist;
         double sod = uop->s_sdist;
@@ -215 +231 @@
 }
 
+/* set pshad and sx,sy shadow info */
+static void
+moonPShad(
+Obj *sop,             /* SUN */
+Obj *uop,             /* uranus */
+MoonData md[U_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < U_NMOONS; i++) {
+            MoonData *mdp = &md[i];
+            mdp->pshad = !plshadow (uop, 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[U_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < U_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: umoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: umoon.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};