Merge pull request #84 from mhvk/update-to-sofa-18

Update to sofa 18

README.rst

@@ -13,7 +13,7 @@ in this source distribution.
 Differences from SOFA
 ---------------------
 
-This version of ERFA (v1.7.3) is based on SOFA version "20210125_a", with the
+This version of ERFA (v2.0.0) is based on SOFA version "20210512", with the
 differences outlined below.
 
 ERFA branding
@@ -52,6 +52,15 @@ Bug fixes
 ERFA includes smaller changes that may or may not eventually make it into SOFA,
 addressing localized bugs or similar smaller issues:
 
+* ERFA 2.0.0 and SOFA "20210512"
+
+  + Functionally, there no differences except for the added ``eraVersion``,
+    ``eraSofaVersion``, and leap second functions noted above.
+  + The three new functions added in SOFA are added to ERFA as well.
+  + Like for SOFA, one now has to explicitly include ``erfam.h`` to use its
+    macros defining constants, etc. Including just ``erfa.h`` (or
+    ``erfaextra.h``) will no longer includes ``erfam.h`` implicitly.
+
 * ERFA 1.7.3 and SOFA "20210125_a"
 
   + Only a small bug fix in the SOFA release.  The only differences

configure.ac

@@ -2,7 +2,7 @@
 
 AC_PREREQ([2.68])
 ## Follow the instructions in RELEASE.rst to change package version
-AC_INIT([erfa],[1.7.3])
+AC_INIT([erfa],[2.0.0])
 AC_CONFIG_SRCDIR([src/erfa.h])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -17,10 +17,10 @@ ERFA_NUMVER
 ## A library supports interfaces from current downto current - age
 ## Revision is the version of the current interface
 ## Follow the instructions in RELEASE.rst to change the version info
-ERFA_LIB_VERSION_INFO(8, 3, 7)
+ERFA_LIB_VERSION_INFO(9, 0, 8)
 
 ## SOFA version, update if needed in new relases
-AC_DEFINE([SOFA_VERSION], ["20210125_a"], [Define to the version of SOFA])
+AC_DEFINE([SOFA_VERSION], ["20210512"], [Define to the version of SOFA])
 
 # Checks for libraries.
 AC_SEARCH_LIBS([sin], [m], , AC_MSG_ERROR([cannot find math functions]))

src/Makefile.am

@@ -1,7 +1,8 @@
 lib_LTLIBRARIES = liberfa.la
 liberfa_la_SOURCES = a2af.c a2tf.c ab.c ae2hd.c af2a.c anp.c anpm.c apcg13.c \
 apcg.c apci13.c apci.c apco13.c apco.c apcs13.c apcs.c aper13.c \
-aper.c apio13.c apio.c atci13.c atciq.c atciqn.c atciqz.c atco13.c \
+aper.c apio13.c apio.c atcc13.c atccq.c \
+atci13.c atciq.c atciqn.c atciqz.c atco13.c \
 atic13.c aticq.c aticqn.c atio13.c atioq.c atoc13.c atoi13.c atoiq.c \
 bi00.c bp00.c bp06.c bpn2xy.c c2i00a.c c2i00b.c c2i06a.c c2ibpn.c \
 c2ixy.c c2ixys.c c2s.c c2t00a.c c2t00b.c c2t06a.c c2tcio.c c2teqx.c \
@@ -16,6 +17,7 @@ gd2gce.c gmst00.c gmst06.c gmst82.c gst00a.c gst00b.c gst06a.c \
 gst06.c gst94.c hd2ae.c hd2pa.c h2fk5.c hfk5z.c icrs2g.c ir.c \
 jd2cal.c jdcalf.c ld.c \
 ldn.c ldsun.c lteceq.c ltecm.c lteqec.c ltpb.c ltp.c ltpecl.c ltpequ.c \
+moon98.c \
 num00a.c num00b.c num06a.c numat.c nut00a.c nut00b.c \
 nut06a.c nut80.c nutm80.c obl06.c obl80.c p06e.c p2pv.c p2s.c pap.c \
 pas.c pb06.c pdp.c pfw06.c plan94.c pmat00.c pmat06.c pmat76.c \

src/a2af.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraA2af(int ndp, double angle, char *sign, int idmsf[4])
 /*
@@ -51,7 +52,7 @@ void eraA2af(int ndp, double angle, char *sign, int idmsf[4])
 **  Called:
 **     eraD2tf      decompose days to hms
 **
-**  This revision:  2020 April 1
+**  This revision:  2021 May 11
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.
@@ -64,7 +65,7 @@ void eraA2af(int ndp, double angle, char *sign, int idmsf[4])
 /* Scale then use days to h,m,s function. */
    eraD2tf(ndp, angle*F, sign, idmsf);
 
-   return;
+/* Finished. */
 
 }
 /*----------------------------------------------------------------------

src/a2tf.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraA2tf(int ndp, double angle, char *sign, int ihmsf[4])
 /*
@@ -51,7 +52,7 @@ void eraA2tf(int ndp, double angle, char *sign, int ihmsf[4])
 **  Called:
 **     eraD2tf      decompose days to hms
 **
-**  This revision:  2020 April 1
+**  This revision:  2021 May 11
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.
@@ -60,7 +61,7 @@ void eraA2tf(int ndp, double angle, char *sign, int ihmsf[4])
 /* Scale then use days to h,m,s function. */
    eraD2tf(ndp, angle/ERFA_D2PI, sign, ihmsf);
 
-   return;
+/* Finished. */
 
 }
 /*----------------------------------------------------------------------

src/ab.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraAb(double pnat[3], double v[3], double s, double bm1,
            double ppr[3])
@@ -48,7 +49,7 @@ void eraAb(double pnat[3], double v[3], double s, double bm1,
 **  Called:
 **     eraPdp       scalar product of two p-vectors
 **
-**  This revision:   2013 October 9
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.

src/ae2hd.c

@@ -59,7 +59,7 @@ void eraAe2hd (double az, double el, double phi,
 **
 **  Last revision:   2017 September 12
 **
-**  ERFA release 2021-01-25
+**  ERFA release 2021-05-12
 **
 **  Copyright (C) 2021 IAU ERFA Board.  See notes at end.
 */

src/af2a.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 #include <stdlib.h>
 
 int eraAf2a(char s, int ideg, int iamin, double asec, double *rad)
@@ -34,7 +35,7 @@ int eraAf2a(char s, int ideg, int iamin, double asec, double *rad)
 **  3)  If there are multiple errors, the status value reflects only the
 **      first, the smallest taking precedence.
 **
-**  This revision:  2013 June 18
+**  This revision:  2021 May 11
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.
@@ -53,6 +54,8 @@ int eraAf2a(char s, int ideg, int iamin, double asec, double *rad)
    if ( asec < 0.0 || asec >= 60.0 ) return 3;
    return 0;
 
+/* Finished. */
+
 }
 /*----------------------------------------------------------------------
 **  

src/anp.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 double eraAnp(double a)
 /*
@@ -14,7 +15,7 @@ double eraAnp(double a)
 **  Returned (function value):
 **              double     angle in range 0-2pi
 **
-**  This revision:  2013 June 18
+**  This revision:  2021 May 11
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.
@@ -28,6 +29,8 @@ double eraAnp(double a)
 
    return w;
 
+/* Finished. */
+
 }
 /*----------------------------------------------------------------------
 **  

src/anpm.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 double eraAnpm(double a)
 /*
@@ -14,7 +15,7 @@ double eraAnpm(double a)
 **  Returned (function value):
 **              double     angle in range +/-pi
 **
-**  This revision:  2013 June 18
+**  This revision:  2021 May 11
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.
@@ -28,6 +29,8 @@ double eraAnpm(double a)
 
    return w;
 
+/* Finished. */
+
 }
 /*----------------------------------------------------------------------
 **  

src/apco.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraApco(double date1, double date2,
              double ebpv[2][3], double ehp[3],
@@ -159,7 +160,7 @@ void eraApco(double date1, double date2,
 **     eraApcs      astrometry parameters, ICRS-GCRS, space observer
 **     eraCr        copy r-matrix
 **
-**  This revision:   2021 January 7
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.

src/apco13.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 int eraApco13(double utc1, double utc2, double dut1,
               double elong, double phi, double hm, double xp, double yp,
@@ -173,7 +174,7 @@ int eraApco13(double utc1, double utc2, double dut1,
 **     eraApco      astrometry parameters, ICRS-observed
 **     eraEors      equation of the origins, given NPB matrix and s
 **
-**  This revision:   2013 December 5
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.

src/apcs.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraApcs(double date1, double date2, double pv[2][3],
              double ebpv[2][3], double ehp[3],
@@ -122,7 +123,7 @@ void eraApcs(double date1, double date2, double pv[2][3],
 **     eraPn        decompose p-vector into modulus and direction
 **     eraIr        initialize r-matrix to identity
 **
-**  This revision:   2017 March 16
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.

src/apio.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 void eraApio(double sp, double theta,
              double elong, double phi, double hm, double xp, double yp,
@@ -117,7 +118,7 @@ void eraApio(double sp, double theta,
 **     eraAnpm      normalize angle into range +/- pi
 **     eraPvtob     position/velocity of terrestrial station
 **
-**  This revision:   2021 January 7
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.

src/apio13.c

@@ -1,4 +1,5 @@
 #include "erfa.h"
+#include "erfam.h"
 
 int eraApio13(double utc1, double utc2, double dut1,
               double elong, double phi, double hm, double xp, double yp,
@@ -162,7 +163,7 @@ int eraApio13(double utc1, double utc2, double dut1,
 **     eraRefco     refraction constants for given ambient conditions
 **     eraApio      astrometry parameters, CIRS-observed
 **
-**  This revision:   2013 October 9
+**  This revision:   2021 February 24
 **
 **  Copyright (C) 2013-2021, NumFOCUS Foundation.
 **  Derived, with permission, from the SOFA library.  See notes at end of file.