[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kstars/kstars
From:       Jason Harris <kstars () 30doradus ! org>
Date:       2003-04-01 2:25:48
[Download RAW message or body]

CVS commit by harris: 

fixed bug in calculation of positions of Jupiter's moons.  Forgot to 
convert Periodic terms of Longitude to Radians.


  M +12 -6     jupitermoons.cpp   1.4


--- kdeedu/kstars/kstars/jupitermoons.cpp  #1.3:1.4
@@ -114,9 +114,9 @@ void JupiterMoons::findPosition( const K
         
         //Mean anomalies of Jupiter and Saturn
-        Gj = dms(30.23756 + 0.0830925701*t + G*180./dms::PI).radians();
+        Gj = dms(30.23756 + 0.0830925701*t + G/dms::DegToRad).radians();
         Gs = dms(31.97853 + 0.0334597339*t).radians();
         
         //Longitude of perihelion of Jupiter
-        Pj = dms(13.46).radians();
+        Pj = dms(13.469942).radians();
 
         //***Periodic terms in the longitudes of the satellites
@@ -282,4 +282,10 @@ void JupiterMoons::findPosition( const K
                         - 0.00016 * sin( l4 + p3 - 2.*Pj - 2.*Gj );
                          
+        //Convert Longitude Sums to Radians:
+        S1 *= dms::DegToRad;
+        S2 *= dms::DegToRad;
+        S3 *= dms::DegToRad;
+        S4 *= dms::DegToRad;
+        
         L1 = l1 + S1;
         L2 = l2 + S2;
@@ -387,10 +393,10 @@ void JupiterMoons::findPosition( const K
                         
         
-        t = ( num->julianDay() - 2433282.423 ) / 36525.0;
-        
-        //Inclination of Jupiter's rotational axis
+        //Inclination of Jupiter's rotational axis since 1900.0
+        t = ( num->julianDay() - 2415020.50 ) / 36525.0;
         I = dms( 3.120262 +0.0006*t ).radians();
         
         //Precession since B1950:
+        t = ( num->julianDay() - 2433282.423 ) / 36525.0;
         P = dms( 1.3966626*t +0.0003088*t*t ).radians();
         


[prev in list] [next in list] [prev in thread] [next in thread]