Changeset 2643 in Sophya


Ignore:
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

Location:
trunk/SophyaExt/XephemAstroLib
Files:
65 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaExt/XephemAstroLib/aa_hadec.c

    r2551 r2643  
    7575
    7676/* For RCS Only -- Do Not Edit */
    77 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aa_hadec.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     77static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aa_hadec.c,v $ $Date: 2005-01-17 10:13:02 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/aberration.c

    r2551 r2643  
    125125
    126126/* For RCS Only -- Do Not Edit */
    127 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aberration.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     127static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: aberration.c,v $ $Date: 2005-01-17 10:13:02 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/actan.c

    r2551 r2643  
    11#include <math.h>
    22
    3 /* @(#) $Id: actan.c,v 1.3 2004-06-15 16:52:37 cmv Exp $ */
     3/* @(#) $Id: actan.c,v 1.4 2005-01-17 10:13:02 cmv Exp $ */
    44
    55/* commonly in math.h, but not in strict ANSI C */
    … …  
    6565
    6666/* For RCS Only -- Do Not Edit */
    67 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: actan.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     67static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: actan.c,v $ $Date: 2005-01-17 10:13:02 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/airmass.c

    r2551 r2643  
    2424
    2525/* For RCS Only -- Do Not Edit */
    26 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: airmass.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     26static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: airmass.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/anomaly.c

    r2551 r2643  
    6161
    6262/* For RCS Only -- Do Not Edit */
    63 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: anomaly.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     63static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: anomaly.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/ap_as.c

    r2551 r2643  
    5151
    5252/* For RCS Only -- Do Not Edit */
    53 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: ap_as.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     53static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: ap_as.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/astro.h

    r2551 r2643  
    532532    char *full;         /* full name */
    533533    char *tag;          /* Roman numeral tag */
    534     float x, y, z;      /* radii: +x:east +y:south +z:front */
    535     float ra, dec;
    536     float mag;
     534    float x, y, z;      /* sky loc in planet radii: +x:east +y:south +z:front */
     535    float ra, dec;      /* sky location in ra/dec */
     536    float mag;          /* magnitude */
    537537    int evis;           /* whether geometrically visible from earth */
    538538    int svis;           /* whether in sun light */
     539    int pshad;          /* whether moon is casting shadow on planet */
     540    int trans;          /* whether moon is transiting */
     541    float sx, sy;       /* shadow sky loc in planet radii: +x:east +y:south */
    539542} MoonData;
    540543
    … …  
    660663
    661664/* jupmoon.c */
    662 extern void jupiter_data (double Mjd, char dir[], Obj *eop, Obj *jop,
    663     double *jupsize, double *cmlI, double *cmlII, MoonData md[J_NMOONS]);
     665extern void jupiter_data (double Mjd, char dir[], Obj *sop, Obj *jop,
     666    double *jupsize, double *cmlI, double *cmlII, double *polera,
     667    double *poledec, MoonData md[J_NMOONS]);
    664668
    665669/* libration.c */
    … …  
    671675
    672676/* marsmoon.c */
    673 extern void marsm_data (double Mjd, char dir[], Obj *eop, Obj *mop,
    674     double *marssize, MoonData md[M_NMOONS]);
     677extern void marsm_data (double Mjd, char dir[], Obj *sop, Obj *mop,
     678    double *marssize, double *polera, double *poledec, MoonData md[M_NMOONS]);
    675679
    676680/* misc.c */
    … …  
    740744
    741745/* plshadow.c */
    742 extern int plshadow (Now *np, Obj *op, Obj *sop, double polera,
    743 double poledec, double x, double y, double z, double *sxp, double *syp);
     746extern int plshadow (Obj *op, Obj *sop, double polera,
     747    double poledec, double x, double y, double z, float *sxp, float *syp);
    744748
    745749/* plmoon_cir.c */
    … …  
    774778/* satmoon.c */
    775779extern void saturn_data (double Mjd, char dir[], Obj *eop, Obj *sop,
    776     double *satsize, double *etilt, double *stlit, MoonData md[S_NMOONS]);
     780    double *satsize, double *etilt, double *stlit, double *polera,
     781    double *poledec, MoonData md[S_NMOONS]);
    777782
    778783/* sphcart.c */
    … …  
    789794
    790795/* umoon.c */
    791 extern void uranus_data (double Mjd, char dir[], Obj *eop, Obj *uop,
    792     double *usize, MoonData md[U_NMOONS]);
     796extern void uranus_data (double Mjd, char dir[], Obj *sop, Obj *uop,
     797    double *usize, double *polera, double *poledec, MoonData md[U_NMOONS]);
    793798
    794799/* utc_gst.c */
    … …  
    802807
    803808/* For RCS Only -- Do Not Edit
    804  * @(#) $RCSfile: astro.h,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     809 * @(#) $RCSfile: astro.h,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    805810 */

  • trunk/SophyaExt/XephemAstroLib/atlas.c

    r2551 r2643  
    194194
    195195/* For RCS Only -- Do Not Edit */
    196 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: atlas.c,v $ $Date: 2004-06-15 16:54:11 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     196static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: atlas.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/auxil.c

    r2551 r2643  
    4040
    4141/* For RCS Only -- Do Not Edit */
    42 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: auxil.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     42static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: auxil.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/bdl.c

    r2551 r2643  
    232232
    233233/* For RCS Only -- Do Not Edit */
    234 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: bdl.c,v $ $Date: 2004-06-15 16:54:11 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     234static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: bdl.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/bdl.h

    r2551 r2643  
    33
    44/* For RCS Only -- Do Not Edit
    5  * @(#) $RCSfile: bdl.h,v $ $Date: 2004-06-15 16:54:11 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $
     5 * @(#) $RCSfile: bdl.h,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $
    66 */

  • trunk/SophyaExt/XephemAstroLib/chap95.c

    r2551 r2643  
    172172
    173173/* For RCS Only -- Do Not Edit */
    174 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: chap95.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     174static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: chap95.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/chap95.h

    r2551 r2643  
    6565
    6666/* For RCS Only -- Do Not Edit
    67  * @(#) $RCSfile: chap95.h,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     67 * @(#) $RCSfile: chap95.h,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    6868 */

  • trunk/SophyaExt/XephemAstroLib/chap95_data.c

    r2551 r2643  
    781781
    782782/* For RCS Only -- Do Not Edit */
    783 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: chap95_data.c,v $ $Date: 2004-06-15 16:52:37 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     783static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: chap95_data.c,v $ $Date: 2005-01-17 10:13:03 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/circum.c

    r2641 r2643  
    861861
    862862/* For RCS Only -- Do Not Edit */
    863 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 $"};
     863static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: circum.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.5 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/comet.c

    r2551 r2643  
    8181
    8282/* For RCS Only -- Do Not Edit */
    83 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: comet.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     83static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: comet.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/constel.c

    r2551 r2643  
    47074707
    47084708/* For RCS Only -- Do Not Edit */
    4709 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: constel.c,v $ $Date: 2004-06-15 16:54:11 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     4709static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: constel.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/dbfmt.c

    r2551 r2643  
    10041004
    10051005/* For RCS Only -- Do Not Edit */
    1006 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: dbfmt.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     1006static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: dbfmt.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/deep.c

    r2551 r2643  
    788788
    789789/* For RCS Only -- Do Not Edit */
    790 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: deep.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     790static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: deep.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/deepconst.h

    r2551 r2643  
    22#define _CONST_H
    33
    4 /* $Id: deepconst.h,v 1.3 2004-06-15 16:52:38 cmv Exp $ */
     4/* $Id: deepconst.h,v 1.4 2005-01-17 10:13:04 cmv Exp $ */
    55
    66
    … …  
    3131
    3232/* For RCS Only -- Do Not Edit
    33  * @(#) $RCSfile: deepconst.h,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     33 * @(#) $RCSfile: deepconst.h,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    3434 */

  • trunk/SophyaExt/XephemAstroLib/deltat.c

    r2551 r2643  
    304304
    305305/* For RCS Only -- Do Not Edit */
    306 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: deltat.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     306static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: deltat.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/earthsat.c

    r2641 r2643  
    784784
    785785/* For RCS Only -- Do Not Edit */
    786 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 $"};
     786static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: earthsat.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.5 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/eq_ecl.c

    r2551 r2643  
    7070
    7171/* For RCS Only -- Do Not Edit */
    72 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: eq_ecl.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     72static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: eq_ecl.c,v $ $Date: 2005-01-17 10:13:04 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/eq_gal.c

    r2551 r2643  
    9797
    9898/* For RCS Only -- Do Not Edit */
    99 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: eq_gal.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     99static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: eq_gal.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/formats.c

    r2551 r2643  
    202202
    203203/* For RCS Only -- Do Not Edit */
    204 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: formats.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     204static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: formats.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/helio.c

    r2551 r2643  
    4949
    5050/* For RCS Only -- Do Not Edit */
    51 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: helio.c,v $ $Date: 2004-06-15 16:52:38 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     51static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: helio.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/jupmoon.c

    r2551 r2643  
    1313    MoonData md[J_NMOONS]);
    1414static void moonradec (double jupsize, MoonData md[J_NMOONS]);
    15 static void moonSVis (Obj *eop, Obj *jop, MoonData md[J_NMOONS]);
     15static void moonSVis (Obj *sop, Obj *jop, MoonData md[J_NMOONS]);
    1616static void moonEVis (MoonData md[J_NMOONS]);
     17static void moonPShad (Obj *sop, Obj *jop, MoonData md[J_NMOONS]);
     18static void moonTrans (MoonData md[J_NMOONS]);
    1719
    1820/* moon table and a few other goodies and when it was last computed */
    … …  
    3234static char jbdlfn[] = "jupiter.9910";
    3335
     36/* These values are from the Explanatory Supplement.
     37 * Precession degrades them gradually over time.
     38 */
     39#define POLE_RA   degrad(268.05)         /* RA of Jupiter's north pole */
     40#define POLE_DEC  degrad(64.50)         /* Dec of Jupiter's north pole */
     41
     42
    3443/* get jupiter info in md[0], moon info in md[1..J_NMOONS-1].
    3544 * if !dir always use meeus model.
    3645 * if !jop caller just wants md[] for names
    37  * N.B. we assume eop and jop are updated.
     46 * N.B. we assume sop and jop are updated.
    3847 */
    3948void
    … …  
    4150double Mjd,             /* mjd */
    4251char dir[],             /* dir in which to look for helper files */
    43 Obj *eop,               /* earth == Sun */
     52Obj *sop,               /* Sun */
    4453Obj *jop,               /* jupiter */
    4554double *sizep,          /* jup angular diam, rads */
    46 double *cmlI, double *cmlII,    /* central meridian longitude, rads */
     55double *cmlI, double *cmlII,            /* central meridian longitude, rads */
     56double *polera, double *poledec,        /* pole location */
    4757MoonData md[J_NMOONS])  /* return info */
    4858{
    … …  
    5161        /* always copy back at least for name */
    5262        memcpy (md, jmd, sizeof(jmd));
     63
     64        /* pole */
     65        if (polera) *polera = POLE_RA;
     66        if (poledec) *poledec = POLE_DEC;
    5367
    5468        /* nothing else if repeat call or just want names */
    … …  
    91105
    92106        /* set visibilities */
    93         moonSVis (eop, jop, md);
     107        moonSVis (sop, jop, md);
     108        moonPShad (sop, jop, md);
    94109        moonEVis (md);
     110        moonTrans (md);
    95111
    96112        /* fill in moon ra and dec */
    … …  
    168184                         */
    169185{
    170 #define POLE_RA         degrad(268.05)  /* RA of Jupiter's north pole */
    171 #define POLE_DEC        degrad(64.50)   /* Dec of Jupiter's north pole */
    172186#define dsin(x) sin(degrad(x))
    173187#define dcos(x) cos(degrad(x))
    … …  
    296310static void
    297311moonSVis(
    298 Obj *eop,               /* earth == SUN */
     312Obj *sop,               /* SUN */
    299313Obj *jop,               /* jupiter */
    300314MoonData md[J_NMOONS])
    301315{
    302         double esd = eop->s_edist;
     316        double esd = sop->s_edist;
    303317        double eod = jop->s_edist;
    304318        double sod = jop->s_sdist;
    … …  
    339353}
    340354
     355/* set pshad and sx,sy shadow info */
     356static void
     357moonPShad(
     358Obj *sop,               /* SUN */
     359Obj *jop,               /* jupiter */
     360MoonData md[J_NMOONS])
     361{
     362        int i;
     363
     364        for (i = 1; i < J_NMOONS; i++) {
     365            MoonData *mdp = &md[i];
     366            mdp->pshad = !plshadow (jop, sop, POLE_RA, POLE_DEC, mdp->x,
     367                                            mdp->y, mdp->z, &mdp->sx, &mdp->sy);
     368        }
     369}
     370
     371/* set whether moons are transiting */
     372static void
     373moonTrans (MoonData md[J_NMOONS])
     374{
     375        int i;
     376
     377        for (i = 1; i < J_NMOONS; i++) {
     378            MoonData *mdp = &md[i];
     379            mdp->trans = mdp->z > 0 && mdp->x*mdp->x + mdp->y*mdp->y < 1;
     380        }
     381}
     382
    341383/* For RCS Only -- Do Not Edit */
    342 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: jupmoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     384static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: jupmoon.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/libration.c

    r2551 r2643  
    22162216
    22172217/* For RCS Only -- Do Not Edit */
    2218 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: libration.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     2218static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: libration.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/magdecl.c

    r2641 r2643  
    379379
    380380/* For RCS Only -- Do Not Edit */
    381 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 $"};
     381static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: magdecl.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/marsmoon.c

    r2551 r2643  
    1111static int use_bdl (double JD, char *dir, MoonData md[M_NMOONS]);
    1212static void moonradec (double msize, MoonData md[M_NMOONS]);
    13 static void moonSVis (Obj *eop, Obj *mop, MoonData md[M_NMOONS]);
     13static void moonSVis (Obj *sop, Obj *mop, MoonData md[M_NMOONS]);
    1414static void moonEVis (MoonData md[M_NMOONS]);
     15static void moonPShad (Obj *sop, Obj *mop, MoonData md[M_NMOONS]);
     16static void moonTrans (MoonData md[M_NMOONS]);
    1517
    1618/* moon table and a few other goodies and when it was last computed */
    … …  
    2628static char mbdlfn[] = "mars.9910";
    2729
     30/* These values are from the Explanatory Supplement.
     31 * Precession degrades them gradually over time.
     32 */
     33#define POLE_RA         degrad(317.61)
     34#define POLE_DEC        degrad(52.85)
     35
     36
    2837/* get mars info in md[0], moon info in md[1..M_NMOONS-1].
    2938 * if !dir always use bruton model.
    3039 * if !mop caller just wants md[] for names
    31  * N.B. we assume eop and mop are updated.
     40 * N.B. we assume sop and mop are updated.
    3241 */
    3342void
    … …  
    3544double Mjd,                     /* mjd */
    3645char dir[],                     /* dir in which to look for helper files */
    37 Obj *eop,                       /* earth == Sun */
     46Obj *sop,                       /* Sun */
    3847Obj *mop,                       /* mars */
    3948double *sizep,                  /* mars's angular diam, rads */
     49double *polera, double *poledec,/* pole location */
    4050MoonData md[M_NMOONS])          /* return info */
    4151{
    … …  
    4454        /* always copy back at least for name */
    4555        memcpy (md, mmd, sizeof(mmd));
     56
     57        /* pole */
     58        if (polera) *polera = POLE_RA;
     59        if (poledec) *poledec = POLE_DEC;
    4660
    4761        /* nothing else if repeat call or just want names */
    … …  
    8195
    8296        /* set visibilities */
    83         moonSVis (eop, mop, md);
     97        moonSVis (sop, mop, md);
     98        moonPShad (sop, mop, md);
    8499        moonEVis (md);
     100        moonTrans (md);
    85101
    86102        /* fill in moon ra and dec */
    … …  
    167183static void
    168184moonSVis(
    169 Obj *eop,               /* earth == SUN */
     185Obj *sop,               /* SUN */
    170186Obj *mop,               /* mars */
    171187MoonData md[M_NMOONS])
    172188{
    173         double esd = eop->s_edist;
     189        double esd = sop->s_edist;
    174190        double eod = mop->s_edist;
    175191        double sod = mop->s_sdist;
    … …  
    210226}
    211227
     228/* set pshad and sx,sy shadow info */
     229static void
     230moonPShad(
     231Obj *sop,             /* SUN */
     232Obj *mop,             /* mars */
     233MoonData md[M_NMOONS])
     234{
     235        int i;
     236
     237        for (i = 1; i < M_NMOONS; i++) {
     238            MoonData *mdp = &md[i];
     239            mdp->pshad = !plshadow (mop, sop, POLE_RA, POLE_DEC, mdp->x,
     240                                          mdp->y, mdp->z, &mdp->sx, &mdp->sy);
     241        }
     242}
     243
     244/* set whether moons are transiting */
     245static void
     246moonTrans (MoonData md[M_NMOONS])
     247{
     248        int i;
     249
     250        for (i = 1; i < M_NMOONS; i++) {
     251            MoonData *mdp = &md[i];
     252            mdp->trans = mdp->z > 0 && mdp->x*mdp->x + mdp->y*mdp->y < 1;
     253        }
     254}
     255
     256
    212257/* For RCS Only -- Do Not Edit */
    213 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 $"};
     258static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: marsmoon.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/misc.c

    r2551 r2643  
    477477
    478478/* For RCS Only -- Do Not Edit */
    479 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: misc.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     479static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: misc.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/mjd.c

    r2551 r2643  
    254254
    255255/* For RCS Only -- Do Not Edit */
    256 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: mjd.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     256static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: mjd.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/moon.c

    r2551 r2643  
    34633463
    34643464/* For RCS Only -- Do Not Edit */
    3465 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: moon.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     3465static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: moon.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/mooncolong.c

    r2551 r2643  
    234234
    235235/* For RCS Only -- Do Not Edit */
    236 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: mooncolong.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     236static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: mooncolong.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/moonnf.c

    r2551 r2643  
    6767
    6868/* For RCS Only -- Do Not Edit */
    69 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: moonnf.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     69static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: moonnf.c,v $ $Date: 2005-01-17 10:13:05 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/nutation.c

    r2551 r2643  
    439439
    440440/* For RCS Only -- Do Not Edit */
    441 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: nutation.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     441static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: nutation.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/obliq.c

    r2551 r2643  
    2525
    2626/* For RCS Only -- Do Not Edit */
    27 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: obliq.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     27static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: obliq.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/parallactic.c

    r2551 r2643  
    5252
    5353/* For RCS Only -- Do Not Edit */
    54 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: parallactic.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     54static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: parallactic.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/parallax.c

    r2551 r2643  
    4040
    4141/* For RCS Only -- Do Not Edit */
    42 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: parallax.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     42static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: parallax.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/plans.c

    r2551 r2643  
    225225
    226226/* For RCS Only -- Do Not Edit */
    227 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plans.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     227static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plans.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/plmoon.c

    r2551 r2643  
    106106        MoonData md[X_MAXNMOONS];
    107107        double sz, t1, t2;
     108        double pra, pdec;
    108109        MoonData *mdp;
    109110        Obj *planop;
    … …  
    136137
    137138            /* don't worry, this already caches based on same mjd */
    138             marsm_data (mjd, moondir, sunop, planop, &sz, md);
     139            marsm_data (mjd, moondir, sunop, planop, &sz, &pra, &pdec, md);
    139140            mdp = &md[moonop->pl_moon];
    140141            break;
    … …  
    154155
    155156            /* don't worry, this already caches based on same mjd */
    156             jupiter_data (mjd, moondir, sunop, planop, &sz, &t1, &t2, md);
     157            jupiter_data (mjd,moondir,sunop,planop,&sz,&t1,&t2,&pra,&pdec,md);
    157158            mdp = &md[moonop->pl_moon];
    158159            moonop->pl_aux1 = t1;
    … …  
    178179
    179180            /* don't worry, this already caches based on same mjd */
    180             saturn_data (mjd, moondir, sunop, planop, &sz, &t1, &t2, md);
     181            saturn_data (mjd,moondir,sunop,planop,&sz,&t1,&t2,&pra,&pdec,md);
    181182            mdp = &md[moonop->pl_moon];
    182183            moonop->pl_aux1 = t1;
    … …  
    199200
    200201            /* don't worry, this already caches based on same mjd */
    201             uranus_data (mjd, moondir, sunop, planop, &sz, md);
     202            uranus_data (mjd, moondir, sunop, planop, &sz, &pra, &pdec, md);
    202203            mdp = &md[moonop->pl_moon];
    203204            break;

  • trunk/SophyaExt/XephemAstroLib/plshadow.c

    r2551 r2643  
    66#define sqr(x)          ((x)*(x))
    77
    8 /* given a time, a planet, the sun, the planet's eq pole position and a
     8/* given a planet, the sun, the planet's eq pole position and a
    99 * position of a satellite (as eq x=+e y=+s z=front in planet radii) find x,y
    1010 * position of shadow.
    … …  
    1212 */
    1313int
    14 plshadow (Now *np, Obj *op, Obj *sop, double polera, double poledec, double x,
    15 double y, double z, double *sxp, double *syp)
     14plshadow (Obj *op, Obj *sop, double polera, double poledec, double x,
     15double y, double z, float *sxp, float *syp)
    1616{
    1717        /* equatorial to ecliptic sky-plane rotation */
    … …  
    4848
    4949/* For RCS Only -- Do Not Edit */
    50 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plshadow.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     50static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: plshadow.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/precess.c

    r2551 r2643  
    144144
    145145/* For RCS Only -- Do Not Edit */
    146 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: precess.c,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     146static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: precess.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/preferences.h

    r2551 r2643  
    2929
    3030/* For RCS Only -- Do Not Edit
    31  * @(#) $RCSfile: preferences.h,v $ $Date: 2004-06-15 16:52:39 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     31 * @(#) $RCSfile: preferences.h,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    3232 */

  • trunk/SophyaExt/XephemAstroLib/reduce.c

    r2551 r2643  
    7676
    7777/* For RCS Only -- Do Not Edit */
    78 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: reduce.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     78static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: reduce.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/refract.c

    r2551 r2643  
    8989
    9090/* For RCS Only -- Do Not Edit */
    91 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: refract.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};
     91static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: refract.c,v $ $Date: 2005-01-17 10:13:06 $ $Revision: 1.5 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/rings.c

    r2551 r2643  
    4343
    4444/* For RCS Only -- Do Not Edit */
    45 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: rings.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};
     45static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: rings.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/riset.c

    r2551 r2643  
    9898
    9999/* For RCS Only -- Do Not Edit */
    100 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     100static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/riset_cir.c

    r2551 r2643  
    370370
    371371/* For RCS Only -- Do Not Edit */
    372 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset_cir.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     372static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: riset_cir.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/satlib.h

    r2551 r2643  
    22#define __SATLIB_H
    33
    4 /* $Id: satlib.h,v 1.3 2004-06-15 16:52:40 cmv Exp $ */
     4/* $Id: satlib.h,v 1.4 2005-01-17 10:13:07 cmv Exp $ */
    55
    66typedef struct _SatElem {
    … …  
    203203
    204204/* For RCS Only -- Do Not Edit
    205  * @(#) $RCSfile: satlib.h,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     205 * @(#) $RCSfile: satlib.h,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    206206 */

  • trunk/SophyaExt/XephemAstroLib/satmoon.c

    r2551 r2643  
    1414static void moonSVis (Obj *eop, Obj *sop, MoonData md[S_NMOONS]);
    1515static void moonEVis (MoonData md[S_NMOONS]);
     16static void moonPShad (Obj *eop, Obj *sop, MoonData md[S_NMOONS]);
     17static void moonTrans (MoonData md[S_NMOONS]);
    1618
    1719/* moon table and a few other goodies and when it was last computed */
    … …  
    3537static char sbdlfn[] = "saturne.9910";
    3638
     39/* These values are from the Explanatory Supplement.
     40 * Precession degrades them gradually over time.
     41 */
     42#define POLE_RA         degrad(40.58)   /* RA of Saturn's north pole */
     43#define POLE_DEC        degrad(83.54)   /* Dec of Saturn's north pole */
     44
     45
    3746/* get saturn info in md[0], moon info in md[1..S_NMOONS-1].
    3847 * if !dir always use bruton model.
    … …  
    4857double *sizep,                  /* saturn's angular diam, rads */
    4958double *etiltp, double *stiltp, /* earth and sun tilts -- +S */
     59double *polera, double *poledec,/* pole location */
    5060MoonData md[S_NMOONS])          /* return info */
    5161{
    … …  
    5464        /* always copy back at least for name */
    5565        memcpy (md, smd, sizeof(smd));
     66
     67        /* pole */
     68        if (polera) *polera = POLE_RA;
     69        if (poledec) *poledec = POLE_DEC;
    5670
    5771        /* nothing else if repeat call or just want names */
    … …  
    94108        /* set visibilities */
    95109        moonSVis (eop, sop, md);
     110        moonPShad (eop, sop, md);
    96111        moonEVis (md);
     112        moonTrans (md);
    97113
    98114        /* fill in moon ra and dec */
    … …  
    455471}
    456472
     473/* set pshad and sx,sy shadow info */
     474static void
     475moonPShad(
     476Obj *eop,             /* earth == SUN */
     477Obj *sop,             /* saturn */
     478MoonData md[S_NMOONS])
     479{
     480        int i;
     481
     482        for (i = 1; i < S_NMOONS; i++) {
     483            MoonData *mdp = &md[i];
     484            mdp->pshad = !plshadow (sop, eop, POLE_RA, POLE_DEC, mdp->x,
     485                                          mdp->y, mdp->z, &mdp->sx, &mdp->sy);
     486        }
     487}
     488
     489
     490/* set whether moons are transiting */
     491static void
     492moonTrans (MoonData md[S_NMOONS])
     493{
     494        int i;
     495
     496        for (i = 1; i < S_NMOONS; i++) {
     497            MoonData *mdp = &md[i];
     498            mdp->trans = mdp->z > 0 && mdp->x*mdp->x + mdp->y*mdp->y < 1;
     499        }
     500}
     501
    457502/* For RCS Only -- Do Not Edit */
    458 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 $"};
     503static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: satmoon.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/satspec.h

    r2551 r2643  
    22#define __SATSPEC_H
    33
    4 /* $Id: satspec.h,v 1.3 2004-06-15 16:52:40 cmv Exp $ */
     4/* $Id: satspec.h,v 1.4 2005-01-17 10:13:07 cmv Exp $ */
    55
    66#include "sattypes.h"
    … …  
    4040
    4141/* For RCS Only -- Do Not Edit
    42  * @(#) $RCSfile: satspec.h,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     42 * @(#) $RCSfile: satspec.h,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    4343 */

  • trunk/SophyaExt/XephemAstroLib/sattypes.h

    r2551 r2643  
    22#define __SATTYPES_H
    33
    4 /* $Id: sattypes.h,v 1.3 2004-06-15 16:52:40 cmv Exp $ */
     4/* $Id: sattypes.h,v 1.4 2005-01-17 10:13:07 cmv Exp $ */
    55
    66typedef struct _Vec3 {
    … …  
    2525
    2626/* For RCS Only -- Do Not Edit
    27  * @(#) $RCSfile: sattypes.h,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     27 * @(#) $RCSfile: sattypes.h,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    2828 */

  • trunk/SophyaExt/XephemAstroLib/sdp4.c

    r2551 r2643  
    428428
    429429/* For RCS Only -- Do Not Edit */
    430 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sdp4.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     430static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sdp4.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/sgp4.c

    r2551 r2643  
    399399
    400400/* For RCS Only -- Do Not Edit */
    401 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sgp4.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     401static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sgp4.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/sphcart.c

    r2551 r2643  
    4141
    4242/* For RCS Only -- Do Not Edit */
    43 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sphcart.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     43static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sphcart.c,v $ $Date: 2005-01-17 10:13:07 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/sun.c

    r2551 r2643  
    4242
    4343/* For RCS Only -- Do Not Edit */
    44 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sun.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     44static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: sun.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/thetag.c

    r2551 r2643  
    33#include "deepconst.h"
    44
    5 /* @(#) $Id: thetag.c,v 1.3 2004-06-15 16:52:40 cmv Exp $ */
     5/* @(#) $Id: thetag.c,v 1.4 2005-01-17 10:13:08 cmv Exp $ */
    66
    77
    … …  
    8888
    8989/* For RCS Only -- Do Not Edit */
    90 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: thetag.c,v $ $Date: 2004-06-15 16:52:40 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     90static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: thetag.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/twobody.c

    r2551 r2643  
    241241
    242242/* For RCS Only -- Do Not Edit */
    243 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: twobody.c,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};
     243static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: twobody.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/umoon.c

    r2551 r2643  
    1111static int use_bdl (double jd, char *dir, MoonData md[U_NMOONS]);
    1212static void moonradec (double usize, MoonData md[U_NMOONS]);
    13 static void moonSVis (Obj *eop, Obj *uop, MoonData md[U_NMOONS]);
     13static void moonSVis (Obj *sop, Obj *uop, MoonData md[U_NMOONS]);
    1414static void moonEVis (MoonData md[U_NMOONS]);
     15static void moonPShad (Obj *sop, Obj *uop, MoonData md[U_NMOONS]);
     16static void moonTrans (MoonData md[U_NMOONS]);
    1517
    1618/* moon table and a few other goodies and when it was last computed */
    … …  
    2931static char ubdlfn[] = "uranus.9910";
    3032
     33/* These values are from the Explanatory Supplement.
     34 * Precession degrades them gradually over time.
     35 */
     36#define POLE_RA         degrad(257.43)  /* RA of Uranus' north pole */
     37#define POLE_DEC        degrad(-15.10)  /* Dec of Uranus' north pole */
     38
     39
    3140/* get uranus info in md[0], moon info in md[1..U_NMOONS-1].
    3241 * if !uop caller just wants md[] for names
    33  * N.B. we assume eop and uop are updated.
     42 * N.B. we assume sop and uop are updated.
    3443 */
    3544void
    … …  
    3746double Mjd,             /* mjd */
    3847char dir[],             /* dir in which to look for helper files */
    39 Obj *eop,               /* earth == Sun */
     48Obj *sop,               /* Sun */
    4049Obj *uop,               /* uranus */
    4150double *sizep,          /* u angular diam, rads */
     51double *polera, double *poledec,      /* pole location */
    4252MoonData md[U_NMOONS])  /* return info */
    4353{
    … …  
    4656        /* always copy back at least for name */
    4757        memcpy (md, umd, sizeof(umd));
     58
     59        /* pole */
     60        if (polera) *polera = POLE_RA;
     61        if (poledec) *poledec = POLE_DEC;
    4862
    4963        /* nothing else if repeat call or just want names */
    … …  
    86100
    87101        /* set visibilities */
    88         moonSVis (eop, uop, md);
     102        moonSVis (sop, uop, md);
     103        moonPShad (sop, uop, md);
    89104        moonEVis (md);
     105        moonTrans (md);
    90106
    91107        /* fill in moon ra and dec */
    … …  
    172188static void
    173189moonSVis(
    174 Obj *eop,               /* earth == SUN */
     190Obj *sop,               /* SUN */
    175191Obj *uop,               /* uranus */
    176192MoonData md[U_NMOONS])
    177193{
    178         double esd = eop->s_edist;
     194        double esd = sop->s_edist;
    179195        double eod = uop->s_edist;
    180196        double sod = uop->s_sdist;
    … …  
    215231}
    216232
     233/* set pshad and sx,sy shadow info */
     234static void
     235moonPShad(
     236Obj *sop,             /* SUN */
     237Obj *uop,             /* uranus */
     238MoonData md[U_NMOONS])
     239{
     240        int i;
     241
     242        for (i = 1; i < U_NMOONS; i++) {
     243            MoonData *mdp = &md[i];
     244            mdp->pshad = !plshadow (uop, sop, POLE_RA, POLE_DEC, mdp->x,
     245                                          mdp->y, mdp->z, &mdp->sx, &mdp->sy);
     246        }
     247}
     248
     249/* set whether moons are transiting */
     250static void
     251moonTrans (MoonData md[U_NMOONS])
     252{
     253        int i;
     254
     255        for (i = 1; i < U_NMOONS; i++) {
     256            MoonData *mdp = &md[i];
     257            mdp->trans = mdp->z > 0 && mdp->x*mdp->x + mdp->y*mdp->y < 1;
     258        }
     259}
     260
     261
    217262/* For RCS Only -- Do Not Edit */
    218 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: umoon.c,v $ $Date: 2004-06-15 16:54:12 $ $Revision: 1.1 $ $Name: not supported by cvs2svn $"};
     263static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: umoon.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.2 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/utc_gst.c

    r2551 r2643  
    9393
    9494/* For RCS Only -- Do Not Edit */
    95 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: utc_gst.c,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     95static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: utc_gst.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/vector.h

    r2551 r2643  
    22#define __SATVECTOR_H
    33
    4 /* $Id: vector.h,v 1.3 2004-06-15 16:52:41 cmv Exp $ */
     4/* $Id: vector.h,v 1.4 2005-01-17 10:13:08 cmv Exp $ */
    55
    66#define dotp(A,B) ((A).x*(B).x+(A).y*(B).y+(A).z*(B).z)
    … …  
    1616
    1717/* For RCS Only -- Do Not Edit
    18  * @(#) $RCSfile: vector.h,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     18 * @(#) $RCSfile: vector.h,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    1919 */

  • trunk/SophyaExt/XephemAstroLib/vsop87.c

    r2551 r2643  
    207207
    208208/* For RCS Only -- Do Not Edit */
    209 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: vsop87.c,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};
     209static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: vsop87.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.5 $ $Name: not supported by cvs2svn $"};

  • trunk/SophyaExt/XephemAstroLib/vsop87.h

    r2551 r2643  
    9090
    9191/* For RCS Only -- Do Not Edit
    92  * @(#) $RCSfile: vsop87.h,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $
     92 * @(#) $RCSfile: vsop87.h,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $
    9393 */

  • trunk/SophyaExt/XephemAstroLib/vsop87_data.c

    r2551 r2643  
    69866986
    69876987/* For RCS Only -- Do Not Edit */
    6988 static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: vsop87_data.c,v $ $Date: 2004-06-15 16:52:41 $ $Revision: 1.3 $ $Name: not supported by cvs2svn $"};
     6988static char *rcsid[2] = {(char *)rcsid, "@(#) $RCSfile: vsop87_data.c,v $ $Date: 2005-01-17 10:13:08 $ $Revision: 1.4 $ $Name: not supported by cvs2svn $"};
Note: See TracChangeset for help on using the changeset viewer.