Changeset 5815 in ntrip for trunk/BNC/src/bncmodel.cpp

Timestamp:

Aug 6, 2014, 12:06:58 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncmodel.cpp (modified) (5 diffs)

trunk/BNC/src/bncmodel.cpp

@@ -54 +54 @@
 #include "pppopt.h"
 
-using namespace BNC;
 using namespace std;
 
@@ -188 +187 @@
   }
 
-  _tides = new t_tides;
+  _tides = new BNC_PPP::t_tides;
 
   // Bancroft Coordinates
@@ -346 +345 @@
   satData->rho = (satData->xx - xRec).norm_Frobenius();
 
-  double tropDelay = t_tropo::delay_saast(xRec, satData->eleSat) + 
+  double tropDelay = BNC_PPP::t_tropo::delay_saast(xRec, satData->eleSat) + 
                      trp() / sin(satData->eleSat);
 
@@ -613 +612 @@
     else if (par->type == bncParam::TROPO) {
       ColumnVector xyz(3); xyz(1) = x(); xyz(2) = y(); xyz(3) = z();
-      double aprTrp = t_tropo::delay_saast(xyz, M_PI/2.0);
+      double aprTrp = BNC_PPP::t_tropo::delay_saast(xyz, M_PI/2.0);
       strB << "\n    trp     = " << par->prn.toAscii().data()
            << setw(7) << setprecision(3) << aprTrp << " "
@@ -894 +893 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = t_astro::Sun(Mjd);
+    ColumnVector xSun = BNC_PPP::t_astro::Sun(Mjd);
     xSun /= xSun.norm_Frobenius();