Changeset 5753 in ntrip


Ignore:
Timestamp:
Aug 3, 2014, 11:58:23 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/windup.cpp

    r5743 r5753  
    44#include "bncconst.h"
    55#include "windup.h"
    6 #include "astro.h"
    76#include "bncutils.h"
     7#include "bnctides.h"
    88
    99using namespace std;
     
    3535    ColumnVector sz = -rSat / rSat.norm_Frobenius();
    3636
    37     ColumnVector xSun = t_astro::Sun(etime);
     37    ColumnVector xSun = Sun(etime.mjddec());
    3838    xSun /= xSun.norm_Frobenius();
    3939
     
    7777    if (alpha < -1.0) alpha = -1.0;
    7878   
    79     double dphi = acos(alpha) / 2.0 / t_genConst::pi;  // in cycles
     79    double dphi = acos(alpha) / 2.0 / M_PI;  // in cycles
    8080   
    8181    if ( DotProduct(rho, crossproduct(dipSat, dipRec)) < 0.0 ) {
  • trunk/BNC/src/bncutils.cpp

    r5752 r5753  
    285285}
    286286
     287// Round to nearest integer
     288////////////////////////////////////////////////////////////////////////////
     289double nint(double val) {
     290  return ((val < 0.0) ? -floor(fabs(val)+0.5) : floor(val+0.5));
     291}
     292
    287293// Jacobian XYZ --> NEU
    288294////////////////////////////////////////////////////////////////////////////
  • trunk/BNC/src/bncutils.h

    r5752 r5753  
    6868                   SymmetricMatrix& Qxyz);
    6969
     70double nint(double val);
     71
    7072ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
    7173                         double* acc,
  • trunk/BNC/src/src.pri

    r5752 r5753  
    6161          PPP/pppThread.h PPP/pppClient.h                             \
    6262          PPP/obspool.h PPP/station.h PPP/filter.h PPP/ephpool.h      \
    63           PPP/satobs.h PPP/satbias.h PPP/parlist.h
     63          PPP/satobs.h PPP/satbias.h PPP/parlist.h PPP/windup.h
    6464
    6565HEADERS       += serial/qextserialbase.h serial/qextserialport.h
     
    9292          PPP/pppThread.cpp PPP/pppClient.cpp                         \
    9393          PPP/obspool.cpp PPP/station.cpp PPP/filter.cpp PPP/ephpool.cpp \
    94           PPP/satobs.cpp PPP/satbias.cpp PPP/parlist.cpp
     94          PPP/satobs.cpp PPP/satbias.cpp PPP/parlist.cpp PPP/windup.cpp
    9595
    9696SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp
Note: See TracChangeset for help on using the changeset viewer.