Skip to content

Commit

Permalink
Merge pull request #83 from mhvk/update-to-sofa-17a
Browse files Browse the repository at this point in the history
Update to sofa 17a
  • Loading branch information
mhvk authored Apr 5, 2021
2 parents 8cb1fa8 + c20b0ff commit 52218f4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
8 changes: 7 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ in this source distribution.
Differences from SOFA
---------------------

This version of ERFA (v1.7.2) is based on SOFA version "20210125", with the
This version of ERFA (v1.7.3) is based on SOFA version "20210125_a", with the
differences outlined below.

ERFA branding
Expand Down Expand Up @@ -52,6 +52,12 @@ Bug fixes
ERFA includes smaller changes that may or may not eventually make it into SOFA,
addressing localized bugs or similar smaller issues:

* ERFA 1.7.3 and SOFA "20210125_a"

+ Only a small bug fix in the SOFA release. The only differences
between ERFA 1.7.3 and SOFA "20210125_a" remain the added ``eraVersion``,
``eraSofaVersion``, and leap second functions noted above.

* ERFA 1.7.2 and SOFA "20210125"

+ Only bug and accuracy fixes in the SOFA release. The only differences
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ If the version is given in the form MAJOR.MINOR.PATCH, then
you are either fixing a bug or making other improvements. Increase
patch by one and do not change the others.

Change the version number in `README.rst`, the `AC_INIT` macro, and the macros in `src/erfaversion.c`.
Change the version number in `README.rst` and the `AC_INIT` macro.

Shared library version info
---------------------------
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.7.2])
AC_INIT([erfa],[1.7.3])
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(8, 2, 7)
ERFA_LIB_VERSION_INFO(8, 3, 7)

## SOFA version, update if needed in new relases
AC_DEFINE([SOFA_VERSION], ["20210125"], [Define to the version of SOFA])
AC_DEFINE([SOFA_VERSION], ["20210125_a"], [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/d2dtf.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ int eraD2dtf(const char *scale, int ndp, double d1, double d2,
** eraD2tf decompose days to hms
** eraDat delta(AT) = TAI-UTC
**
** This revision: 2014 February 15
** This revision: 2021 February 12
**
** Copyright (C) 2013-2021, NumFOCUS Foundation.
** Derived, with permission, from the SOFA library. See notes at end of file.
Expand Down Expand Up @@ -113,7 +113,7 @@ int eraD2dtf(const char *scale, int ndp, double d1, double d2,
dleap = dat24 - (2.0*dat12 - dat0);

/* If leap second day, scale the fraction of a day into SI. */
leap = (dleap != 0.0);
leap = (fabs(dleap) > 0.5);
if (leap) fd += fd * dleap/ERFA_DAYSEC;
}

Expand Down

0 comments on commit 52218f4

Please sign in to comment.