Changeset 6060 in ntrip for trunk/BNC/src/PPP_free

Timestamp:

Sep 7, 2014, 9:17:24 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncmodel.cpp (modified) (6 diffs)
• bncmodel.h (modified) (2 diffs)

trunk/BNC/src/PPP_free/bncmodel.cpp

@@ -52 +52 @@
 #include "bncantex.h"
 #include "pppOptions.h"
+#include "pppModel.h"
 
 using namespace BNC_PPP;
@@ -156 +157 @@
   _opt       = pppClient->opt();
 
+  _tides     = new t_tides();
+
   // Antenna Name, ANTEX File
   // ------------------------
   _antex = 0;
-  if (!_opt->antexFile.isEmpty()) {
-    _antex = new bncAntex();
-    if (_antex->readFile(_opt->antexFile) != success) {
-      _pppClient->emitNewMessage("wrong ANTEX file", true);
-      delete _antex;
-      _antex = 0;
-    }
+  if (!_opt->_antexFileName.empty()) {
+    _antex = new bncAntex(_opt->_antexFileName.c_str());
   }
 
@@ -181 +179 @@
 ////////////////////////////////////////////////////////////////////////////
 bncModel::~bncModel() {
+  delete _tides;
   for (int ii = 0; ii < _posAverage.size(); ++ii) { 
     delete _posAverage[ii]; 
@@ -215 +214 @@
   _params.push_back(new bncParam(bncParam::CRD_Z,  ++nextPar, ""));
   _params.push_back(new bncParam(bncParam::RECCLK, ++nextPar, ""));
-  if (_opt->estTropo) {
+  if (_opt->estTrp()) {
     _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, ""));
   }
-  if (_opt->useGlonass) {
+  if (_opt->useSystem('R')) {
     _params.push_back(new bncParam(bncParam::GLONASS_OFFSET, ++nextPar, ""));
   }
-  if (_opt->useGalileo) {
+  if (_opt->useSystem('E')) {
     _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, ""));
   }
@@ -231 +230 @@
     pp->xx = 0.0;
     if      (pp->isCrd()) {
-      _QQ(iPar,iPar) = _opt->sigCrd0 * _opt->sigCrd0; 
+      _QQ(iPar,iPar) = _opt->_aprSigCrd(1) * _opt->_aprSigCrd(1); 
     }
     else if (pp->type == bncParam::RECCLK) {
-      _QQ(iPar,iPar) = _opt->sigClk0 * _opt->sigClk0; 
+      _QQ(iPar,iPar) = _opt->_noiseClk * _opt->_noiseClk; 
     }
     else if (pp->type == bncParam::TROPO) {
-      _QQ(iPar,iPar) = _opt->sigTrp0 * _opt->sigTrp0; 
+      _QQ(iPar,iPar) = _opt->_aprSigTrp * _opt->_aprSigTrp; 
       pp->xx = lastTrp;
     }
     else if (pp->type == bncParam::GLONASS_OFFSET) {
-      _QQ(iPar,iPar) = _opt->sigGlonassOffset0 * _opt->sigGlonassOffset0; 
+      _QQ(iPar,iPar) = 1000.0 * 1000.0;
     }
     else if (pp->type == bncParam::GALILEO_OFFSET) {
-      _QQ(iPar,iPar) = _opt->sigGalileoOffset0 * _opt->sigGalileoOffset0; 
+      _QQ(iPar,iPar) = 1000.0 * 1000.0;
     }
   }
@@ -317 +316 @@
   xRec(3) = z();
 
-  tides(_time, xRec);
+  xRec += _tides->displacement(_time, xRec);
 
   satData->rho = (satData->xx - xRec).norm_Frobenius();

trunk/BNC/src/PPP_free/bncmodel.h

@@ -41 +41 @@
 class t_epoData;
 class t_satData;
+class t_tides;
 
 class bncParam {
@@ -163 +164 @@
   QStringList           _outlierGlo;
   bncAntex*             _antex;
+  t_tides*              _tides;
 };