Changeset 2583 in ntrip

Timestamp:

Aug 29, 2010, 4:23:27 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (7 diffs)
• bncmodel.h (modified) (1 diff)
• bncpppclient.cpp (modified) (1 diff)
• bncpppclient.h (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -309 +309 @@
 // Computed Value
 ////////////////////////////////////////////////////////////////////////////
-double bncModel::cmpValue(t_satData* satData) {
+double bncModel::cmpValue(t_satData* satData, bool phase) {
 
   ColumnVector xRec(3);
@@ -330 +330 @@
                      trp() / sin(satData->eleSat);
 
-  return satData->rho + clk() - satData->clk + tropDelay;
+  double wind = 0.0;
+  if (phase) {
+    wind = windUp(satData->prn, satData->xx, xRec) * satData->lambda3;
+  }
+
+  return satData->rho + clk() - satData->clk + tropDelay + wind;
 }
 
@@ -467 +472 @@
         bncParam* par = new bncParam(bncParam::AMB_L3, _params.size()+1, prn);
         _params.push_back(par);
-        par->xx = satData->L3 - cmpValue(satData);
+        par->xx = satData->L3 - cmpValue(satData, true);
       }
     }
@@ -487 +492 @@
         bncParam* par = new bncParam(bncParam::AMB_L3, _params.size()+1, prn);
         _params.push_back(par);
-        par->xx = satData->L3 - cmpValue(satData);
+        par->xx = satData->L3 - cmpValue(satData, true);
       }
     }
@@ -595 +600 @@
       t_satData* satData = itGPS.value();
     
-      double rhoCmp = cmpValue(satData);
-    
-      ll(iObs)      = satData->P3 - rhoCmp;
+      ll(iObs)      = satData->P3 - cmpValue(satData, false);
       PP(iObs,iObs) = 1.0 / (sig_P3 * sig_P3);
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -605 +608 @@
       if (_usePhase) {
         ++iObs;
-        ll(iObs)      = satData->L3 - rhoCmp;
+        ll(iObs)      = satData->L3 - cmpValue(satData, true);
         PP(iObs,iObs) = 1.0 / (sig_L3_GPS * sig_L3_GPS);
         for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -627 +630 @@
         t_satData* satData = itGlo.value();
 
-        double rhoCmp = cmpValue(satData);
-        
-        ll(iObs)      = satData->L3 - rhoCmp;
-
+        ll(iObs)      = satData->L3 - cmpValue(satData, true);
         PP(iObs,iObs) = 1.0 / (sig_L3_GLO * sig_L3_GLO);
         for (int iPar = 1; iPar <= _params.size(); iPar++) {

trunk/BNC/bncmodel.h

@@ -79 +79 @@
 
  private:
-  double cmpValue(t_satData* satData);
+  double cmpValue(t_satData* satData, bool phase);
   double delay_saast(double Ele);
   void   predict(t_epoData* epoData);

trunk/BNC/bncpppclient.cpp

@@ -219 +219 @@
   satData->L3 =  c1 * satData->L1 + c2 * satData->L2;
 
+  // Set Ionosphere-Free Wavelength
+  // ------------------------------
+  satData->lambda3 = c1 * t_CST::c / f1 + c2 * t_CST::c / f2;
+
   // Add new Satellite to the epoch
   // ------------------------------

trunk/BNC/bncpppclient.h

@@ -56 +56 @@
   double       rho;
   bool         slipFlag;
+  double       lambda3;
 };