Changeset 8541 in ntrip

Timestamp:

Nov 15, 2018, 11:14:49 AM (5 years ago)

Author:

stuerze

Message:

minor changes to consider a satellite clock drift that is introduced via RTNET format

Location:

branches/BNC_2.12/src

Files:

• PPP/pppSatObs.cpp (modified) (2 diffs)
• PPP_SSR_I/pppClient.cpp (modified) (1 diff)
• RTCM/rtcm_utils.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (1 diff)
• combination/bnccomb.cpp (modified) (3 diffs)
• ephemeris.cpp (modified) (12 diffs)
• rinex/reqcanalyze.cpp (modified) (3 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (8 diffs)
• upload/bncrtnetuploadcaster.h (modified) (1 diff)

branches/BNC_2.12/src/PPP/pppSatObs.cpp

@@ -62 +62 @@
   // ------------------------------------------
   const string preferredAttrib = "CWPXI_";
+  //const string preferredAttrib = "G:12&PWCSLXYN G:5&IQX R:12&PC R:3&IQX E:16&BCX E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:IQX I:ABCX S:1&C S:5&IQX";
 
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
@@ -106 +107 @@
   // Compute Satellite Coordinates at Time of Transmission
   // -----------------------------------------------------
-  _xcSat.ReSize(7); _xcSat = 0.0;
+  _xcSat.ReSize(6); _xcSat = 0.0;
   _vvSat.ReSize(3); _vvSat = 0.0;
   bool totOK  = false;
-  ColumnVector satPosOld(7); satPosOld = 0.0;
+  ColumnVector satPosOld(6); satPosOld = 0.0;
   t_lc::type tLC = isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
   double prange = obsValue(tLC);

branches/BNC_2.12/src/PPP_SSR_I/pppClient.cpp

@@ -408 +408 @@
     bncTime ToT = satData->tt - prange / t_CST::c - clkSat;
 
-    ColumnVector xc(7);
+    ColumnVector xc(6);
     ColumnVector vv(3);
     if (getSatPos(ToT, satData->prn, xc, vv) != success) {

branches/BNC_2.12/src/RTCM/rtcm_utils.cpp

@@ -35 +35 @@
   // --------------
   rho = 0.0;
-  ColumnVector xc(7);
+  ColumnVector xc(6);
   ColumnVector vv(3);
   eph->getCrd(bncTime(GPSWeek, GPSWeeks), xc, vv, false);

branches/BNC_2.12/src/bncephuser.cpp

@@ -189 +189 @@
   // Simple Check - check satellite radial distance
   // ----------------------------------------------
-  ColumnVector xc(7);
+  ColumnVector xc(6);
   ColumnVector vv(3);
   if (eph->getCrd(eph->TOC(), xc, vv, false) != success) {

branches/BNC_2.12/src/combination/bnccomb.cpp

@@ -449 +449 @@
   }
 
-  ColumnVector oldXC(7);
+  ColumnVector oldXC(6);
   ColumnVector oldVV(3);
   corr->_eph->getCrd(corr->_time, oldXC, oldVV, false);
 
-  ColumnVector newXC(7);
+  ColumnVector newXC(6);
   ColumnVector newVV(3);
   lastEph->getCrd(corr->_time, newXC, newVV, false);
@@ -688 +688 @@
     const t_eph* eph = corr->_eph;
     if (eph) {
-      ColumnVector xc(7);
+      ColumnVector xc(6);
       ColumnVector vv(3);
       eph->getCrd(_resTime, xc, vv, false);
@@ -740 +740 @@
     clkCorrections.push_back(clkCorr);
 
-    ColumnVector xc(7);
+    ColumnVector xc(6);
     ColumnVector vv(3);
     corr->_eph->setClkCorr(dynamic_cast<const t_clkCorr*>(&clkCorr));

branches/BNC_2.12/src/ephemeris.cpp

@@ -65 +65 @@
                                                  << 900 << 1800 << 3600 << 7200
                                                  << 10800;
-  xc.ReSize(7);
+  xc.ReSize(6);
   vv.ReSize(3);
   if (position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data()) != success) {
@@ -320 +320 @@
   static const double gmGRS      = 398.6005e12;
 
-  memset(xc, 0, 7*sizeof(double));
+  memset(xc, 0, 6*sizeof(double));
   memset(vv, 0, 3*sizeof(double));
 
@@ -368 +368 @@
   double tc = tt - _TOC;
   xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc;
-
-  xc[4] = _clock_bias;
-  xc[5] = _clock_drift;
-  xc[6] = _clock_driftrate;
 
   // Velocity
@@ -402 +398 @@
   xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
 
+  xc[4] = _clock_drift + _clock_driftrate*tc;
+  xc[5] = _clock_driftrate;
+
   return success;
 }
@@ -618 +617 @@
   static const double nominalStep = 10.0;
 
-  memset(xc, 0, 7*sizeof(double));
+  memset(xc, 0, 6*sizeof(double));
   memset(vv, 0, 3*sizeof(double));
 
@@ -655 +654 @@
   xc[3] = -_tau + _gamma * dtClk;
 
-  xc[4] = -_tau;
-  xc[5] = _gamma;
-  xc[6] = 0.0;
+  xc[4] = _gamma;
+  xc[5] = 0.0;
 
   return success;
@@ -922 +920 @@
   static const double gmWGS = 398.6004418e12;
 
-  memset(xc, 0, 7*sizeof(double));
+  memset(xc, 0, 6*sizeof(double));
   memset(vv, 0, 3*sizeof(double));
 
@@ -970 +968 @@
   double tc = tt - _TOC;
   xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc;
-
-  xc[4] = _clock_bias;
-  xc[5] = _clock_drift;
-  xc[6] = _clock_driftrate;
 
   // Velocity
@@ -1006 +1000 @@
   //xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
 
+  xc[4] = _clock_drift + _clock_driftrate*tc;
+  xc[5] = _clock_driftrate;
+
   return success;
 }
@@ -1317 +1314 @@
   xc[3] = _agf0 + _agf1 * dt;
 
-  xc[4] = _agf0;
-  xc[5] = _agf1;
-  xc[6] = 0.0;
+  xc[4] = _agf1;
+  xc[5] = 0.0;
 
   return success;
@@ -1698 +1694 @@
   xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc;
 
-  xc[4] = _clock_bias;
-  xc[5] = _clock_drift;
-  xc[6] = _clock_driftrate;
-
   // dotC  = _clock_drift + _clock_driftrate*tc
   //       - 4.442807633e-10*_e*sqrt(a0)*cos(E) * dEdM * n;
@@ -1708 +1700 @@
   // -----------------------
   // correspondent to BDS ICD and to SSR standard
-    xc[3] -= 4.442807633e-10 * _e * sqrt(a0) *sin(E);
+  xc[3] -= 4.442807633e-10 * _e * sqrt(a0) *sin(E);
   // correspondent to IGS convention
   // xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
+
+  xc[4] = _clock_drift + _clock_driftrate*tc;
+  xc[5] = _clock_driftrate;
 
   return success;

branches/BNC_2.12/src/rinex/reqcanalyze.cpp

@@ -288 +288 @@
     }
     if (eph) {
-      ColumnVector xSat(7);
+      ColumnVector xSat(6);
       ColumnVector vv(3);
       if (eph->getCrd(_currEpo->tt, xSat, vv, false) == success) {
@@ -351 +351 @@
   }
   if (eph) {
-    ColumnVector xc(7);
+    ColumnVector xc(6);
     ColumnVector vv(3);
     if ( xyzSta.size() == 3 && (xyzSta[0] != 0.0 || xyzSta[1] != 0.0 || xyzSta[2] != 0.0) &&
@@ -1101 +1101 @@
       for (epoTime = startTime - interval; epoTime < endTime;
            epoTime = epoTime + interval) {
-        ColumnVector xc(7);
+        ColumnVector xc(6);
         ColumnVector vv(3);
         if ( xyzSta.size() == 3 && (xyzSta[0] != 0.0 || xyzSta[1] != 0.0 || xyzSta[2] != 0.0) &&

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.cpp

@@ -337 +337 @@
     ColumnVector rtnClkSig; // [m, m/s, m/s²]
     t_prn prn;
-
+    
     QTextStream in(lines[ii].toAscii());
 
@@ -373 +373 @@
     int number = key.mid(1, 2).toInt();
     int flags = 0;
+
     if (sys == 'E') { // I/NAV
       flags = 1;
@@ -503 +504 @@
         }
         else {
-          in >> numVal;
-          for (int ii = 0; ii < numVal; ii++) {
-            double dummy;
-            in >> dummy;
-          }
+          emit(newMessage("                      RTNET format error: "
+                          +  lines[ii].toAscii(), false));
+          qDebug() << "bncRtnetUploadCaster: decode " + QByteArray(epoTime.datestr().c_str())
+                      + " " + QByteArray(epoTime.timestr().c_str()) + " "
+                      + _casterID.toAscii();
+          qDebug() << "                      RTNET format error: " + lines[ii].toAscii();
         }
       }
@@ -544 +546 @@
       if (sd) {
         QString outLine;
-        processSatellite(eph, epoTime.gpsw(), epoTime.gpssec(), prnStr, rtnAPC, rtnUra,
-            rtnClk, rtnVel, rtnCoM, rtnClkSig, sd, outLine);
+        t_irc irc = processSatellite(eph, epoTime.gpsw(), epoTime.gpssec(), prnStr, rtnAPC,
+                                     rtnUra, rtnClk, rtnVel, rtnCoM, rtnClkSig, sd, outLine);
+        if (irc != success) {
+          continue;
+        }
       }
 
@@ -2259 +2264 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void bncRtnetUploadCaster::processSatellite(const t_eph* eph, int GPSweek,
+t_irc bncRtnetUploadCaster::processSatellite(const t_eph* eph, int GPSweek,
     double GPSweeks, const QString& prn, const ColumnVector& rtnAPC,
     double rtnUra, const ColumnVector& rtnClk, const ColumnVector& rtnVel,
@@ -2267 +2272 @@
   // Broadcast Position and Velocity
   // -------------------------------
-  ColumnVector xB(7);
+  ColumnVector xB(6);
   ColumnVector vB(3);
-  eph->getCrd(bncTime(GPSweek, GPSweeks), xB, vB, false);
+  t_irc irc = eph->getCrd(bncTime(GPSweek, GPSweeks), xB, vB, false);
+
+  if (irc != success) {
+    return irc;
+  }
 
   // Precise Position
   // ----------------
   ColumnVector xP = _CoM ? rtnCoM : rtnAPC;
+
+  if (xP.size() == 0) {
+    return failure;
+  }
 
   double dc = 0.0;
@@ -2296 +2309 @@
   // ----------------
   double dClkA0 = rtnClk(1) - (xB(4) - dc) * t_CST::c;
-  double dClkA1 = 0.0;
-  double dClkA2 = 0.0;
-  if (rtnClk(2)) {
-    dClkA0 = rtnClk(1) - (xB(5) - dc) * t_CST::c;
-    dClkA1 = rtnClk(2) -  xB(6) * t_CST::c;
-  }
-  if (rtnClk(3)) {
-    dClkA2 = rtnClk(3) - xB(7) * t_CST::c;
-  }
+  double dClkA1 = rtnClk(2) -  xB(5) * t_CST::c;
+  double dClkA2 = rtnClk(3) -  xB(6) * t_CST::c;
 
   if (sd) {
@@ -2358 +2364 @@
     _sp3->write(GPSweek, GPSweeks, prn, rtnCoM, clkRnx, rtnVel, clkRnxRate);
   }
+  return success;
 }
 

branches/BNC_2.12/src/upload/bncrtnetuploadcaster.h

@@ -29 +29 @@
   virtual ~bncRtnetUploadCaster();
  private:
-  void processSatellite(const t_eph* eph, int GPSweek,
+  t_irc processSatellite(const t_eph* eph, int GPSweek,
                         double GPSweeks, const QString& prn,
                         const ColumnVector& rtnAPC,