Changeset 2641 in Sophya for trunk/SophyaExt

Timestamp:

Dec 3, 2004, 11:39:58 AM (21 years ago)

Author:

cmv

Message:

mise a jour version xephem 3.6.2 cmv 3/12/04

Location:

trunk/SophyaExt/XephemAstroLib

Files:

• circum.c (modified) (3 diffs)
• earthsat.c (modified) (2 diffs)
• magdecl.c (modified) (2 diffs)

trunk/SophyaExt/XephemAstroLib/circum.c

@@ -808 +808 @@
         elongation(lpd, psi, lsn-PI, &el);
         el = fabs(el);
-        /* only continue if object is within about 10 deg around the sun
-         * and not obscured by the sun's disc (radius 0.25 deg)
+        /* only continue if object is within about 10 deg around the sun,
+         * not obscured by the sun's disc (radius 0.25 deg) and farther away
+         * than the sun.
          *
          * precise geocentric deflection is:  g1 * tan(el/2)
@@ -818 +819 @@
          *              g2 varies from 0 (highest contribution) to 2
          */
-        if (el<degrad(170) || el>degrad(179.75)) return;
+        if (el<degrad(170) || el>degrad(179.75) || rho<rsn) return;
 
         /* get cartesian vectors */
@@ -860 +861 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: circum.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: circum.c,v $ $Date: 2004-12-03 10:39:58 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

trunk/SophyaExt/XephemAstroLib/earthsat.c

@@ -398 +398 @@
 {
         /* figure its daft if long enough to decay 1 rev/day */
-        return (fabs(op->es_epoch - mjd) > 1/op->es_decay);
+        return (fabs(op->es_epoch - mjd) > 1/fabs(op->es_decay));
 }
 
@@ -784 +784 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: earthsat.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: earthsat.c,v $ $Date: 2004-12-03 10:39:58 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

trunk/SophyaExt/XephemAstroLib/magdecl.c

@@ -55 +55 @@
         fclose(wmmdat);
         if (s < 0) {
-            sprintf (err, "Magnetic model only available for %g .. %g. See http://www.ngdc.noaa.gov", ti, ti+5);
+            sprintf (err, "%s: Magnetic model only available for %g .. %g. See http://www.ngdc.noaa.gov", mfile, ti, ti+5);
             return (-2);
         }
@@ -379 +379 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: magdecl.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: magdecl.c,v $ $Date: 2004-12-03 10:39:58 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};