sweph 2.10.3-3 → 2.10.3-5

package/swisseph/sweph.c

@@ -1316,6 +1316,7 @@ void CALL_CONV swe_set_ephe_path(const char *path)
 {
   int i, iflag;
   char s[AS_MAXCH];
+  char serr[AS_MAXCH];
   char *sp;
   double xx[6];
   /* close all open files and delete all planetary data */
@@ -1343,7 +1344,7 @@ void CALL_CONV swe_set_ephe_path(const char *path)
    * tidal acceleration of the Moon */
   iflag = SEFLG_SWIEPH|SEFLG_J2000|SEFLG_TRUEPOS|SEFLG_ICRS;
   swed.last_epheflag = 2;
-  swe_calc(J2000, SE_MOON, iflag, xx, NULL);
+  swe_calc(J2000, SE_MOON, iflag, xx, serr);
   if (swed.fidat[SEI_FILE_MOON].fptr != NULL) {
     swi_set_tid_acc(0, 0, swed.fidat[SEI_FILE_MOON].sweph_denum, NULL);
   } 
@@ -6210,7 +6211,7 @@ static int CMP_CALL_CONV fstar_node_compare(const void *node1, const void *node2
 int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata, char *serr)
 {
   int i;
-  char s[AS_MAXCH];
+  char s[AS_MAXCH + 20];
   char *sde_d;
   char *cpos[20];
   double epoch, radv, parall, mag;
@@ -6256,6 +6257,7 @@ int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata,
   de_pm = atof(cpos[10]);
   radv = atof(cpos[11]);
   parall = atof(cpos[12]);
+  if (parall < 0) parall = -parall;	// to fix bug like old Rasalgheti
   mag = atof(cpos[13]);
   /****************************************
    * position and speed (equinox)
@@ -6322,7 +6324,7 @@ int32 fixstar_cut_string(char *srecord, char *star, struct fixed_star *stardata,
 static int32 load_all_fixed_stars(char *serr) 
 {
   int32 retc = OK;
-  int nstars = 0, line = 0, fline = 0, nrecs = 0, nnamed = 0;
+  int nstars = 0, nrecs = 0, nnamed = 0;
   char s[AS_MAXCH], *sp;
   char srecord[AS_MAXCH];
   struct fixed_star fstdata;
@@ -6344,13 +6346,11 @@ static int32 load_all_fixed_stars(char *serr)
   rewind(swed.fixfp);
   swed.fixed_stars = NULL;
   while (fgets(s, AS_MAXCH, swed.fixfp) != NULL) {
-    fline++;	
     // skip comment lines
     if (*s == '#') continue;
     if (*s == '\n') continue;
     if (*s == '\r') continue;
     if (*s == '\0') continue;
-    line++;
     strcpy(srecord, s);
     retc = fixstar_cut_string(srecord, NULL, &fstdata, serr);
     if (retc == ERR) return ERR;
@@ -6388,7 +6388,7 @@ static int32 load_all_fixed_stars(char *serr)
   swed.n_fixstars_real = nstars;
   swed.n_fixstars_named = nnamed;
   swed.n_fixstars_records = nrecs;
-  //printf("nstars=%d, nrecords=%d\n", nstars, nrecs);
+  // fprintf(stderr, "nstars=%d, nrecords=%d\n", nstars, nrecs);	
   (void) qsort ((void *) swed.fixed_stars, (size_t) nrecs, sizeof (struct fixed_star),
                     (int (CMP_CALL_CONV *)(const void *,const void *))(fixedstar_name_compare));
   return retc;
@@ -7266,7 +7266,7 @@ void CALL_CONV swe_set_topo(double geolon, double geolat, double geoalt)
   swi_force_app_pos_etc();
 }
 
-void swi_force_app_pos_etc()
+void swi_force_app_pos_etc(void)
 {
   int i;
   for (i = 0; i < SEI_NPLANETS; i++)

package/swisseph/sweph.h

@@ -445,14 +445,14 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 /*************************/
 /* 8: J.N. Bhasin; (David Cochrane) 
      We don't have any sources or detailed information about this ayanamsha. */
-{J1900, 360 - 338.634444, FALSE, -1}, // Bhasin
+{J1900, 360 - 338.634444, FALSE, -1}, // 8: Bhasin
 /*************************/
 /* 14 Sept. 2018: the following three ayanamshas have been wrong for
    many years */
 /* 9 - 11: Babylonian, Kugler */
-{1684532.5, -5.66667, TRUE, -1},     /*  9: Babylonian, Kugler 1 */
-{1684532.5, -4.26667, TRUE, -1},     /* 10: Babylonian, Kugler 2 */
-{1684532.5, -3.41667, TRUE, -1},     /* 11: Babylonian, Kugler 3 */
+{1684532.5, -5.66667, TRUE, -1},     //  9: Babylonian, Kugler 1
+{1684532.5, -4.26667, TRUE, -1},     // 10: Babylonian, Kugler 2
+{1684532.5, -3.41667, TRUE, -1},     // 11: Babylonian, Kugler 3 
 /*************************/
 /* 12: Babylonian, Huber 
       P. Huber, "Über den Nullpunkt der babylonischen Ekliptik", in: Centaurus
@@ -464,7 +464,7 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 {1673941, -5.079167, TRUE, -1},      // 13: Babylonian, Mercier
 /*************************/
 /* 14: t0 is defined by Aldebaran at 15 Taurus in year -100 */
-{1684532.5, -4.44138598, TRUE, 0},  
+{1684532.5, -4.44138598, TRUE, 0},  // 14: Babylonian/Aldebaran = 15 Tau
 /*************************/
 /* 15: Hipparchos */
 {1674484.0, -9.33333, TRUE, -1},       // 15: Hipparchos
@@ -476,34 +476,34 @@ static const struct aya_init ayanamsa[SE_NSIDM_PREDEF] = {
 {0, 0, FALSE, 0},                    // 17: Galactic Center at 0 Sagittarius 
 /*************************/
 /* 18: J2000 */
-{J2000, 0, FALSE, 0},	             /* 18: J2000 */
+{J2000, 0, FALSE, 0},	             // 18: J2000
 /*************************/
 /* 19: J1900 */
-{J1900, 0, FALSE, 0},	             /* 19: J1900 */
+{J1900, 0, FALSE, 0},	             // 19: J1900
 /*************************/
 /* 20: B1950 */
-{B1950, 0, FALSE, 0},	             /* 20: B1950 */
+{B1950, 0, FALSE, 0},	             // 20: B1950
 /*************************/
 /* 21: Suryasiddhanta, assuming ingress of mean Sun into Aries at point of mean
       equinox of date on 21.3.499, near noon, Ujjain (75.7684565 E) 
       = 7:30:31.57 UT = 12:33:36 LMT*/
-{1903396.8128654, 0, TRUE, 0},	     // 21: 
+{1903396.8128654, 0, TRUE, 0},	     // 21: Suryasiddhanta
 /*************************/
 /* 22: Suryasiddhanta, assuming ingress of mean Sun into Aries at true position
       of mean Sun at same epoch */
-{1903396.8128654,-0.21463395, TRUE, 0}, // 22: 
+{1903396.8128654,-0.21463395, TRUE, 0}, // 22: Suryasiddhanta, mean Sun
 /*************************/
 /* 23: Aryabhata, same date, but UT 6:56:55.57 analogous to 21 */
-{1903396.7895321, 0, TRUE, 0},	     // 23: 
+{1903396.7895321, 0, TRUE, 0},	     // 23: Aryabhata
 /*************************/
 /* 24: Aryabhata, analogous 22 */
-{1903396.7895321,-0.23763238, TRUE, 0}, // 24: 
+{1903396.7895321,-0.23763238, TRUE, 0}, // 24: Aryabhata, mean Sun
 /*************************/
 /* 25: Suryasiddhanta, Revati/zePsc at polar long. 359°50'*/
-{1903396.8128654,-0.79167046, TRUE, 0}, // 25: 
+{1903396.8128654,-0.79167046, TRUE, 0}, // 25: SS Revati
 /*************************/
 /* 26: Suryasiddhanta, Citra/Spica at polar long. 180° */
-{1903396.8128654, 2.11070444, TRUE, 0}, // 26: 
+{1903396.8128654, 2.11070444, TRUE, 0}, // 26: SS Citra
 /*************************/
 /* 27: True Citra (Spica exactly at 0 Libra) */
 {0, 0, FALSE, 0},	             // 27: True Citra 

package/swisseph/swephexp.h

@@ -400,15 +400,10 @@ extern "C" {
 #if MSDOS
 #  define SE_EPHE_PATH    "\\sweph\\ephe\\"
 #else
-# ifdef MACOS
-#  define SE_EPHE_PATH	":ephe:"
-# else
 #  define SE_EPHE_PATH    ".:/users/ephe2/:/users/ephe/"
-			/* At Astrodienst, we maintain two ephemeris areas for
-			   the thousands of asteroid files: 
-			   the short files in /users/ephe/ast*,
-			   the long file in /users/ephe2/ast*. */
-# endif
+    /* At Astrodienst, we maintain two ephemeris areas for the 600'000+  asteroid files: 
+       the short files in /users/ephe/ast*, the long file in /users/ephe2/ast*.
+       /users  is a synonym for /home on many systems */
 #endif
 #endif  /* SE_EPHE_PATH */
 

package/swisseph/swephlib.c

@@ -3151,7 +3151,7 @@ static double adjust_for_tidacc(double ans, double Y, double tid_acc, double tid
 }
 
 /* returns tidal acceleration used in swe_deltat() and swe_deltat_ex() */
-double CALL_CONV swe_get_tid_acc()
+double CALL_CONV swe_get_tid_acc(void)
 {
   return swed.tid_acc;
 }
@@ -3183,7 +3183,7 @@ void CALL_CONV swe_set_delta_t_userdef(double dt)
   }
 }
 
-int32 swi_guess_ephe_flag()
+int32 swi_guess_ephe_flag(void)
 {
   int32 iflag = SEFLG_SWIEPH;
   /* if jpl file is open, assume SEFLG_JPLEPH */
@@ -3933,9 +3933,9 @@ char *CALL_CONV swe_cs2degstr(CSEC t, char *a)
  * for definition of input see function swe_split_deg().
  * output:
  * ideg 	degrees, 
- * imin 	minutes, 
- * isec 	seconds, 
- * dsecfr	fraction of seconds 
+ * imin 	minutes, (zero if rounding to degree)
+ * isec 	seconds, (zero if rounding to minute)
+ * dsecfr	fraction of seconds (zero if rounding used) 
  * inak	nakshatra number; 
  ******************************************************************/
 static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32 *imin, int32 *isec, double *dsecfr, int32 *inak)
@@ -3977,8 +3977,12 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
   if (!(roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN | SE_SPLIT_DEG_ROUND_SEC))) {
     *dsecfr = ddeg * 3600 - *isec;
   } else {
-    *dsecfr = *isec;  // is rounded, no fractional seconds
+    *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg_nakshtra */
 
 /************************************************************
@@ -4003,8 +4007,8 @@ static void split_deg_nakshatra(double ddeg, int32 roundflag, int32 *ideg, int32
 				       * to 10d59'59" (or 10d59' or 10d) * 
  * output:
  *  ideg 	degrees, 
- *  imin 	minutes, 
- *  isec 	seconds, 
+ *  imin 	minutes, (zero if rounding to degree)
+ *  isec 	seconds, (zero if rounding to minute or degree)
  *  dsecfr	fraction of seconds (zero if rounding used) 
  *  isgn	zodiac sign number; 
  *              or +/- sign
@@ -4052,6 +4056,10 @@ void CALL_CONV swe_split_deg(double ddeg, int32 roundflag, int32 *ideg, int32 *i
   } else {
     *dsecfr = 0;
   }
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG)) 
+    *imin = 0;
+  if (roundflag & (SE_SPLIT_DEG_ROUND_DEG | SE_SPLIT_DEG_ROUND_MIN)) 
+    *isec = 0;
 }  /* end split_deg */
 
 double swi_kepler(double E, double M, double ecce)