Changeset 3477 in Sophya for trunk/SophyaExt/XephemAstroLib/riset_cir.c

Timestamp:

Mar 25, 2008, 6:45:21 PM (18 years ago)

Author:

cmv

Message:

mise a jour Xephem 3.7.3 , cmv 25/03/2008

File:

• trunk/SophyaExt/XephemAstroLib/riset_cir.c (modified) (7 diffs)

trunk/SophyaExt/XephemAstroLib/riset_cir.c

@@ -84 +84 @@
             rp->rs_flags |= RS_RISERR;
             break;
-        case -2: /* converged but not today */ /* FALLTHRU */
+        case -2: /* converged but not today, err but give times anyway */
+            rp->rs_risetm = n.n_mjd;
+            rp->rs_riseaz = o.s_az;
+            rp->rs_flags |= RS_NORISE;
+            break;
         case -3: /* probably never up */
-            rp->rs_flags |= RS_NORISE;
+            rp->rs_flags |= RS_NEVERUP;
             break;
         }
@@ -100 +104 @@
             rp->rs_flags |= RS_SETERR;
             break;
-        case -2: /* converged but not today */ /* FALLTHRU */
+        case -2: /* converged but not today, err but give times anyway */
+            rp->rs_settm = n.n_mjd;
+            rp->rs_setaz = o.s_az;
+            rp->rs_flags |= RS_NOSET;
+            break;
         case -3: /* probably circumpolar */
-            rp->rs_flags |= RS_NOSET;
+            rp->rs_flags |= RS_CIRCUMPOLAR;
             break;
         }
@@ -220 +228 @@
 
         /* instead of transit, for satellites we find time of maximum
-         * altitude, if we know both the rise and set times and the former
-         * occurs before the latter.
+         * altitude, if we know both the rise and set times.
          */
-        if (rise && set && rp->rs_risetm < rp->rs_settm) {
+        if (rise && set) {
             double tt, al;
             if (find_max (np, op, rp->rs_risetm, rp->rs_settm, &tt, &al) < 0) {
@@ -266 +273 @@
 #define MAXPASSES       20              /* max iterations to try */
 #define FIRSTSTEP       (1.0/60.0/24.0) /* first time step, days */
+#define MAXSTEP         (1.0/24.0)/* max time step,days (to detect flat)*/
 
         double a0 = 0;
@@ -295 +303 @@
             a0 = a1;
 
-        } while (++npasses < MAXPASSES && fabs(dt) > TMACC);
+            if (++npasses > MAXPASSES || fabs(dt) >= MAXSTEP)
+                return (-3);
+
+        } while (fabs(dt)>TMACC);
 
         /* return codes */
-        if (npasses == MAXPASSES)
-            return (-3);
         return (fabs(mjdn-mjd) < .5 ? 0 : -2);
 
 #undef  MAXPASSES
 #undef  FIRSTSTEP
+#undef  MAXSTEP
 }
 
@@ -361 +371 @@
 double *tp, double *alp)        /* time of max altitude, and that altitude */
 {
+        /* want rise before set */
+        while (ts < tr)
+            tr -= 1.0/op->es_n;
         mjd = (ts + tr)/2;
         if (obj_cir (np, op) < 0)
@@ -370 +383 @@
 
 /* For RCS Only -- Do Not Edit */
-static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset_cir.c,v $ $Date: 2006-11-22 13:53:30 $ $Revision: 1.6 $ $Name: not supported by cvs2svn $"};
+static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset_cir.c,v $ $Date: 2008-03-25 17:45:19 $ $Revision: 1.7 $ $Name: not supported by cvs2svn $"};