Changeset 8619 in ntrip for trunk/BNC/src/PPP

Timestamp:

Feb 28, 2019, 2:49:35 PM (6 years ago)

Author:

stuerze

Message:

special ssr wind up computation is added

Location:

trunk/BNC/src/PPP

Files:

• pppSatObs.cpp (modified) (7 diffs)
• pppSatObs.h (modified) (2 diffs)
• pppStation.cpp (modified) (4 diffs)
• pppStation.h (modified) (1 diff)

trunk/BNC/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);
@@ -328 +329 @@
   _model._rho = rhoV.norm_Frobenius();
 
+  ColumnVector vSat = _vvSat;
+
   ColumnVector neu(3);
   xyz2neu(station->ellApr().data(), rhoV.data(), neu.data());
@@ -371 +374 @@
   // ------------------
   _model._tropo = t_tropo::delay_saast(station->xyzApr(), _model._eleSat);
-
-  // Phase Wind-Up
-  // -------------
-  _model._windUp = station->windUp(_time, _prn, rSat);
 
   // Code Biases
@@ -393 +392 @@
   // Phase Biases
   // -----------
-  // TODO: consideration of fix indicators, yaw angle and jump counter
+  // TODO: consideration of fix indicators and jump counter
   const t_satPhaseBias* satPhaseBias = PPP_CLIENT->obsPool()->satPhaseBias(_prn);
+  double yaw = 0.0;
+  bool ssr = false;
   if (satPhaseBias) {
+    yaw = satPhaseBias->_yaw;
+    ssr = true;
     for (unsigned ii = 0; ii < satPhaseBias->_bias.size(); ii++) {
       const t_frqPhaseBias& bias = satPhaseBias->_bias[ii];
@@ -407 +410 @@
   }
 
+  // Phase Wind-Up
+  // -------------
+  _model._windUp = station->windUp(_time, _prn, rSat, ssr, yaw, vSat) ;
+
+
   // Tidal Correction
   // ----------------
@@ -428 +436 @@
     }
   }
+
+  // Relativistic effect due to earth gravity
+  // ----------------------------------------
+  // TODO
 
   // Ocean Loading

trunk/BNC/src/PPP/pppSatObs.h

@@ -90 +90 @@
       _tide    = 0.0;
       _windUp  = 0.0;
+      _rel    = 0.0;
       for (unsigned ii = 0; ii < t_frequency::max; ii++) {
         _antPCO[ii]        = 0.0;
@@ -108 +109 @@
     double _tide;
     double _windUp;
+    double _rel;
     double _antPCO[t_frequency::max];
     double _codeBias[t_frequency::max];

trunk/BNC/src/PPP/pppStation.cpp

@@ -11 +11 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -37 +37 @@
 }
 
-// 
+//
 //////////////////////////////////////////////////////////////////////////////
 void t_pppStation::setXyzApr(const ColumnVector& xyzApr) {
@@ -45 +45 @@
 }
 
-// 
+//
 //////////////////////////////////////////////////////////////////////////////
 void t_pppStation::setNeuEcc(const ColumnVector& neuEcc) {
@@ -53 +53 @@
 }
 
-// 
+//
 //////////////////////////////////////////////////////////////////////////////
-double t_pppStation::windUp(const bncTime& time, t_prn prn, 
-                         const ColumnVector& rSat) const {
-  return _windUp->value(time, _xyzApr, prn, rSat);
+double t_pppStation::windUp(const bncTime& time, t_prn prn,
+                         const ColumnVector& rSat, bool ssr, double yaw,
+                         const ColumnVector& vSat) const {
+  return _windUp->value(time, _xyzApr, prn, rSat, ssr, yaw, vSat);
 }
 

trunk/BNC/src/PPP/pppStation.h

@@ -31 +31 @@
   const ColumnVector& tideDspl()  const {return _tideDspl;}
   double dClk() const {return _dClk;}
-  double windUp(const bncTime& time, t_prn prn, const ColumnVector& rSat) const;
+  double windUp(const bncTime& time, t_prn prn, const ColumnVector& rSat, bool ssr,
+                double yaw, const ColumnVector& vSat) const;
   double stec(const t_vTec* vTec, const double signalPropagationTime, const ColumnVector& rSat) const;