Changeset 6213 in ntrip

Timestamp:

Oct 5, 2014, 5:15:25 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• ephemeris.cpp (modified) (10 diffs)
• ephemeris.h (modified) (4 diffs)
• rinex/reqcanalyze.cpp (modified) (2 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -44 +44 @@
   xc.ReSize(4);
   vv.ReSize(3);
-  position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
+  if (position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data()) != success) {
+    return failure;
+  }
   if (useCorr) {
     if (_orbCorr && _clkCorr) {
@@ -128 +130 @@
 // Compute GPS Satellite Position (virtual)
 ////////////////////////////////////////////////////////////////////////////
-void t_ephGPS::position(int GPSweek, double GPSweeks, 
-                        double* xc,
-                        double* vv) const {
-
+t_irc t_ephGPS::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
 
   static const double omegaEarth = 7292115.1467e-11;
@@ -141 +140 @@
   double a0 = _sqrt_A * _sqrt_A;
   if (a0 == 0) {
-    return;
+    return failure;
   }
 
@@ -207 +206 @@
   // -----------------------
   xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
+
+  return success;
 }
 
@@ -248 +249 @@
 // Compute Glonass Satellite Position (virtual)
 ////////////////////////////////////////////////////////////////////////////
-void t_ephGlo::position(int GPSweek, double GPSweeks, 
-                        double* xc, double* vv) const {
+t_irc t_ephGlo::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
 
   static const double nominalStep = 10.0;
@@ -257 +257 @@
 
   double dtPos = bncTime(GPSweek, GPSweeks) - _tt;
+
+  if (fabs(dtPos) > 24*3600.0) {
+    return failure;
+  }
 
   int nSteps  = int(fabs(dtPos) / nominalStep) + 1;
@@ -284 +288 @@
   double dtClk = bncTime(GPSweek, GPSweeks) - _TOC;
   xc[3] = -_tau + _gamma * dtClk;
+
+  return success;
 }
 
@@ -442 +448 @@
 // Compute Galileo Satellite Position (virtual)
 ////////////////////////////////////////////////////////////////////////////
-void t_ephGal::position(int GPSweek, double GPSweeks, 
-                        double* xc,
-                        double* vv) const {
+t_irc t_ephGal::position(int GPSweek, double GPSweeks, double* xc, double* vv) const {
 
   static const double omegaEarth = 7292115.1467e-11;
@@ -454 +458 @@
   double a0 = _sqrt_A * _sqrt_A;
   if (a0 == 0) {
-    return;
+    return failure;
   }
 
@@ -521 +525 @@
   //  xc(4) -= 4.442807633e-10 * _e * sqrt(a0) *sin(E);
   xc[3] -= 2.0 * (xc[0]*vv[0] + xc[1]*vv[1] + xc[2]*vv[2]) / t_CST::c / t_CST::c;
+
+  return success;
 }
 

trunk/BNC/src/ephemeris.h

@@ -41 +41 @@
 
  protected:  
-  virtual void position(int GPSweek, double GPSweeks, double* xc, double* vv) const = 0;
+  virtual t_irc position(int GPSweek, double GPSweeks, double* xc, double* vv) const = 0;
   t_prn      _prn;
   bncTime    _TOC;
@@ -65 +65 @@
 
  private:
-  virtual void position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
+  virtual t_irc position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
 
   double  _clock_bias;      // [s]    
@@ -119 +119 @@
 
  private:
-  virtual void position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
+  virtual t_irc position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
   static ColumnVector glo_deriv(double /* tt */, const ColumnVector& xv, double* acc);
 
@@ -159 +159 @@
 
  private:
-  virtual void position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
+  virtual t_irc position(int GPSweek, double GPSweeks, double* xc, double* vv) const;
 
   double  _clock_bias;       //  [s]    

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -538 +538 @@
             ColumnVector xc(4);
             ColumnVector vv(3);
-            eph->getCrd(bncTime(oneObs->_GPSWeek, oneObs->_GPSWeeks), xc, vv, false);
-          
-            double rho, eleSat, azSat;
-            topos(xyzSta(1), xyzSta(2), xyzSta(3), xc(1), xc(2), xc(3), rho, eleSat, azSat);
-          
-            aziDeg = azSat * 180.0/M_PI;
-            zenDeg = 90.0 - eleSat * 180.0/M_PI;
-            zenFlag = true;
+            if (eph->getCrd(bncTime(oneObs->_GPSWeek, oneObs->_GPSWeeks), xc, vv, false) == success) {
+              double rho, eleSat, azSat;
+              topos(xyzSta(1), xyzSta(2), xyzSta(3), xc(1), xc(2), xc(3), rho, eleSat, azSat);
+              aziDeg = azSat * 180.0/M_PI;
+              zenDeg = 90.0 - eleSat * 180.0/M_PI;
+              zenFlag = true;
+            }
           }
         }
@@ -742 +741 @@
     }
     if (eph) {
-      ++nSatUsed;
       ColumnVector xSat(4);
       ColumnVector vv(3);
-      eph->getCrd(_currEpo->tt, xSat, vv, false);
-      ColumnVector dx = xSat.Rows(1,3) - xyzSta;
-      double rho = dx.norm_Frobenius();
-      AA(nSatUsed,1) = dx(1) / rho;
-      AA(nSatUsed,2) = dx(2) / rho;
-      AA(nSatUsed,3) = dx(3) / rho;
-      AA(nSatUsed,4) = 1.0;
+      if (eph->getCrd(_currEpo->tt, xSat, vv, false) == success) {
+        ++nSatUsed;
+        ColumnVector dx = xSat.Rows(1,3) - xyzSta;
+        double rho = dx.norm_Frobenius();
+        AA(nSatUsed,1) = dx(1) / rho;
+        AA(nSatUsed,2) = dx(2) / rho;
+        AA(nSatUsed,3) = dx(3) / rho;
+        AA(nSatUsed,4) = 1.0;
+      }
     }
   }