Changeset 5802 in ntrip

Timestamp:

Aug 6, 2014, 10:35:19 AM (8 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (4 diffs)
• PPP/pppClient.h (modified) (2 diffs)
• PPP/pppModel.cpp (modified) (1 diff)
• PPP/pppModel.h (modified) (1 diff)
• PPP/windup.cpp (modified) (1 diff)
• PPP/windup.h (deleted)
• bncantex.cpp (modified) (2 diffs)
• bncmodel.cpp (modified) (5 diffs)
• bncmodel.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -55 +55 @@
 #include "bncutils.h"
 #include "station.h"
-#include "bnctides.h"
 #include "bncantex.h"
 #include "filter.h"
@@ -82 +81 @@
   _staRover = new t_station();
   _filter   = new t_filter();
+  _tides    = new t_tides();
 
   if (!_opt->_antexFile.empty()) {
@@ -103 +103 @@
   delete _antex;
   delete _filter;
+  delete _tides;
   clearObs();
 }
@@ -379 +380 @@
   // Tides
   // -----
-  ColumnVector hlp = station->xyzApr();
-  tides(time, hlp);
-  station->setTideDspl(hlp - station->xyzApr());
+  station->setTideDspl( _tides->displacement(time, station->xyzApr()) );
   
   // Observation model

trunk/BNC/src/PPP/pppClient.h

@@ -7 +7 @@
 #include "ephemeris.h"
 #include "options.h"
+#include "pppModel.h"
 
 class bncAntex;
@@ -65 +66 @@
   std::ostringstream*    _log; 
   t_options*             _opt; 
+  t_tides*               _tides;
 };
 

trunk/BNC/src/PPP/pppModel.cpp

@@ -208 +208 @@
   return dX;
 }
+
+// Constructor
+///////////////////////////////////////////////////////////////////////////
+t_windUp::t_windUp() {
+  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
+    sumWind[ii]   = 0.0;
+    lastEtime[ii] = 0.0;
+  }
+}
+
+// Phase Wind-Up Correction
+///////////////////////////////////////////////////////////////////////////
+double t_windUp::value(const bncTime& etime, const ColumnVector& rRec, 
+                       t_prn prn, const ColumnVector& rSat) {
+
+  if (etime.mjddec() != lastEtime[prn.toInt()]) {
+
+    // Unit Vector GPS Satellite --> Receiver
+    // --------------------------------------
+    ColumnVector rho = rRec - rSat;
+    rho /= rho.norm_Frobenius();
+    
+    // GPS Satellite unit Vectors sz, sy, sx
+    // -------------------------------------
+    ColumnVector sz = -rSat / rSat.norm_Frobenius();
+
+    ColumnVector xSun = Sun(etime.mjddec());
+    xSun /= xSun.norm_Frobenius();
+
+    ColumnVector sy = crossproduct(sz, xSun);
+    ColumnVector sx = crossproduct(sy, sz);
+
+    // Effective Dipole of the GPS Satellite Antenna
+    // ---------------------------------------------
+    ColumnVector dipSat = sx - rho * DotProduct(rho,sx) 
+                                                - crossproduct(rho, sy);
+    
+    // Receiver unit Vectors rx, ry
+    // ----------------------------
+    ColumnVector rx(3);
+    ColumnVector ry(3);
+
+    double recEll[3]; xyz2ell(rRec.data(), recEll) ;
+    double neu[3];
+    
+    neu[0] = 1.0;
+    neu[1] = 0.0;
+    neu[2] = 0.0;
+    neu2xyz(recEll, neu, rx.data());
+    
+    neu[0] =  0.0;
+    neu[1] = -1.0;
+    neu[2] =  0.0;
+    neu2xyz(recEll, neu, ry.data());
+    
+    // Effective Dipole of the Receiver Antenna
+    // ----------------------------------------
+    ColumnVector dipRec = rx - rho * DotProduct(rho,rx) 
+                                                   + crossproduct(rho, ry);
+    
+    // Resulting Effect
+    // ----------------
+    double alpha = DotProduct(dipSat,dipRec) / 
+                      (dipSat.norm_Frobenius() * dipRec.norm_Frobenius());
+    
+    if (alpha >  1.0) alpha =  1.0;
+    if (alpha < -1.0) alpha = -1.0;
+    
+    double dphi = acos(alpha) / 2.0 / M_PI;  // in cycles
+    
+    if ( DotProduct(rho, crossproduct(dipSat, dipRec)) < 0.0 ) {
+      dphi = -dphi;
+    }
+
+    if (lastEtime[prn.toInt()] == 0.0) {
+      sumWind[prn.toInt()] = dphi;
+    }
+    else {
+      sumWind[prn.toInt()] = nint(sumWind[prn.toInt()] - dphi) + dphi;
+    }
+
+    lastEtime[prn.toInt()] = etime.mjddec();
+  }
+
+  return sumWind[prn.toInt()];  
+}

trunk/BNC/src/PPP/pppModel.h

@@ -39 +39 @@
 };
 
+class t_windUp {
+ public:
+  t_windUp();
+  ~t_windUp() {};
+  double value(const bncTime& etime, const ColumnVector& rRec, t_prn prn,
+               const ColumnVector& rSat);
+ private:
+  double lastEtime[t_prn::MAXPRN+1];
+  double sumWind[t_prn::MAXPRN+1];
+};
+
 #endif

trunk/BNC/src/PPP/windup.cpp

@@ -5 +5 @@
 #include "windup.h"
 #include "bncutils.h"
-#include "bnctides.h"
 
 using namespace std;

trunk/BNC/src/bncantex.cpp

@@ -43 +43 @@
 
 #include "bncantex.h"
-#include "bnctides.h"
+#include "PPP/pppModel.h"
 
 using namespace std;
@@ -236 +236 @@
     sz /= sqrt(DotProduct(sz,sz));
 
-    ColumnVector xSun = Sun(Mjd);
+    ColumnVector xSun = t_astro::Sun(Mjd);
     xSun /= sqrt(DotProduct(xSun,xSun));
   

trunk/BNC/src/bncmodel.cpp

@@ -50 +50 @@
 #include "bancroft.h"
 #include "bncutils.h"
-#include "bnctides.h"
+#include "PPP/pppModel.h"
 #include "bncantex.h"
 #include "pppopt.h"
@@ -187 +187 @@
   }
 
+  _tides = new t_tides;
+
   // Bancroft Coordinates
   // --------------------
@@ -213 +215 @@
   }
   delete _epoData_sav;
+  delete _tides;
 }
 
@@ -338 +341 @@
   xRec(3) = z();
 
-  tides(_time, xRec);
+  xRec += _tides->displacement(_time, xRec);
 
   satData->rho = (satData->xx - xRec).norm_Frobenius();
@@ -980 +983 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = Sun(Mjd);
+    ColumnVector xSun = t_astro::Sun(Mjd);
     xSun /= xSun.norm_Frobenius();
 

trunk/BNC/src/bncmodel.h

@@ -38 +38 @@
 class t_pppOpt;
 class bncPPPclient;
+class t_tides;
 
 class bncParam {
@@ -164 +165 @@
   QStringList           _outlierGlo;
   bncAntex*             _antex;
+  t_tides*              _tides;
 };