Changeset 5753 in ntrip

Timestamp:

Aug 3, 2014, 11:58:23 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/windup.cpp (modified) (3 diffs)
• bncutils.cpp (modified) (1 diff)
• bncutils.h (modified) (1 diff)
• src.pri (modified) (2 diffs)

trunk/BNC/src/PPP/windup.cpp ¶

@@ -4 +4 @@
 #include "bncconst.h"
 #include "windup.h"
-#include "astro.h"
 #include "bncutils.h"
+#include "bnctides.h"
 
 using namespace std;
@@ -35 +35 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = t_astro::Sun(etime);
+    ColumnVector xSun = Sun(etime.mjddec());
     xSun /= xSun.norm_Frobenius();
 
@@ -77 +77 @@
     if (alpha < -1.0) alpha = -1.0;
     
-    double dphi = acos(alpha) / 2.0 / t_genConst::pi;  // in cycles
+    double dphi = acos(alpha) / 2.0 / M_PI;  // in cycles
     
     if ( DotProduct(rho, crossproduct(dipSat, dipRec)) < 0.0 ) {

trunk/BNC/src/bncutils.cpp ¶

@@ -285 +285 @@
 }
 
+// Round to nearest integer
+////////////////////////////////////////////////////////////////////////////
+double nint(double val) {
+  return ((val < 0.0) ? -floor(fabs(val)+0.5) : floor(val+0.5));
+}
+
 // Jacobian XYZ --> NEU 
 ////////////////////////////////////////////////////////////////////////////

trunk/BNC/src/bncutils.h ¶

@@ -68 +68 @@
                    SymmetricMatrix& Qxyz);
 
+double nint(double val);
+
 ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
                          double* acc,

trunk/BNC/src/src.pri ¶

@@ -61 +61 @@
           PPP/pppThread.h PPP/pppClient.h                             \
           PPP/obspool.h PPP/station.h PPP/filter.h PPP/ephpool.h      \
-          PPP/satobs.h PPP/satbias.h PPP/parlist.h
+          PPP/satobs.h PPP/satbias.h PPP/parlist.h PPP/windup.h
 
 HEADERS       += serial/qextserialbase.h serial/qextserialport.h
@@ -92 +92 @@
           PPP/pppThread.cpp PPP/pppClient.cpp                         \
           PPP/obspool.cpp PPP/station.cpp PPP/filter.cpp PPP/ephpool.cpp \
-          PPP/satobs.cpp PPP/satbias.cpp PPP/parlist.cpp
+          PPP/satobs.cpp PPP/satbias.cpp PPP/parlist.cpp PPP/windup.cpp
 
 SOURCES       += serial/qextserialbase.cpp serial/qextserialport.cpp