Changeset 7278 in ntrip for trunk/BNC/src/ephemeris.cpp

Timestamp:

Sep 15, 2015, 4:48:34 AM (9 years ago)

Author:

stuerze

Message:

some memory leaks fixed

File:

• trunk/BNC/src/ephemeris.cpp (modified) (13 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -23 +23 @@
   _orbCorr    = 0;
   _clkCorr    = 0;
+}
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+t_eph::~t_eph() {
+  if (_orbCorr)
+    delete _orbCorr;
+  if (_clkCorr)
+    delete _clkCorr;
 }
 
@@ -313 +321 @@
   double OM     = _OMEGA0 + (_OMEGADOT - omegaEarth)*tk - 
                    omegaEarth*_TOEsec;
-  
+
   double sinom = sin(OM);
   double cosom = cos(OM);
@@ -320 +328 @@
   xc[0] = xp*cosom - yp*cosi*sinom;
   xc[1] = xp*sinom + yp*cosi*cosom;
-  xc[2] = yp*sini;                 
+  xc[2] = yp*sini;                
   
   double tc = tt - _TOC;
@@ -329 +337 @@
   double tanv2 = tan(v/2);
   double dEdM  = 1 / (1 - _e*cos(E));
-  double dotv  = sqrt((1.0 + _e)/(1.0 - _e)) / cos(E/2)/cos(E/2) / (1 + tanv2*tanv2) 
+  double dotv  = sqrt((1.0 + _e)/(1.0 - _e)) / cos(E/2)/cos(E/2) / (1 + tanv2*tanv2)
                * dEdM * n;
   double dotu  = dotv + (-_Cuc*sin2u0 + _Cus*cos2u0)*2*dotv;
   double dotom = _OMEGADOT - omegaEarth;
   double doti  = _IDOT + (-_Cic*sin2u0 + _Cis*cos2u0)*2*dotv;
-  double dotr  = a0 * _e*sin(E) * dEdM * n 
+  double dotr  = a0 * _e*sin(E) * dEdM * n
                 + (-_Crc*sin2u0 + _Crs*cos2u0)*2*dotv;
   double dotx  = dotr*cos(u) - r*sin(u)*dotu;
@@ -1128 +1136 @@
   }
 
-  _x_pos          *= 1.e3; 
-  _y_pos          *= 1.e3; 
-  _z_pos          *= 1.e3; 
-  _x_velocity     *= 1.e3; 
-  _y_velocity     *= 1.e3; 
-  _z_velocity     *= 1.e3; 
-  _x_acceleration *= 1.e3; 
-  _y_acceleration *= 1.e3; 
-  _z_acceleration *= 1.e3; 
+  _x_pos          *= 1.e3;
+  _y_pos          *= 1.e3;
+  _z_pos          *= 1.e3;
+  _x_velocity     *= 1.e3;
+  _y_velocity     *= 1.e3;
+  _z_velocity     *= 1.e3;
+  _x_acceleration *= 1.e3;
+  _y_acceleration *= 1.e3;
+  _z_acceleration *= 1.e3;
 }
 
@@ -1176 +1184 @@
   double  dt = tt - _TOC;
 
-  xc[0] = _x_pos + _x_velocity * dt + _x_acceleration * dt * dt / 2.0; 
-  xc[1] = _y_pos + _y_velocity * dt + _y_acceleration * dt * dt / 2.0; 
-  xc[2] = _z_pos + _z_velocity * dt + _z_acceleration * dt * dt / 2.0; 
+  xc[0] = _x_pos + _x_velocity * dt + _x_acceleration * dt * dt / 2.0;
+  xc[1] = _y_pos + _y_velocity * dt + _y_acceleration * dt * dt / 2.0;
+  xc[2] = _z_pos + _z_velocity * dt + _z_acceleration * dt * dt / 2.0;
 
   vv[0] = _x_velocity + _x_acceleration * dt;
@@ -1455 +1463 @@
   double sini  = 0;
   double cosi  = 0;
-  
+
   const double iMaxGEO = 10.0 / 180.0 * M_PI;
 
@@ -1470 +1478 @@
     xc[0] = xp*cosom - yp*cosi*sinom;
     xc[1] = xp*sinom + yp*cosi*cosom;
-    xc[2] = yp*sini;                 
+    xc[2] = yp*sini;
   }
 
@@ -1486 +1494 @@
     double xx = xp*cosom - yp*cosi*sinom;
     double yy = xp*sinom + yp*cosi*cosom;
-    double zz = yp*sini;                 
+    double zz = yp*sini;
 
     Matrix R1 = BNC_PPP::t_astro::rotX(-5.0 / 180.0 * M_PI);
@@ -1498 +1506 @@
     xc[2] = X2(3);
   }
-  
+
   double tc = tt - _TOC;
-  xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc 
+  xc[3] = _clock_bias + _clock_drift*tc + _clock_driftrate*tc*tc
           - 4.442807633e-10 * _e * sqrt(a0) *sin(E);
 
@@ -1507 +1515 @@
   double tanv2 = tan(v/2);
   double dEdM  = 1 / (1 - _e*cos(E));
-  double dotv  = sqrt((1.0 + _e)/(1.0 - _e)) / cos(E/2)/cos(E/2) 
+  double dotv  = sqrt((1.0 + _e)/(1.0 - _e)) / cos(E/2)/cos(E/2)
                  / (1 + tanv2*tanv2) * dEdM * n;
   double dotu  = dotv + (-_Cuc*sin2u0 + _Cus*cos2u0)*2*dotv;
   double dotom = _OMEGADOT - t_CST::omega;
   double doti  = _IDOT + (-_Cic*sin2u0 + _Cis*cos2u0)*2*dotv;
-  double dotr  = a0 * _e*sin(E) * dEdM * n 
+  double dotr  = a0 * _e*sin(E) * dEdM * n
                 + (-_Crc*sin2u0 + _Crs*cos2u0)*2*dotv;
   double dotx  = dotr*cos(u) - r*sin(u)*dotu;
@@ -1520 +1528 @@
         - xp*sinom*dotom - yp*cosi*cosom*dotom   // dX / dOMEGA
                          + yp*sini*sinom*doti;   // dX / di
-  
+
   vv[1]  = sinom  *dotx  + cosi*cosom   *doty
         + xp*cosom*dotom - yp*cosi*sinom*dotom
@@ -1527 +1535 @@
   vv[2]  = sini   *doty  + yp*cosi      *doti;
 
-  // dotC  = _clock_drift + _clock_driftrate*tc 
+  // dotC  = _clock_drift + _clock_driftrate*tc
   //       - 4.442807633e-10*_e*sqrt(a0)*cos(E) * dEdM * n;