Changeset 2429 in ntrip

Timestamp:

Apr 15, 2010, 1:42:35 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/RTCM3/ephemeris.cpp (modified) (2 diffs)
• BNC/bncpppclient.cpp (modified) (1 diff)
• BNS/bns.cpp (modified) (1 diff)
• BNS/bnseph.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -122 +122 @@
     tc += (GPSweek - _GPSweek) * secPerWeek;
   }
-  xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc 
-          - 4.442807633e-10 * _e * sqrt(a0) *sin(E);
+  xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc;
 
   // Velocity
@@ -148 +147 @@
 
   vv[2]  = sini    *doty  + yp*cosi      *doti;
+
+  // Relativistic Correction
+  // -----------------------
+  //  xc(4) -= 4.442807633e-10 * _e * sqrt(a0) *sin(E);
+  xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
 }
 

trunk/BNC/bncpppclient.cpp

@@ -374 +374 @@
         in >> bType >> bValue;
         if      (bType ==  CODETYPEGPS_L1_Z) {
-          bb->p1 = bValue * 0.299792458;
+          bb->p1 = bValue;
         }
         else if (bType ==  CODETYPEGPS_L1_CA) {
-          bb->c1 = bValue * 0.299792458;
+          bb->c1 = bValue;
         }
         else if (bType == CODETYPEGPS_L2_Z) {
-          bb->p2 = bValue * 0.299792458;
+          bb->p2 = bValue;
         }
       }

trunk/BNS/bns.cpp

@@ -426 +426 @@
               xx(5) *= 1e-6;         // rel. corr.
                                      // xx(6), xx(7), xx(8) ... PhaseCent - CoM
-              xx(9)  /= 0.299792458; // xx(9)  ... P1-C1 DCB in ns
-              xx(10) /= 0.299792458; // xx(10) ... P1-P2 DCB in ns
+                                     // xx(9)  ... P1-C1 DCB in meters
+                                     // xx(10) ... P1-P2 DCB in meters
                                      // xx(11) ... dT
               xx(12) *= 1e3;         // x-crd at time + dT

trunk/BNS/bnseph.cpp

@@ -454 +454 @@
     tc += (GPSweek - _GPSweek) * secPerWeek;
   }
-  xc(4) = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc 
-          - 4.442807633e-10 * _e * sqrt(a0) *sin(E);
+  xc(4) = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc;
 
   // Velocity
@@ -480 +479 @@
 
   vv(3)  = sini    *doty  + yp*cosi      *doti;
+
+  // Relativistic Correction
+  // -----------------------
+  //  xc(4) -= 4.442807633e-10 * _e * sqrt(a0) *sin(E);
+  const static double c_vel = 299792458.0;
+  xc(4) -= 2.0 * DotProduct(xc.Rows(1,3),vv) / c_vel / c_vel;
 }