Changeset 5802 in ntrip


Ignore:
Timestamp:
Aug 6, 2014, 10:35:19 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncantex.cpp

    r5755 r5802  
    4343
    4444#include "bncantex.h"
    45 #include "bnctides.h"
     45#include "PPP/pppModel.h"
    4646
    4747using namespace std;
     
    236236    sz /= sqrt(DotProduct(sz,sz));
    237237
    238     ColumnVector xSun = Sun(Mjd);
     238    ColumnVector xSun = t_astro::Sun(Mjd);
    239239    xSun /= sqrt(DotProduct(xSun,xSun));
    240240 
  • trunk/BNC/src/bncmodel.cpp

    r5794 r5802  
    5050#include "bancroft.h"
    5151#include "bncutils.h"
    52 #include "bnctides.h"
     52#include "PPP/pppModel.h"
    5353#include "bncantex.h"
    5454#include "pppopt.h"
     
    187187  }
    188188
     189  _tides = new t_tides;
     190
    189191  // Bancroft Coordinates
    190192  // --------------------
     
    213215  }
    214216  delete _epoData_sav;
     217  delete _tides;
    215218}
    216219
     
    338341  xRec(3) = z();
    339342
    340   tides(_time, xRec);
     343  xRec += _tides->displacement(_time, xRec);
    341344
    342345  satData->rho = (satData->xx - xRec).norm_Frobenius();
     
    980983    ColumnVector sz = -rSat / rSat.norm_Frobenius();
    981984
    982     ColumnVector xSun = Sun(Mjd);
     985    ColumnVector xSun = t_astro::Sun(Mjd);
    983986    xSun /= xSun.norm_Frobenius();
    984987
  • trunk/BNC/src/bncmodel.h

    r5750 r5802  
    3838class t_pppOpt;
    3939class bncPPPclient;
     40class t_tides;
    4041
    4142class bncParam {
     
    164165  QStringList           _outlierGlo;
    165166  bncAntex*             _antex;
     167  t_tides*              _tides;
    166168};
    167169
Note: See TracChangeset for help on using the changeset viewer.