Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update/njoy2016.71 #179

Merged
merged 13 commits into from
Sep 14, 2023
8 changes: 6 additions & 2 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes—NJOY21
Given here are some release notes for NJOY21. Each release is made through a formal [Pull Request](https://github.com/njoy/NJOY21/pulls) made on GitHub. There are links in this document that point to each of those Pull Requests, where you can see in great details the changes that were made. Often the Pull Requests are made in response to an [issue](https://github.com/njoy/NJOY21/issues). In such cases, links to those issues are also given.

## [NJOY21 1.2.2](https://github.com/njoy/NJOY21/pull/142)
- Updating NJOY2016 dependency to NJOY2016.71. See [release 2016.71](https://github.com/njoy/NJOY2016/releases/tag/2016.71) for more information
- Adding additional regression tests from NJOY2016.

## [NJOY21 1.2.2](https://github.com/njoy/NJOY21/pull/142)
- Updating Legacy NJOY to NJOY2016.61. See [release 2016.61](https://github.com/njoy/NJOY2016/releases/tag/2016.61) for more information
- Adding additional regression tests.
Expand All @@ -11,7 +15,7 @@ This release is in preparation for the upcoming 1.3.0 release.
This update removes the `--signature` command-line option as that was a feature of the previous build system. This also updates the GitHub Actions such that they now test all of the NJOY21 stuff, but not the integration tests.

## [NJOY21 1.2.0](https://github.com/njoy/NJOY21/pull/122)
This update makes significant changes to the build system. Instead of using a [homegrown](https://github.com/njoy/metaconfigure) method for handling dependencies, we now use the [`FetchContent`](https://cmake.org/cmake/help/v3.16/module/FetchContent.html) capabilities in CMake. We now require CMake 3.16 to configure and build NJOY21.
This update makes significant changes to the build system. Instead of using a [homegrown](https://github.com/njoy/metaconfigure) method for handling dependencies, we now use the [`FetchContent`](https://cmake.org/cmake/help/v3.16/module/FetchContent.html) capabilities in CMake. We now require CMake 3.16 to configure and build NJOY21.

As part of this update, we have changed the install instructions, which can now be found at [docs.njoy21.io](https://docs.njoy21.io/install.html).

Expand Down Expand Up @@ -55,4 +59,4 @@ This incorporates the addition of `Ngen8` parameter in MATXSR. This updated occu
The manual doesn't state it, but the code allows the parameter `Ngen8` in MATXSR Card1. The updated to lipservice (and thus NJOY21) provides this parameter.

## [NJOY21 1.0.1](https://github.com/njoy/NJOY21/pull/92)
This simply separates the documentation from the code.
This simply separates the documentation from the code.
2 changes: 1 addition & 1 deletion cmake/develop_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FetchContent_Declare( lipservice

FetchContent_Declare( njoy
GIT_REPOSITORY http://github.com/njoy/NJOY2016
GIT_TAG 2016.61
GIT_TAG 2016.71
)

FetchContent_Declare( njoy_c_bindings
Expand Down
4 changes: 2 additions & 2 deletions cmake/release_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ FetchContent_Declare( header-utilities

FetchContent_Declare( lipservice
GIT_REPOSITORY https://github.com/njoy/lipservice
GIT_TAG 1efa5e9452384a7bfc278fde57979c4d91e312c0
GIT_TAG 6e037e5960d1049000a3471540908f5317429e24
)

FetchContent_Declare( Log
Expand All @@ -47,7 +47,7 @@ FetchContent_Declare( Log

FetchContent_Declare( njoy
GIT_REPOSITORY http://github.com/njoy/NJOY2016
GIT_TAG e722511e88e4568502b51a15cebd38d03fd060a8 # tag: 2016.61
GIT_TAG 1f1fbe3dac01b47ca8c13fa50cfd93617dc1d1ad # tag: 2016.71
)

FetchContent_Declare( njoy_c_bindings
Expand Down
2 changes: 1 addition & 1 deletion src/njoy21/Version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Version{
// Change whenever new capability is implemented
static constexpr int minorVersion{2};
// Change whenever merge to master branch is done
static constexpr int patchVersion{2};
static constexpr int patchVersion{3};

static std::string version(){
return std::to_string( majorVersion ) + "." +
Expand Down
6 changes: 3 additions & 3 deletions src/njoy21/Version/test/Version.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

namespace njoy21 {
#include "njoy21/Version.hpp"
} // namespace
} // namespace

// This was created in the hopes of avoiding to forget to change the Version
// number in releases.
// This is not a guarantee, but it should help.
SCENARIO( "Testing NJOY21 version" ){
CHECK( "1.2.2" == njoy21::Version::version() );

CHECK( "1.2.3" == njoy21::Version::version() );

} // SCENARIO
18 changes: 9 additions & 9 deletions tests/10/referenceTape26
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
94238.00c 236.167000 2.5852E-08 12/22/20
94238.00c 236.167000 2.5852E-08 10/05/22
njoy test problem 10 mat1050
0 0. 0 0. 0 0. 0 0.
0 0. 0 0. 0 0. 0 0.
Expand Down Expand Up @@ -9004,19 +9004,19 @@ njoy test problem 10 mat1050
6.69500000000E-01 7.54375000000E-01 8.43700000000E-01 9.28200000000E-01
9.66050000000E-01 9.89225000000E-01 9.97125000000E-01 9.99150000000E-01
1.00000000000E+00 1.00941900000E+00 1.72871000000E+00 2.70834900000E+00
4.34916900000E+00 6.23200600000E+00 8.51136300000E+00 1.05189000000E+01
4.34916800000E+00 6.23200600000E+00 8.51136300000E+00 1.05189000000E+01
1.16472500000E+01 1.20668300000E+01 1.20952300000E+01 1.24675600000E+01
1.36171600000E+01 1.58239800000E+01 2.03894000000E+01 4.13922300000E+01
1.82687800000E+02 7.13718700000E+02 2.01323800000E+03 3.62864000000E+03
5.45548600000E+03 8.78108100000E-02 2.83300700000E-01 1.01279200000E+00
2.51336500000E+00 4.72924000000E+00 7.54068100000E+00 1.00554200000E+01
1.14826300000E+01 1.22426400000E+01 1.22557600000E+01 1.23200900000E+01
1.31648400000E+01 1.50403400000E+01 1.86411700000E+01 3.06113600000E+01
8.85066300000E+01 3.70621400000E+02 1.35642500000E+03 2.84165000000E+03
8.85066200000E+01 3.70621400000E+02 1.35642500000E+03 2.84165000000E+03
4.58728700000E+03 7.87505800000E-02 1.87990100000E-01 2.62147800000E-01
2.94937200000E-01 2.45685700000E-01 1.87006500000E-01 1.08725100000E-01
5.90412500000E-02 5.09429100000E-03 6.41934000000E-03 5.46585100000E-02
1.12414500000E-01 1.69480400000E-01 3.47638800000E-01 1.89794200000E+00
1.12414500000E-01 1.69480400000E-01 3.47638800000E-01 1.89794100000E+00
1.61390700000E+01 5.95885200000E+01 1.11823300000E+02 1.46812300000E+02
1.63339300000E+02 8.11898300000E-01 1.21049700000E+00 1.38911400000E+00
1.51618800000E+00 1.28098200000E+00 8.72907600000E-01 5.03803300000E-01
Expand Down Expand Up @@ -9081,7 +9081,7 @@ njoy test problem 10 mat1050
1.14290900000E+02 4.81845500000E-01 8.26743000000E-01 1.11131000000E+00
1.23199900000E+00 9.85686300000E-01 6.16183000000E-01 3.79203900000E-01
2.47453400000E-01 5.00385700000E-02 1.13943400000E-01 3.15592400000E-01
4.38825400000E-01 6.83133400000E-01 1.42311900000E+00 8.22845300000E+00
4.38825400000E-01 6.83133300000E-01 1.42311900000E+00 8.22845300000E+00
6.62307500000E+01 1.91092700000E+02 3.03303700000E+02 3.51578200000E+02
3.91970500000E+02 0.00000000000E+00 0.00000000000E+00 0.00000000000E+00
0.00000000000E+00 0.00000000000E+00 0.00000000000E+00 0.00000000000E+00
Expand Down Expand Up @@ -9124,7 +9124,7 @@ njoy test problem 10 mat1050
6.54900000000E-01 7.41700000000E-01 8.30100000000E-01 9.19725000000E-01
9.65075000000E-01 9.87200000000E-01 9.97425000000E-01 9.99200000000E-01
1.00000000000E+00 6.96604300000E-01 1.27591300000E+00 2.34888000000E+00
3.92934400000E+00 6.03147900000E+00 8.21593600000E+00 9.79797700000E+00
3.92934400000E+00 6.03147800000E+00 8.21593600000E+00 9.79797700000E+00
1.07940500000E+01 1.13102800000E+01 1.15622900000E+01 1.21862900000E+01
1.32861200000E+01 1.51886400000E+01 1.92346400000E+01 3.88068500000E+01
1.58461900000E+02 4.93487100000E+02 1.17818600000E+03 2.15461000000E+03
Expand All @@ -9133,7 +9133,7 @@ njoy test problem 10 mat1050
1.05399400000E+01 1.12995100000E+01 1.14344700000E+01 1.18144000000E+01
1.27734600000E+01 1.44534800000E+01 1.75021000000E+01 2.83169900000E+01
8.43712500000E+01 3.08049500000E+02 8.90724100000E+02 1.83928700000E+03
2.37848300000E+03 1.27622700000E-01 2.32715400000E-01 3.63141100000E-01
2.37848200000E+03 1.27622700000E-01 2.32715400000E-01 3.63141100000E-01
3.56128000000E-01 2.83485500000E-01 1.66315700000E-01 1.11264600000E-01
7.56871600000E-02 2.08528900000E-02 4.93995100000E-02 1.00682600000E-01
1.38267200000E-01 1.99452700000E-01 4.57892500000E-01 2.66090600000E+00
Expand Down Expand Up @@ -9231,7 +9231,7 @@ njoy test problem 10 mat1050
4.56034700000E+01 4.15385600000E-01 7.01095500000E-01 8.39835200000E-01
8.19696000000E-01 5.82977700000E-01 3.67191300000E-01 2.50613800000E-01
1.97625800000E-01 9.95540500000E-02 1.82874300000E-01 3.14756100000E-01
4.55287400000E-01 6.15269100000E-01 1.26949100000E+00 6.84188000000E+00
4.55287400000E-01 6.15269000000E-01 1.26949100000E+00 6.84188000000E+00
3.29437300000E+01 6.91629700000E+01 9.30873300000E+01 1.04237500000E+02
1.03848100000E+02 0.00000000000E+00 0.00000000000E+00 0.00000000000E+00
0.00000000000E+00 0.00000000000E+00 0.00000000000E+00 0.00000000000E+00
Expand Down Expand Up @@ -9273,7 +9273,7 @@ njoy test problem 10 mat1050
3.33325000000E-01 4.13025000000E-01 4.91725000000E-01 5.77600000000E-01
6.57075000000E-01 7.43875000000E-01 8.32175000000E-01 9.22050000000E-01
9.64625000000E-01 9.86625000000E-01 9.95800000000E-01 9.98900000000E-01
1.00000000000E+00 3.83639300000E-01 6.50804800000E-01 1.53589900000E+00
1.00000000000E+00 3.83639200000E-01 6.50804800000E-01 1.53589900000E+00
3.05693100000E+00 5.23798000000E+00 7.54257500000E+00 9.14158900000E+00
1.01434900000E+01 1.07433300000E+01 1.12783300000E+01 1.21620300000E+01
1.34199700000E+01 1.56044800000E+01 2.06116900000E+01 4.30940300000E+01
Expand Down
Loading