Skip to content

Commit

Permalink
Merge pull request #185 from njoy/update/2016.74
Browse files Browse the repository at this point in the history
Updating NJOY2016 to 2016.74
  • Loading branch information
whaeck authored Jan 22, 2024
2 parents 0e8bf1c + 572260f commit 3b2651f
Show file tree
Hide file tree
Showing 17 changed files with 148,097 additions and 4,433 deletions.
4 changes: 4 additions & 0 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.74](https://github.com/njoy/NJOY21/pull/185)
- Updating NJOY2016 dependency to NJOY2016.74. See [release 2016.74](https://github.com/njoy/NJOY2016/releases/tag/2016.74) for more information
- Updated test inputs and results from NJOY2016.

## [NJOY21 1.2.72](https://github.com/njoy/NJOY21/pull/183)
- Updating NJOY2016 dependency to NJOY2016.72. See [release 2016.72](https://github.com/njoy/NJOY2016/releases/tag/2016.72) for more information
- Updated test inputs and results from NJOY2016.
Expand Down
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.72
GIT_TAG 2016.74
)

FetchContent_Declare( njoy_c_bindings
Expand Down
2 changes: 1 addition & 1 deletion cmake/release_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ FetchContent_Declare( Log

FetchContent_Declare( njoy
GIT_REPOSITORY http://github.com/njoy/NJOY2016
GIT_TAG a1264c017f36aaeebc3d7c83f4ea43344dff730d # tag: 2016.72
GIT_TAG a0a3340a578e5f3c72227164c7e2bc183995193e # tag: 2016.74
)

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{3};
static constexpr int patchVersion{74};

static std::string version(){
return std::to_string( majorVersion ) + "." +
Expand Down
2 changes: 1 addition & 1 deletion src/njoy21/Version/test/Version.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ namespace njoy21 {
// This is not a guarantee, but it should help.
SCENARIO( "Testing NJOY21 version" ){

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

} // SCENARIO
8,194 changes: 4,097 additions & 4,097 deletions tests/20/referenceTape23

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions tests/20/referenceTape27
Original file line number Diff line number Diff line change
Expand Up @@ -9777,8 +9777,8 @@ newpath
411.78 138.52 lineto
411.78 168.87 lineto
402.65 168.87 lineto
402.65 150.92 lineto
393.52 150.92 lineto
402.65 150.90 lineto
393.52 150.90 lineto
393.52 111.62 lineto
384.39 111.62 lineto
384.39 116.93 lineto
Expand Down Expand Up @@ -19829,8 +19829,8 @@ newpath
411.78 138.52 lineto
411.78 168.87 lineto
402.65 168.87 lineto
402.65 150.92 lineto
393.52 150.92 lineto
402.65 150.90 lineto
393.52 150.90 lineto
393.52 111.62 lineto
384.39 111.62 lineto
384.39 116.93 lineto
Expand Down Expand Up @@ -24587,8 +24587,8 @@ newpath
182.12 489.76 lineto
191.93 489.76 lineto
191.93 498.89 lineto
188.59 498.89 lineto
188.59 508.02 lineto
188.58 498.89 lineto
188.58 508.02 lineto
121.82 508.02 lineto
121.82 517.16 lineto
104.83 517.16 lineto
Expand Down Expand Up @@ -24976,8 +24976,8 @@ newpath
411.78 138.52 lineto
411.78 168.87 lineto
402.65 168.87 lineto
402.65 150.92 lineto
393.52 150.92 lineto
402.65 150.90 lineto
393.52 150.90 lineto
393.52 111.62 lineto
384.39 111.62 lineto
384.39 116.93 lineto
Expand Down
Loading

0 comments on commit 3b2651f

Please sign in to comment.