Changeset 5802 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncantex.cpp (modified) (2 diffs)
• bncmodel.cpp (modified) (5 diffs)
• bncmodel.h (modified) (2 diffs)

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;
 };