Changeset 2065 in ntrip

Timestamp:

Dec 1, 2009, 2:13:03 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bncmodel.cpp

@@ -183 +183 @@
   satData->rho = (satData->xx - xRec).norm_Frobenius();
 
-  double tropDelay = delay_saast();
+  double tropDelay = delay_saast(satData->eleSat);
 
   cout << "tropDelay " << tropDelay << endl;
@@ -192 +192 @@
 // Tropospheric Model (Saastamoinen)
 ////////////////////////////////////////////////////////////////////////////
-double bncModel::delay_saast() {
+double bncModel::delay_saast(double Ele) {
 
   double height = _ellBanc(3);
-  double Ele = M_PI/2.0;
 
   double pp =  1013.25 * pow(1.0 - 2.26e-5 * height, 5.225);

trunk/BNC/bncmodel.h

@@ -55 +55 @@
  private:
   double cmpValueP3(t_satData* satData);
-  double delay_saast();
+  double delay_saast(double Ele);
 
   QList<bncParam*> _params;

trunk/BNC/bncpppclient.h

@@ -52 +52 @@
   double       clk;
   bool         clkCorr;
+  double       eleSat;
+  double       azSat;
   double       rho;
 };

trunk/BNC/bncutils.cpp

@@ -222 +222 @@
   return failure;
 }
+
+// Rectangular Coordinates -> North, East, Up Components
+////////////////////////////////////////////////////////////////////////////
+void xyz2neu(const double* Ell, const double* xyz, double* neu) {
+
+  double sinPhi = sin(Ell[0]);
+  double cosPhi = cos(Ell[0]);
+  double sinLam = sin(Ell[1]);
+  double cosLam = cos(Ell[1]);
+
+  neu[0] = - sinPhi*cosLam * xyz[0]
+           - sinPhi*sinLam * xyz[1]
+           + cosPhi        * xyz[2];
+
+  neu[1] = - sinLam * xyz[0]
+           + cosLam * xyz[1];
+
+  neu[2] = + cosPhi*cosLam * xyz[0]
+           + cosPhi*sinLam * xyz[1]
+           + sinPhi        * xyz[2];
+}

trunk/BNC/bncutils.h

@@ -49 +49 @@
 t_irc xyz2ell(const double* XYZ, double* Ell);
 
+void xyz2neu(const double* Ell, const double* xyz, double* neu);
+
 #endif