Index: trunk/Ohana/src/skycalc/include/skycalc.h =================================================================== --- trunk/Ohana/src/skycalc/include/skycalc.h (revision 3263) +++ trunk/Ohana/src/skycalc/include/skycalc.h (revision 19681) @@ -1,2 +1,7 @@ + +/* This is the header file for the Ohana version of 'libskycalc'. This library is based on the + * code provided to the community by John Thorstensen. See the discussion in the README file + * and in the file doc/Thorstensen.txt + */ /* header for skycalc library function calls */ Index: trunk/Ohana/src/skycalc/include/skycalc_internal.h =================================================================== --- trunk/Ohana/src/skycalc/include/skycalc_internal.h (revision 3263) +++ trunk/Ohana/src/skycalc/include/skycalc_internal.h (revision 19681) @@ -1,28 +1,9 @@ +/* header for use by the skycalc library files and stand-alone programs, not needed for external calls */ -/* header for use by the skycalc library files, not needed for external calls */ - -# include # include # include -# include -# include -# include +# include # include - -/* a couple of the system-dependent magic numbers are defined here */ - -#define SYS_CLOCK_OK 1 /* 1 means ANSI-standard time libraries do work, - 2 means they don't. This is used by compiler switches in file 5 and - the main program. */ - -#define LOG_FILES_OK 1 /* 1 means that log files are enabled. - Any other value means they're not. */ - -#define MAX_OBJECTS 500 -#define MINSHORT -32767 /* min, max short integers and double precision */ -#define MAXSHORT 32767 -#define MAXDOUBLE 1.0e38 -#define MINDOUBLE -1.0e38 -#define BUFSIZE 150 +# include /* some (not all) physical, mathematical, and astronomical constants @@ -44,61 +25,53 @@ #define PLANET_TOL 3. /* flag if nearer than 3 degrees to a major planet ... */ -#define KZEN 0.172 /* zenith extinction, mag, for use - in lunar sky brightness calculations. */ -#define FIRSTJD 2415387. /* 1901 Jan 1 -- calendrical limit */ -#define LASTJD 2488070. /* 2099 Dec 31 */ -/* MAGIC NUMBERS which might depend on how accurately double- - precision floating point is handled on your machine ... */ +# define dCOS(A) ((double) cos ((double)RAD_DEG*A)) +# define dSIN(A) ((double) sin ((double)RAD_DEG*A)) -#define EARTH_DIFF 0.05 /* used in numerical - differentiation to find earth velocity -- this value gives - about 8 digits of numerical accuracy on the VAX, but is - about 3 orders of magnitude larger than the value where roundoff - errors become apparent. */ +/** prototypes of private functions used by the library **/ -#define MIDN_TOL 0.00001 /* this is no longer - used -- it was formerly - how close (in days) a julian date has to be to midnight - before a warning flag is printed for the reader. VAX - double precision renders a Julian date considerably - more accurately than this. The day and date are now based - on the same rounding of the julian date, so they should - always agree. */ +/* in time.c */ +int SC_get_sys_date (struct SC_date_time *date); +double SC_date_to_jd (struct SC_date_time date); +void SC_jd_to_date (double jdin, struct SC_date_time *date); +double SC_lst (double jd, double longit); +double SC_adj_time (double x); -/** prototypes **/ -int get_sys_date (struct SC_date_time *date); -double date_to_jd (struct SC_date_time date); -void jd_to_date (double jdin, struct SC_date_time *date); -double lst (double jd, double longit); -double adj_time (double x); -void xyz_cel (double x, double y, double z, double *r, double *d); -double atan_circ (double x, double y); -double altit (double dec, double ha, double lat, double *az); -double ha_alt (double dec, double lat, double alt); -void min_max_alt (double lat, double dec, double *min, double *max); -double circulo (double x); -void precrot (double rorig, double dorig, double orig_epoch, double final_epoch, double *rf, double *df); -void geocent (double geolong, double geolat, double height, double *x_geo, double *y_geo, double *z_geo); -void eclrot(double jd, double *x, double *y, double *z); -double etcorr (double jd); -void set_zenith (struct SC_date_time date, double lat, double longit, double epoch, double *ra, double *dec); -void lpsun (double jd, double *ra, double *dec); -double jd_sun_alt (double alt, double jdguess, double lat, double longit); -void accumoon (double jd, double geolat, double lst, double elevsea, - double *geora, double *geodec, double *geodist, - double *topora, double *topodec, double *topodist); -double jd_moon_alt (double alt, double jdguess, double lat, double longit, double elevsea); +/* in geometry.c */ +void SC_xyz_cel (double x, double y, double z, double *r, double *d); +double SC_atan_circ (double x, double y); +double SC_altit (double dec, double ha, double lat, double *az); +double SC_ha_alt (double dec, double lat, double alt); +void SC_min_max_alt (double lat, double dec, double *min, double *max); +double SC_circulo (double x); -double sunset_tonight (struct SC_date_time date, double lat, double longit, double elev); -double sunrise_tonight (struct SC_date_time date, double lat, double longit, double elev); +/* in astro.c */ +void SC_precrot (double rorig, double dorig, double orig_epoch, double final_epoch, double *rf, double *df); +void SC_geocent (double geolong, double geolat, double height, double *x_geo, double *y_geo, double *z_geo); +void SC_eclrot(double jd, double *x, double *y, double *z); +double SC_etcorr (double jd); +void SC_set_zenith (struct SC_date_time date, double lat, double longit, double epoch, double *ra, double *dec); -int dms_to_ddd (double *Value, char *string); -int str_to_radec (double *ra, double *dec, char *str1, char *str2); -int chk_time (char *line); -double sec_to_jd (time_t second); -time_t jd_to_sec (double jd); -char *sec_to_date (time_t second); -time_t date_to_sec (char *date); -int str_to_time (char *line, time_t *second); -int str_to_dtime (char *line, double *second); +/* in sun.c */ +void SC_lpsun (double jd, double *ra, double *dec); +double SC_jd_sun_alt (double alt, double jdguess, double lat, double longit); +double SC_sunset_tonight (struct SC_date_time date, double lat, double longit, double elev); +double SC_sunrise_tonight (struct SC_date_time date, double lat, double longit, double elev); + +/* in moon.c */ +void SC_lpmoon(double jd, double lat, double sid, double* ra, double* dec, double* dist); +void SC_accumoon (double jd, double geolat, double lst, double elevsea, double *geora, double *geodec, double *geodist, double *topora, double *topodec, double *topodist); +double SC_jd_moon_alt (double alt, double jdguess, double lat, double longit, double elevsea); +double SC_moonset_tonight (struct SC_date_time date, double lat, double longit, double elevsea, double elev); +double SC_moonrise_tonight (struct SC_date_time date, double lat, double longit, double elevsea, double elev); + +// are these defined in here or in libohana? +// int dms_to_ddd (double *Value, char *string); +// int str_to_radec (double *ra, double *dec, char *str1, char *str2); +// int chk_time (char *line); +// double sec_to_jd (time_t second); +// time_t jd_to_sec (double jd); +// char *sec_to_date (time_t second); +// time_t date_to_sec (char *date); +// int str_to_time (char *line, time_t *second); +// int str_to_dtime (char *line, double *second);