Changeset 2583 in ntrip for trunk/BNC/bncmodel.cpp

Timestamp:

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

Author:

mervart

Message:

 

File:

• trunk/BNC/bncmodel.cpp (modified) (7 diffs)

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++) {