Merge naif.h into solarsystem.h and site update

Smithsonian · Nov 11, 2024 · a49a0d9 · a49a0d9
1 parent d5d00f3
commit a49a0d9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 36 deletions.
diff --git a/include/naif.h b/include/naif.h
diff --git a/include/solarsystem.h b/include/solarsystem.h
@@ -317,6 +317,22 @@ short planet_jplint_hp(const double jd_tdb[2], enum novas_planet body, enum nova
 
 // Added in v1.2 --------------------------------->
 
+/// NAIF ID for the geocenter
+#define NAIF_EARTH      399
+
+/// NAIF ID for the Moon
+#define NAIF_MOON       301
+
+/// NAIF_ID for the Sun
+#define NAIF_SUN        10
+
+/// NAIF ID for the Solar-System Barycenter (SSB)
+#define NAIF_SSB        0
+
+/// NAIF ID for the Earth-Moon Barycenter (EMB)
+#define NAIF_EMB        3
+
+
 novas_planet_provider get_planet_provider();
 
 novas_planet_provider_hp get_planet_provider_hp();

diff --git a/src/naif.c b/src/naif.c
@@ -19,7 +19,6 @@
 
 #define __NOVAS_INTERNAL_API__      ///< Use definitions meant for internal use by SuperNOVAS only
 #include "novas.h"
-#include "naif.h"
 
 /**
  * Converts a NAIF ID to a NOVAS major planet ID. It account for the different IDs used for Sun, Moon and SSB.

diff --git a/src/solsys-calceph.c b/src/solsys-calceph.c
@@ -30,7 +30,7 @@
 #define __NOVAS_INTERNAL_API__      ///< Use definitions meant for internal use by SuperNOVAS only
 #include "novas.h"
 #include "calceph.h"
-#include "naif.h"
+#include "novas-naif.h"
 
 #define CALCEPH_MOON                10  ///< Moon in CALCEPH
 #define CALCEPH_SUN                 11  ///< Sun in CALCEPH

diff --git a/src/solsys-cspice.c b/src/solsys-cspice.c
@@ -33,7 +33,6 @@
 #define USE_CSIPCE 1                ///< NOVAS cspice integration prototypes
 #define __NOVAS_INTERNAL_API__      ///< Use definitions meant for internal use by SuperNOVAS only
 #include "novas.h"
-#include "naif.h"
 
 #include "cspice/SpiceUsr.h"
 #include "cspice/SpiceZpr.h"        // for reset_c

diff --git a/test/src/test-errors.c b/test/src/test-errors.c
@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "novas.h"
-#include "naif.h"
 
 static int check(const char *func, int exp, int error) {
   if(error != exp) {

diff --git a/test/src/test-super.c b/test/src/test-super.c
@@ -23,11 +23,8 @@
 #include <unistd.h>
 #include <libgen.h>
 
-
-
 #define __NOVAS_INTERNAL_API__      ///< Use definitions meant for internal use by SuperNOVAS only
 #include "novas.h"
-#include "naif.h"
 
 #define J2000   2451545.0
 #define DAY     86400.0