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

trunk/SophyaExt/XephemAstroLib/marsmoon.c

@@ -11 +11 @@
 static int use_bdl (double JD, char *dir, MoonData md[M_NMOONS]);
 static void moonradec (double msize, MoonData md[M_NMOONS]);
-static void moonSVis (Obj *eop, Obj *mop, MoonData md[M_NMOONS]);
+static void moonSVis (Obj *sop, Obj *mop, MoonData md[M_NMOONS]);
 static void moonEVis (MoonData md[M_NMOONS]);
+static void moonPShad (Obj *sop, Obj *mop, MoonData md[M_NMOONS]);
+static void moonTrans (MoonData md[M_NMOONS]);
 
 /* moon table and a few other goodies and when it was last computed */
@@ -26 +28 @@
 static char mbdlfn[] = "mars.9910";
 
+/* These values are from the Explanatory Supplement.
+ * Precession degrades them gradually over time.
+ */
+#define POLE_RA         degrad(317.61)
+#define POLE_DEC        degrad(52.85)
+
+
 /* get mars info in md[0], moon info in md[1..M_NMOONS-1].
  * if !dir always use bruton model.
  * if !mop caller just wants md[] for names
- * N.B. we assume eop and mop are updated.
+ * N.B. we assume sop and mop are updated.
  */
 void
@@ -35 +44 @@
 double Mjd,                     /* mjd */
 char dir[],                     /* dir in which to look for helper files */
-Obj *eop,                       /* earth == Sun */
+Obj *sop,                       /* Sun */
 Obj *mop,                       /* mars */
 double *sizep,                  /* mars's angular diam, rads */
+double *polera, double *poledec,/* pole location */
 MoonData md[M_NMOONS])          /* return info */
 {
@@ -44 +54 @@
         /* always copy back at least for name */
         memcpy (md, mmd, sizeof(mmd));
+
+        /* pole */
+        if (polera) *polera = POLE_RA;
+        if (poledec) *poledec = POLE_DEC;
 
         /* nothing else if repeat call or just want names */
@@ -81 +95 @@
 
         /* set visibilities */
-        moonSVis (eop, mop, md);
+        moonSVis (sop, mop, md);
+        moonPShad (sop, mop, md);
         moonEVis (md);
+        moonTrans (md);
 
         /* fill in moon ra and dec */
@@ -167 +183 @@
 static void
 moonSVis(
-Obj *eop,               /* earth == SUN */
+Obj *sop,               /* SUN */
 Obj *mop,               /* mars */
 MoonData md[M_NMOONS])
 {
-        double esd = eop->s_edist;
+        double esd = sop->s_edist;
         double eod = mop->s_edist;
         double sod = mop->s_sdist;
@@ -210 +226 @@
 }
 
+/* set pshad and sx,sy shadow info */
+static void
+moonPShad(
+Obj *sop,             /* SUN */
+Obj *mop,             /* mars */
+MoonData md[M_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < M_NMOONS; i++) {
+            MoonData *mdp = &md[i];
+            mdp->pshad = !plshadow (mop, 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[M_NMOONS])
+{
+        int i;
+
+        for (i = 1; i < M_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: marsmoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: marsmoon.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};