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

trunk/SophyaExt/XephemAstroLib/satmoon.c

@@ -14 +14 @@
 static void moonSVis (Obj *eop, Obj *sop, MoonData md[S_NMOONS]);
 static void moonEVis (MoonData md[S_NMOONS]);
+static void moonPShad (Obj *eop, Obj *sop, MoonData md[S_NMOONS]);
+static void moonTrans (MoonData md[S_NMOONS]);
 
 /* moon table and a few other goodies and when it was last computed */
@@ -35 +37 @@
 static char sbdlfn[] = "saturne.9910";
 
+/* These values are from the Explanatory Supplement.
+ * Precession degrades them gradually over time.
+ */
+#define POLE_RA         degrad(40.58)   /* RA of Saturn's north pole */
+#define POLE_DEC        degrad(83.54)   /* Dec of Saturn's north pole */
+
+
 /* get saturn info in md[0], moon info in md[1..S_NMOONS-1].
  * if !dir always use bruton model.
@@ -48 +57 @@
 double *sizep,                  /* saturn's angular diam, rads */
 double *etiltp, double *stiltp, /* earth and sun tilts -- +S */
+double *polera, double *poledec,/* pole location */
 MoonData md[S_NMOONS])          /* return info */
 {
@@ -54 +64 @@
         /* always copy back at least for name */
         memcpy (md, smd, sizeof(smd));
+
+        /* pole */
+        if (polera) *polera = POLE_RA;
+        if (poledec) *poledec = POLE_DEC;
 
         /* nothing else if repeat call or just want names */
@@ -94 +108 @@
         /* set visibilities */
         moonSVis (eop, sop, md);
+        moonPShad (eop, sop, md);
         moonEVis (md);
+        moonTrans (md);
 
         /* fill in moon ra and dec */
@@ -455 +471 @@
 }
 
+/* set pshad and sx,sy shadow info */
+static void
+moonPShad(
+Obj *eop,             /* earth == SUN */
+Obj *sop,             /* saturn */
+MoonData md[S_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < S_NMOONS; i++) {
+            MoonData *mdp = &md[i];
+            mdp->pshad = !plshadow (sop, eop, POLE_RA, POLE_DEC, mdp->x,
+                                          mdp->y, mdp->z, &mdp->sx, &mdp->sy);
+        }
+}
+
+
+/* set whether moons are transiting */
+static void
+moonTrans (MoonData md[S_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < S_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: satmoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: satmoon.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};