diff --git a/DESCRIPTION b/DESCRIPTION index 7009364..f30d690 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: swephR Type: Package Title: High Precision Swiss Ephemeris -Version: 0.3.1 +Version: 0.3.1.1 Authors@R: c( person("Ralf", "Stubner", email = "ralf.stubner@gmail.com", role = c("aut", "cre")), person("Victor", "Reijs", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 0869e3b..4609526 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # NEWS for swephR +## swephR (unpublished) + +* Add files seorbel.txt (fictitious bodies) and seleapsec.txt (leap seconds) +* Update sefstars.txt (fixed stars) + ## swephR 0.3.1 * new upstream version v2.10.03 diff --git a/external/swisseph b/external/swisseph index 518a254..e4b3e48 160000 --- a/external/swisseph +++ b/external/swisseph @@ -1 +1 @@ -Subproject commit 518a254acbbf8ded34f41616aa1f024b9e8ae2bc +Subproject commit e4b3e483a7c5de801d2ff9faebd5e637da70f79e diff --git a/external/update-upstream.sh b/external/update-upstream.sh index a4d5b19..e98af91 100755 --- a/external/update-upstream.sh +++ b/external/update-upstream.sh @@ -4,3 +4,9 @@ do g=$(basename $f) cp swisseph/$g $f done + +for f in ../inst/ephemeris/*.txt +do + g=$(basename $f) + find . -name $g -exec cp \{\} $f \; +done diff --git a/inst/ephemeris/sefstars.txt b/inst/ephemeris/sefstars.txt index 5bcffd9..34c26e4 100644 --- a/inst/ephemeris/sefstars.txt +++ b/inst/ephemeris/sefstars.txt @@ -20,8 +20,10 @@ Gal. Center,SgrA*,ICRS,17,45,40.03599,-29,00,28.1699,-2.755718425, -5.547, 0.0, # 325.3, -7.2, 4844 km s-1 according to Kraan-Korteweg et al. 1996, # Woudt 1998 Great Attractor,GA,2000,16,15,02.836,-60,53,22.54,0.000, 0.00, 0.0,0.0000159,999.99, 0, 0 -# Virgo Cluster, according to NED (Nasa Extragalactic Database) -Virgo Cluster,VC,2000,12,26,32.1,12,43,24,0.000, 0.00, 0.0,0.0000,999.99, 0, 0 +# Virgo Cluster, according to NED (Nasa Extragalactic Database) (old from 2008 or earlier) +# Virgo Cluster,VC,2000,12,26,32.1,12,43,24,0.000, 0.00, 0.0,0.0000,999.99, 0, 0 +# Virgo Cluster, according to NED (Nasa Extragalactic Database) 17 June 2021 +Virgo Cluster,VC,2000,12,30,47.3,12,20,13,0.000, 0.00, 0.0,0.0000,999.99, 0, 0 Andromeda Galaxy,M31,ICRS,00,42,44.330,+41,16,07.50,-35.99,-12.92,-301,0.00128205,3.44, 0, 0 # Prasepe (Beehive Cluster): http://seds.lpl.arizona.edu/messier/m/m044.html (note, the apparent dimension is 95.0 arc min) Praesepe Cluster,M44,2000,08,40,6.000,19,59,0.00,0.000, 0.00, 0.0,5.65,3.7, 0, 0 @@ -583,6 +585,8 @@ Ruchbah II ,ome-2Cyg,ICRS,20,31,18.81663,+49,13,13.0656,9.21,-31.88,-64.15,8.17, # We use identical coordinates, but 61 Cyg has combined magnitude of both stars. ,61Cyg,ICRS,21,06,53.95249,+38,44,57.9854,4168.31,3269.2,-65.74,286.82,4.84, 38, 4343 ,61CygA,ICRS,21,06,53.95249,+38,44,57.9854,4168.31,3269.2,-65.74,286.82,5.21, 38, 4343 +# added 3-dec-22 upon request Charlotte Jean Hardy + ,34Cyg,ICRS,20,17,47.20208,+38,01,58.5527,-3.18,-6.45,-8.9,0.32,-3e-05,0,0 # Delphinus Sualocin ,alDel,ICRS,20,39,38.28720,+15,54,43.4637,53.82,8.47,-3.4,12.85,3.8, 15, 4222 Rotanev ,beDel,ICRS,20,37,32.94130,+14,35,42.3195,118.09,-48.06,-22.7,32.33,3.63, 14, 4369 @@ -643,7 +647,8 @@ Athebyne ,etDra,ICRS,16,23,59.48594,+61,30,51.1699,-17.02,56.95,-15.2,35.42,2 Batentaban Australis,phDra,ICRS,18,20,45.43224,+71,20,16.1499,-5.03,37.86,-16,10.77,4.22, 0, 0 Tianyi ,7Dra,ICRS,12,47,34.3489,+66,47,25.086,5.089,-5.74,11.33,4.4,5.423, 0,0 Taiyi ,8Dra,ICRS,12,55,28.54827,+65,26,18.5073,-4.8,-30.09,9,34.14,5.225, 0,0 -Fafnir ,32Dra,ICRS,17,53,31.72962,+56,52,21.5143,93.82,78.5,-26.46,28.98,3.75, 0,0 +#Fafnir ,32Dra,ICRS,17,53,31.72962,+56,52,21.5143,93.82,78.5,-26.46,28.98,3.75, 0,0 +Fafnir ,42Dra,ICRS,18,25,59.1383795957,+65,33,48.503958394,105.248,-25.104,31.79,11.0061,4.823, 0,0 # Equuleus Kitalpha ,alEqu,ICRS,21,15,49.43192,+05,14,52.2430,59.88,-94.09,-16.26,17.14,3.933, 04, 4635 ,gaEqu,ICRS,21,10,20.50005,+10,07,53.6763,48.74,-153.03,-16.5,27.55,4.68, 09, 4732 diff --git a/inst/ephemeris/seleapsec.txt b/inst/ephemeris/seleapsec.txt new file mode 100644 index 0000000..45389b9 --- /dev/null +++ b/inst/ephemeris/seleapsec.txt @@ -0,0 +1,6 @@ +# This file contains the dates of leap seconds to be taken into account +# by the Swiss Ephemeris. +# For each new leap second add the date of its insertion in the format +# yyyymmdd, e.g. "20081231" for 31 december 2008. +# The leap second is inserted at the end of the day. +20081231 diff --git a/inst/ephemeris/seorbel.txt b/inst/ephemeris/seorbel.txt new file mode 100644 index 0000000..748189a --- /dev/null +++ b/inst/ephemeris/seorbel.txt @@ -0,0 +1,97 @@ + # Orbital elements of ficticious planets + # 27 Jan. 2000 + # + # This file is part of the Swiss Ephemeris, from Version 1.52 on. + # + # Warning! These planets do not exist! + # + # The user can add his or her own elements. + # 960 is the maximum number of ficticious planets. + # + # The elements order is as follows: + # 1. epoch of elements (Julian day) + # 2. equinox (Julian day or "J1900" or "B1950" or "J2000") + # 3. mean anomaly at epoch + # 4. semi-axis + # 5. eccentricity + # 6. argument of perihelion (ang. distance of perihelion from node) + # 7. ascending node + # 8. inclination + # 9. name of planet + # + # use '#' for comments + # to compute a body with swe_calc(), use planet number + # ipl = SE_FICT_OFFSET_1 + number_of_elements_set, + # e.g. number of Kronos is ipl = 39 + 4 = 43 + # + # Witte/Sieggruen planets, refined by James Neely +J1900, J1900, 163.7409, 40.99837, 0.00460, 171.4333, 129.8325, 1.0833, Cupido # 1 +J1900, J1900, 27.6496, 50.66744, 0.00245, 148.1796, 161.3339, 1.0500, Hades # 2 +J1900, J1900, 165.1232, 59.21436, 0.00120, 299.0440, 0.0000, 0.0000, Zeus # 3 +J1900, J1900, 169.0193, 64.81690, 0.00305, 208.8801, 0.0000, 0.0000, Kronos # 4 +J1900, J1900, 138.0533, 70.29949, 0.00000, 0.0000, 0.0000, 0.0000, Apollon # 5 +J1900, J1900, 351.3350, 73.62765, 0.00000, 0.0000, 0.0000, 0.0000, Admetos # 6 +J1900, J1900, 55.8983, 77.25568, 0.00000, 0.0000, 0.0000, 0.0000, Vulcanus # 7 +J1900, J1900, 165.5163, 83.66907, 0.00000, 0.0000, 0.0000, 0.0000, Poseidon # 8 + # + # Isis-Transpluto; elements from "Die Sterne" 3/1952, p. 70ff. + # Strubell does not give an equinox. 1945 is taken in order to + # reproduce the as best as ASTRON ephemeris. (This is a strange + # choice, though.) + # The epoch according to Strubell is 1772.76. + # 1772 is a leap year! + # The fraction is counted from 1 Jan. 1772 +2368547.66, 2431456.5, 0.0, 77.775, 0.3, 0.7, 0, 0, Isis-Transpluto # 9 + # Nibiru, elements from Christian Woeltge, Hannover +1856113.380954, 1856113.380954, 0.0, 234.8921, 0.981092, 103.966, -44.567, 158.708, Nibiru # 10 + # Harrington, elements from Astronomical Journal 96(4), Oct. 1988 +2374696.5, J2000, 0.0, 101.2, 0.411, 208.5, 275.4, 32.4, Harrington # 11 + # according to W.G. Hoyt, "Planets X and Pluto", Tucson 1980, p. 63 +2395662.5, 2395662.5, 34.05, 36.15, 0.10761, 284.75, 0, 0, Leverrier (Neptune) # 12 +2395662.5, 2395662.5, 24.28, 37.25, 0.12062, 299.11, 0, 0, Adams (Neptune) # 13 +2425977.5, 2425977.5, 281, 43.0, 0.202, 204.9, 0, 0, Lowell (Pluto) # 14 +2425977.5, 2425977.5, 48.95, 55.1, 0.31, 280.1, 100, 15, Pickering (Pluto) # 15 +# intramercurian hypothetical Vulcan acc. to L.H. Weston +J1900,JDATE, 252.8987988 + 707550.7341 * T, 0.13744, 0.019, 322.212069+1670.056*T, 47.787931-1670.056*T, 7.5, Vulcan # 16 +# Selena/White Moon +J2000,JDATE, 242.2205555 + 5143.5418158 * T, 0.05280098949, 0.0, 0.0, 0.0, 0.0, Selena/White Moon, geo # 17 +# Hypothetical planet Proserpina, data from Valentin Abramov +# see also http://www.geocities.ws/rognavaldre/proserpina.html +J1900,JDATE, 170.73, 79.225630, 0, 0, 0, 0, Proserpina #18 +# Waldemath's Second Earth Moon +# Elements were derived by D.Koch from Waldemaths original elements as given in +# David Walters' book on Vulcan. They differ from Solar Fire (Graham Dawsons) +# elements, which are based on the assumption that the "mean longitude" given +# by Waldemath is an observation (a true longitude) +# Neither Swisseph nor Solar fire elements agree with Delphine Jay's ephemeris, +# which is obviously wrong. +2414290.95827875,2414290.95827875, 70.3407215 + 109023.2634989 * T, 0.0068400705250028, 0.1587, 8.14049594 + 2393.47417444 * T, 136.24878256 - 1131.71719709 * T, 2.5, Waldemath, geo # 19 +# Colin R. Nicholl's Comet, according to "The Great Christ Comet", p. 223. +1719500.7, J2000, 0.0, 1190.0, 0.9999, 9.47, 200.08, 178.3, Christ Comet # 20 +# Planet 9, according to: Fienga & alii, Constraints on the location of a +# possible 9th planet, Astronomy & Astrophysics no. FiengaLaskar2016R5. The +# authors provide true anomaly 117.8. Mean anomaly derived by D. Koch +2457388.5,J2000,45.5272966,700,0.6,150,113,30,Planet_9 # 21 +# Comet Halley 12 BCE, only good near 12 BCE; +# Yeomans/Kiang, Mon. Not. R. astr. Soc. (1981), 197, p. 643 +# http://adsabs.harvard.edu/full/1981MNRAS.197..633Y +1717323.34852, B1950, 0.0, 17.99261849, 0.9673664, 92.54399, 35.19064, 163.58392, Comet Halley 12 BCE # 22 +# 2015 RR245 +2457600.5,J2000,322.50413,81.2891975,0.5852663,261.41753,211.67680,7.57643,2015 RR245 # 23 +# Koré apres Aureas +#2415021.5,JDATE, 345.632, 52.0, 0,0,0, 0, Korè #24, adapted to fit 9°19 8.7.1923 +2415021.5,JDATE, 345.67, 52.0014913, 0,0,0, 0, Korè #24 +# Comet Halley 1198 BCE, only good near 1198 BCE +# Yeomans/Kiang, Mon. Not. R. astr. Soc. (1981), 197, p. 643 +# http://adsabs.harvard.edu/full/1981MNRAS.197..633Y +1283983.73252, B1950, 0.0, 16.80480637, 0.9625705, 74.46894, 14.66132, 162.95968, Comet Halley 1198 BCE # 25 +J2000,JDATE, 0.0 + 0.00000 * T, 80000, 0.0, 0.0, 0.0, 0.0, VEA # 26 +#J2000,JDATE, 0.0 , 80000, 0.0, 0.0, 0.0, 0.0, VEA # 26 +# +# The following elements are for test only +# (Selena without T) +J2000,JDATE, 242.2205555, 0.05279142865925, 0.0, 0.0, 0.0, 0.0, Selena/White Moon, geo # 17 +# (Selena with T, gives exactly the same position) +J2000,JDATE, 242.2205555 + 5143.5418158 * T, 0.05279142865925, 0.0, 0.0, 0.0, 0.0, Selena/White Moon with T Terms, geo # 17 +J2000, JDATE, 174.794787 + 149472.5157715 * T, 0.38709831, 0.20563175 + 0.000020406 * T, 29.125226 + 0.3702885 * T, 48.330893 + 1.186189 * T, 7.004986 + 0.0018215 * T, Mercury elem. for equ. of date # 18 +J2000, J2000, 174.794787 + 149472.5157715 * T, 0.38709831, 0.20563175 + 0.000020406 * T, 29.125226 + 0.2842872 * T, 48.330893 - 0.1254229 * T, 7.004986 - 0.0059516 * T, Mercury Test J2000 Elements# 18 diff --git a/src/libswe/sweodef.h b/src/libswe/sweodef.h index 630009d..e6a2cf3 100644 --- a/src/libswe/sweodef.h +++ b/src/libswe/sweodef.h @@ -139,12 +139,6 @@ # define WATCOMC #endif -#ifdef __MWERKS__ /* defined on Macintosh CodeWarrior */ -# if macintosh && powerc -# define MACOS MY_TRUE /* let it undefined otherwise */ -# define MSDOS MY_FALSE /* in case one above fired falsely */ -# endif -#endif #ifdef MSDOS # define HPUNIX MY_FALSE @@ -154,17 +148,12 @@ # endif # define UNIX_FS MY_FALSE #else -# ifdef MACOS -# define HPUNIX MY_FALSE -# define UNIX_FS MY_FALSE -# else # define MSDOS MY_FALSE # define HPUNIX MY_TRUE # ifndef _HPUX_SOURCE # define _HPUX_SOURCE # endif # define UNIX_FS MY_TRUE -# endif #endif #include @@ -321,13 +310,6 @@ typedef int32 centisec; /* centiseconds used for angles and times */ # define BFILE_A_ACCESS "a+b" /* create/open binary file for append*/ # define PATH_SEPARATOR ";" /* semicolon as PATH separator */ # define OPEN_MODE 0666 /* default file creation mode */ -# ifdef MACOS -# define FILE_R_ACCESS "r" /* open text file for reading */ -# define FILE_RW_ACCESS "r+" /* open text file for writing and reading */ -# define FILE_W_CREATE "w" /* create/open text file for write*/ -# define FILE_A_ACCESS "a+" /* create/open text file for append*/ -# define DIR_GLUE ":" /* glue string for directory/file */ -# else # define FILE_R_ACCESS "rt" /* open text file for reading */ # define FILE_RW_ACCESS "r+t" /* open text file for writing and reading */ # define FILE_W_CREATE "wt" /* create/open text file for write*/ @@ -335,7 +317,6 @@ typedef int32 centisec; /* centiseconds used for angles and times */ /* attention, all backslashes for msdos directry names must be written as \\, because it is the C escape character */ # define DIR_GLUE "\\" /* glue string for directory/file */ -# endif #endif #include