Changeset 15202

Timestamp:

03/30/13 16:26:47 (12 years ago)

Author:

tbretz

Message:

Simplified using libnova with the new C++ wrapper. ln_get_solar_rst_horizon is kept, because a wrong value might be safety relevant, so we can keep the return value.

File:

• trunk/FACT++/src/Time.cc (modified) (5 diffs)

trunk/FACT++/src/Time.cc

@@ -28 +28 @@
 
 #ifdef HAVE_LIBNOVA
-#include <libnova/solar.h>
-#include <libnova/rise_set.h>
+#include "../externals/nova.h"
 #endif
 
@@ -308 +307 @@
 {
 #ifdef HAVE_LIBNOVA
-    const double lon = -(17.+53./60+26.525/3600);
-    const double lat =   28.+45./60+42.462/3600;
-
-    ln_lnlat_posn observer;
-    observer.lng = lon;
-    observer.lat = lat;
-
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -322 +314 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()-1.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-1.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -346 +338 @@
 {
 #ifdef HAVE_LIBNOVA
-    const double lon = -(17.+53./60+26.525/3600);
-    const double lat =   28.+45./60+42.462/3600;
-
-    ln_lnlat_posn observer;
-    observer.lng = lon;
-    observer.lat = lat;
-
     ln_rst_time sun_day;
-    if (ln_get_solar_rst_horizon(JD()-0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()-0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");
 
@@ -360 +345 @@
         return Time(sun_day.rise);
 
-    if (ln_get_solar_rst_horizon(JD()+0.5, &observer, horizon, &sun_day)==1)
+    if (ln_get_solar_rst_horizon(JD()+0.5, &Nova::ORM(), horizon, &sun_day)==1)
         throw runtime_error("ln_get_solar_rst_horizon reported the sun to be circumpolar at the coordinates of La Palma!");