Renamed 'lat_alt_to_parallax' to avoid a conflict with a similar func…

…tion in lunar/mpc_code.cpp.
Bill-Gray · Aug 2, 2018 · 14332e9 · 14332e9
1 parent 74246f2
commit 14332e9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/obs_tes2.cpp b/obs_tes2.cpp
@@ -98,7 +98,8 @@ int main( const int argc, const char **argv)
 
             /* Figure out where the observer _really_ is,  in Cartesian */
             /* coordinates of date: */
-   lat_alt_to_parallax( lat * PI / 180., ht_in_meters, &rho_cos_phi, &rho_sin_phi);
+   earth_lat_alt_to_parallax( lat * PI / 180., ht_in_meters, &rho_cos_phi,
+                                                             &rho_sin_phi);
    observer_cartesian_coords( jd,
                 lon * PI / 180., rho_cos_phi, rho_sin_phi, observer_loc);
    observer_cartesian_coords( jd + TIME_EPSILON,

diff --git a/obs_test.cpp b/obs_test.cpp
@@ -89,7 +89,8 @@ int main( const int argc, const char **argv)
 
             if( err_val)
                printf( "WARNING: TLE parsing error %d\n", err_val);
-            lat_alt_to_parallax( lat, ht_in_meters, &rho_cos_phi, &rho_sin_phi);
+            earth_lat_alt_to_parallax( lat, ht_in_meters, &rho_cos_phi,
+                                                          &rho_sin_phi);
             observer_cartesian_coords( jd, lon, rho_cos_phi, rho_sin_phi,
                         observer_loc);
             if( is_deep && (ephem == 1 || ephem == 2))

diff --git a/observe.cpp b/observe.cpp
@@ -62,7 +62,8 @@ void DLL_FUNC observer_cartesian_coords( const double jd, const double lon,
    *vect++ = rho_sin_phi               * EARTH_MAJOR_AXIS / 1000.;
 }
 
-void DLL_FUNC lat_alt_to_parallax( const double lat, const double ht_in_meters,
+void DLL_FUNC earth_lat_alt_to_parallax( const double lat,
+                    const double ht_in_meters,
                     double *rho_cos_phi, double *rho_sin_phi)
 {
    const double u = atan( sin( lat) * EARTH_AXIS_RATIO / cos( lat));

diff --git a/observe.h b/observe.h
@@ -25,7 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 extern "C" {
 #endif
 
-void DLL_FUNC lat_alt_to_parallax( const double lat, const double ht_in_meters,
+void DLL_FUNC earth_lat_alt_to_parallax( const double lat,
+                    const double ht_in_meters,
                     double *rho_cos_phi, double *rho_sin_phi);
 void DLL_FUNC observer_cartesian_coords( const double jd, const double lon,
               const double rho_cos_phi, const double rho_sin_phi,