Changeset 3111 in Sophya for trunk/SophyaExt/XephemAstroLib/marsmoon.c

Timestamp:

Nov 22, 2006, 2:53:31 PM (19 years ago)

Author:

cmv

Message:

mise en conformite xephem 3.7.2 cmv 22/11/2006

File:

• trunk/SophyaExt/XephemAstroLib/marsmoon.c (modified) (5 diffs)

trunk/SophyaExt/XephemAstroLib/marsmoon.c

@@ -4 +4 @@
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <math.h>
 
@@ -24 +25 @@
 };
 static double sizemjd;
-
-/* file containing BDL coefficients */
-static char mbdlfn[] = "mars.9910";
 
 /* These values are from the Explanatory Supplement.
@@ -87 +85 @@
 
         /* get moon x,y,z from BDL if possible */
-        if (dir && use_bdl (JD, dir, md) < 0) {
+        if (!dir || use_bdl (JD, dir, md) < 0) {
             int i;
             for (i = 1; i < M_NMOONS; i++)
@@ -122 +120 @@
         char buf[1024];
         FILE *fp;
-        int i;
-
-        /* only valid 1999 through 2010 */
-        if (JD < 2451179.50000 || JD >= 2455562.5)
+        char *fn;
+        int i;
+
+        /* check ranges and appropriate data file */
+        if (JD < 2451179.50000)         /* Jan 1 1999 UTC */
+            return (-1);
+        if (JD < 2455562.5)             /* Jan 1 2011 UTC */
+            fn = "mars.9910";
+        else if (JD < 2459215.5)        /* Jan 1 2021 UTC */
+            fn = "mars.1020";
+        else
             return (-1);
 
         /* open */
-        (void) sprintf (buf, "%s/%s", dir, mbdlfn);
+        (void) sprintf (buf, "%s/%s", dir, fn);
         fp = fopen (buf, "r");
-        if (!fp)
-            return (-1);
+        if (!fp) {
+            fprintf (stderr, "%s: %s\n", fn, strerror(errno));
+            return (-1);
+        }
 
         /* use it */
         if ((i = read_bdl (fp, JD, x, y, z, buf)) < 0) {
-            fprintf (stderr, "%s: %s\n", mbdlfn, buf);
+            fprintf (stderr, "%s: %s\n", fn, buf);
             fclose (fp);
             return (-1);
         }
         if (i != M_NMOONS-1) {
-            fprintf (stderr, "%s: BDL says %d moons, code expects %d", mbdlfn,
+            fprintf (stderr, "%s: BDL says %d moons, code expects %d", fn,
                                                                 i, M_NMOONS-1);
             fclose (fp);
@@ -256 +263 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: marsmoon.c,v $ $Date: 2005-08-21 10:02:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: marsmoon.c,v $ $Date: 2006-11-22 13:53:29 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};