Changeset 6060 in ntrip


Ignore:
Timestamp:
Sep 7, 2014, 9:17:24 AM (7 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/PPP_free
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP_free/bncmodel.cpp

    r6059 r6060  
    5252#include "bncantex.h"
    5353#include "pppOptions.h"
     54#include "pppModel.h"
    5455
    5556using namespace BNC_PPP;
     
    156157  _opt       = pppClient->opt();
    157158
     159  _tides     = new t_tides();
     160
    158161  // Antenna Name, ANTEX File
    159162  // ------------------------
    160163  _antex = 0;
    161   if (!_opt->antexFile.isEmpty()) {
    162     _antex = new bncAntex();
    163     if (_antex->readFile(_opt->antexFile) != success) {
    164       _pppClient->emitNewMessage("wrong ANTEX file", true);
    165       delete _antex;
    166       _antex = 0;
    167     }
     164  if (!_opt->_antexFileName.empty()) {
     165    _antex = new bncAntex(_opt->_antexFileName.c_str());
    168166  }
    169167
     
    181179////////////////////////////////////////////////////////////////////////////
    182180bncModel::~bncModel() {
     181  delete _tides;
    183182  for (int ii = 0; ii < _posAverage.size(); ++ii) {
    184183    delete _posAverage[ii];
     
    215214  _params.push_back(new bncParam(bncParam::CRD_Z,  ++nextPar, ""));
    216215  _params.push_back(new bncParam(bncParam::RECCLK, ++nextPar, ""));
    217   if (_opt->estTropo) {
     216  if (_opt->estTrp()) {
    218217    _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, ""));
    219218  }
    220   if (_opt->useGlonass) {
     219  if (_opt->useSystem('R')) {
    221220    _params.push_back(new bncParam(bncParam::GLONASS_OFFSET, ++nextPar, ""));
    222221  }
    223   if (_opt->useGalileo) {
     222  if (_opt->useSystem('E')) {
    224223    _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, ""));
    225224  }
     
    231230    pp->xx = 0.0;
    232231    if      (pp->isCrd()) {
    233       _QQ(iPar,iPar) = _opt->sigCrd0 * _opt->sigCrd0;
     232      _QQ(iPar,iPar) = _opt->_aprSigCrd(1) * _opt->_aprSigCrd(1);
    234233    }
    235234    else if (pp->type == bncParam::RECCLK) {
    236       _QQ(iPar,iPar) = _opt->sigClk0 * _opt->sigClk0;
     235      _QQ(iPar,iPar) = _opt->_noiseClk * _opt->_noiseClk;
    237236    }
    238237    else if (pp->type == bncParam::TROPO) {
    239       _QQ(iPar,iPar) = _opt->sigTrp0 * _opt->sigTrp0;
     238      _QQ(iPar,iPar) = _opt->_aprSigTrp * _opt->_aprSigTrp;
    240239      pp->xx = lastTrp;
    241240    }
    242241    else if (pp->type == bncParam::GLONASS_OFFSET) {
    243       _QQ(iPar,iPar) = _opt->sigGlonassOffset0 * _opt->sigGlonassOffset0;
     242      _QQ(iPar,iPar) = 1000.0 * 1000.0;
    244243    }
    245244    else if (pp->type == bncParam::GALILEO_OFFSET) {
    246       _QQ(iPar,iPar) = _opt->sigGalileoOffset0 * _opt->sigGalileoOffset0;
     245      _QQ(iPar,iPar) = 1000.0 * 1000.0;
    247246    }
    248247  }
     
    317316  xRec(3) = z();
    318317
    319   tides(_time, xRec);
     318  xRec += _tides->displacement(_time, xRec);
    320319
    321320  satData->rho = (satData->xx - xRec).norm_Frobenius();
  • trunk/BNC/src/PPP_free/bncmodel.h

    r6059 r6060  
    4141class t_epoData;
    4242class t_satData;
     43class t_tides;
    4344
    4445class bncParam {
     
    163164  QStringList           _outlierGlo;
    164165  bncAntex*             _antex;
     166  t_tides*              _tides;
    165167};
    166168
Note: See TracChangeset for help on using the changeset viewer.