Skip to content

Commit

Permalink
Merge pull request #46 from eteq/update-sofa-13
Browse files Browse the repository at this point in the history
Update to SOFA 20170420 and prepare for ERFA 1.4.0 release
  • Loading branch information
eteq authored Jun 18, 2017
2 parents b00cf80 + 6331f09 commit 93d0145
Show file tree
Hide file tree
Showing 236 changed files with 660 additions and 648 deletions.
12 changes: 12 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ Bugfixes
ERFA includes smaller changes that may or may not eventually make it into SOFA,
addressing localized bugs or similar smaller issues:

* ERFA 1.4.0 and SOFA "20170420"

+ ERFA 1.4.0 adds the ``eraVersion`` and ``eraSofaVersion`` functions to
determine the installed version of ERFA (and the SOFA version it is derived
from).

+ ERFA 1.4.0 includes some bug fixes contributed to ERFA after 1.3.0 but
before 1.4.0. These were incorporated (with modification) into
SOFA "20170420" (without attribution) and hence these are not differences
between ERFA and SOFA. (See https://github.com/liberfa/erfa/issues/40 and
https://github.com/liberfa/erfa/issues/41)

* ERFA 1.3.0 and SOFA "20160503_a"

+ There are no differences between ERFA 1.3.0 and SOFA "20160503_a".
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

AC_PREREQ([2.68])
## Follow the instructions in RELEASE.rst to change package version
AC_INIT([erfa],[1.3.0])
AC_INIT([erfa],[1.4.0])
AC_CONFIG_SRCDIR([src/erfa.h])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
Expand All @@ -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(4, 0, 3)
ERFA_LIB_VERSION_INFO(5, 0, 4)

## SOFA version, update if needed in new relases
AC_DEFINE([SOFA_VERSION], ["20160503_a"], [Define to the version of SOFA])
AC_DEFINE([SOFA_VERSION], ["20170420"], [Define to the version of SOFA])

# Checks for libraries.
AC_SEARCH_LIBS([sin], [m], , AC_MSG_ERROR([cannot find math functions]))
Expand Down
4 changes: 2 additions & 2 deletions src/a2af.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void eraA2af(int ndp, double angle, char *sign, int idmsf[4])
** case where angle is very nearly 2pi and rounds up to 360 degrees,
** by testing for idmsf[0]=360 and setting idmsf[0-3] to zero.
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -68,7 +68,7 @@ void eraA2af(int ndp, double angle, char *sign, int idmsf[4])
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/a2tf.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void eraA2tf(int ndp, double angle, char *sign, int ihmsf[4])
** case where angle is very nearly 2pi and rounds up to 24 hours,
** by testing for ihmsf[0]=24 and setting ihmsf[0-3] to zero.
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -64,7 +64,7 @@ void eraA2tf(int ndp, double angle, char *sign, int ihmsf[4])
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/ab.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void eraAb(double pnat[3], double v[3], double s, double bm1,
** Called:
** eraPdp scalar product of two p-vectors
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -76,7 +76,7 @@ void eraAb(double pnat[3], double v[3], double s, double bm1,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/af2a.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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.
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -55,7 +55,7 @@ int eraAf2a(char s, int ideg, int iamin, double asec, double *rad)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/anp.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ double eraAnp(double a)
** Returned (function value):
** double angle in range 0-2pi
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -30,7 +30,7 @@ double eraAnp(double a)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/anpm.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ double eraAnpm(double a)
** Returned (function value):
** double angle in range +/-pi
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -30,7 +30,7 @@ double eraAnpm(double a)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apcg.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void eraApcg(double date1, double date2,
** Called:
** eraApcs astrometry parameters, ICRS-GCRS, space observer
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -120,7 +120,7 @@ void eraApcg(double date1, double date2,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apcg13.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ void eraApcg13(double date1, double date2, eraASTROM *astrom)
** eraEpv00 Earth position and velocity
** eraApcg astrometry parameters, ICRS-GCRS, geocenter
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -123,7 +123,7 @@ void eraApcg13(double date1, double date2, eraASTROM *astrom)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apci.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void eraApci(double date1, double date2,
** eraApcg astrometry parameters, ICRS-GCRS, geocenter
** eraC2ixys celestial-to-intermediate matrix, given X,Y and s
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -129,7 +129,7 @@ void eraApci(double date1, double date2,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apci13.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void eraApci13(double date1, double date2,
** eraApci astrometry parameters, ICRS-CIRS
** eraEors equation of the origins, given NPB matrix and s
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -141,7 +141,7 @@ void eraApci13(double date1, double date2,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apco.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ void eraApco(double date1, double date2,
** eraApcs astrometry parameters, ICRS-GCRS, space observer
** eraCr copy r-matrix
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -203,7 +203,7 @@ void eraApco(double date1, double date2,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apco13.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ int eraApco13(double utc1, double utc2, double dut1,
** eraApco astrometry parameters, ICRS-observed
** eraEors equation of the origins, given NPB matrix and s
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -226,7 +226,7 @@ int eraApco13(double utc1, double utc2, double dut1,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
6 changes: 3 additions & 3 deletions src/apcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ void eraApcs(double date1, double date2, double pv[2][3],
** eraPn decompose p-vector into modulus and direction
** eraIr initialize r-matrix to identity
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
/* au/d to m/s */
const double AUDMS = ERFA_DAU/ERFA_DAYSEC;

/* Light time for 1 AU (day) */
/* Light time for 1 au (day) */
const double CR = ERFA_AULT/ERFA_DAYSEC;

int i;
Expand Down Expand Up @@ -172,7 +172,7 @@ void eraApcs(double date1, double date2, double pv[2][3],
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apcs13.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ void eraApcs13(double date1, double date2, double pv[2][3],
** eraEpv00 Earth position and velocity
** eraApcs astrometry parameters, ICRS-GCRS, space observer
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -130,7 +130,7 @@ void eraApcs13(double date1, double date2, double pv[2][3],
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/aper.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void eraAper(double theta, eraASTROM *astrom)
** aberration and parallax (unless subsumed into the ICRS <-> GCRS
** transformation), and atmospheric refraction.
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -101,7 +101,7 @@ void eraAper(double theta, eraASTROM *astrom)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/aper13.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void eraAper13(double ut11, double ut12, eraASTROM *astrom)
** eraAper astrometry parameters: update ERA
** eraEra00 Earth rotation angle, IAU 2000
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand All @@ -120,7 +120,7 @@ void eraAper13(double ut11, double ut12, eraASTROM *astrom)
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apio.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void eraApio(double sp, double theta,
** eraPvtob position/velocity of terrestrial station
** eraAper astrometry parameters: update ERA
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -152,7 +152,7 @@ void eraApio(double sp, double theta,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
4 changes: 2 additions & 2 deletions src/apio13.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ int eraApio13(double utc1, double utc2, double dut1,
** eraRefco refraction constants for given ambient conditions
** eraApio astrometry parameters, CIRS-observed
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
*/
{
Expand Down Expand Up @@ -198,7 +198,7 @@ int eraApio13(double utc1, double utc2, double dut1,
/*----------------------------------------------------------------------
**
**
** Copyright (C) 2013-2016, NumFOCUS Foundation.
** Copyright (C) 2013-2017, NumFOCUS Foundation.
** All rights reserved.
**
** This library is derived, with permission, from the International
Expand Down
Loading

0 comments on commit 93d0145

Please sign in to comment.