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

Updating constants to the CODATA2018 values. #140

Merged
merged 12 commits into from
Jan 8, 2021
19 changes: 13 additions & 6 deletions .github/workflows/ContinuousIntegration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
name: Continuous Integration

# This workflow is triggered on pushes and pull requests to the repository.
on:
on:
push:
branches: '*'
pull_request:
pull_request:
branches: 'master'

jobs:
Expand All @@ -15,6 +15,7 @@ jobs:
matrix:
os: [ubuntu-18.04, macos-10.15]
build_type: [ Debug, Release ]
python-version: [3.5]
vFortran: [ gfortran-8 ]

steps:
Expand All @@ -23,14 +24,20 @@ jobs:
which ${{matrix.vFortran}}
${{matrix.vFortran}} --version
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Display Python version
run: python -c "import sys; print(sys.version)"
- name: mkdir bin
run: mkdir bin
run: mkdir bin
- name: cmake
run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..
run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ..
working-directory: ./bin
- name: make
run: make -j
run: make -j2
working-directory: ./bin
- name: ctest
run: ctest -j
run: ctest -j2
working-directory: ./bin
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/bin
/build
3 changes: 3 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Release Notes—NJOY2016
Given here are some release notes for NJOY2016. Each release is made through a formal [Pull Request](https://github.com/njoy/NJOY2016/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/NJOY2016/issues). In such cases, links to those issues are also given.

## [NJOY2016.61](https://github.com/njoy/NJOY2016/pull/140)
This updates the physical constants used in NJOY2016 to the CODATA2018 values recommended in the [ENDF-6 Formats Manual](https://www.nndc.bnl.gov/csewg/docs/endf-manual.pdf). The manual was updated through a format proposal at CSEWG and merged in the official repository in commit [28aca81c](https://git.nndc.bnl.gov/endf/format/endf6man/-/commit/28aca81c23d96ed783efde7f3759477972040efb).

## [NJOY2016.60](https://github.com/njoy/NJOY2016/pull/172)
When processing new incident charged particle ENDF files, NaN values were discovered in the ACE files. This appeared to be due to an array index overflow. A parameter for the size was added so that we can more easily resize the array, and an error message was added to detect similar issues in the future.

Expand Down
20 changes: 10 additions & 10 deletions src/phys.f90
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ module physics
! speed of light, atomic mass unit in eV, Planck's constant and
! the fine structure constant.
! - other values are given in terms of the above.
real(kr),parameter,public::pi=3.14159265359e0_kr !
real(kr),parameter,public::pi=3.141592653589793238e0_kr !
real(kr),parameter,public::euler=0.55721566490153286e0_kr !
real(kr),parameter,public::bk=8.6173303e-5_kr !eV/degK
real(kr),parameter,public::ev=1.6021766208e-12_kr !erg/eV
real(kr),parameter,public::bk=8.617333262e-5_kr !eV/degK
real(kr),parameter,public::ev=1.602176634e-12_kr !erg/eV
real(kr),parameter,public::clight=2.99792458e10_kr !cm/s
real(kr),parameter,public::amu=931.4940954e6_kr*ev/&
real(kr),parameter,public::amu=931.49410242e6_kr*ev/&
(clight*clight) !g/amu
real(kr),parameter,public::hbar=6.582119514e-16_kr*ev !Planck/2pi, erg
real(kr),parameter,public::hbar=6.582119569e-16_kr*ev !Planck/2pi, erg
real(kr),parameter,public::finstri=1.e16_kr*hbar/(ev*ev*clight) !inv fine str
! ****************************************************************
! * Light particle masses (in amu), per ENDF-102, Appendix H: *
Expand All @@ -33,13 +33,13 @@ module physics
! * fortran naming convention that would have considered a *
! * name of the form "massn" to be an integer variable. *
! ****************************************************************
real(kr),parameter,public::amassn=1.00866491588e0_kr !neutron
real(kr),parameter,public::amassp=1.007276466879e0_kr !proton
real(kr),parameter,public::amassn=1.00866491595e0_kr !neutron
real(kr),parameter,public::amassp=1.007276466621e0_kr !proton
real(kr),parameter,public::amassd=2.013553212745e0_kr !deuteron
real(kr),parameter,public::amasst=3.01550071632e0_kr !triton
real(kr),parameter,public::amassh=3.01493224673e0_kr !helion (3)
real(kr),parameter,public::amasst=3.01550071621e0_kr !triton
real(kr),parameter,public::amassh=3.014932247175e0_kr !helion (3)
real(kr),parameter,public::amassa=4.001506179127e0_kr !alpha
real(kr),parameter,public::amasse=5.48579909070e-4_kr !electron
real(kr),parameter,public::amasse=5.48579909065e-4_kr !electron
real(kr),parameter,public::pnratio=amassp/amassn ! proton/neutron mass
real(kr),parameter,public::dnratio=amassd/amassn ! deuteron/neutron mass
real(kr),parameter,public::tnratio=amasst/amassn ! triton/neutron mass
Expand Down
4 changes: 2 additions & 2 deletions src/vers.f90
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module version
! These values are updated during the NJOY revision-control process.
implicit none
private
character(8),public::vers='2016.60'
character(8),public::vday='05Aug20'
character(8),public::vers='2016.61'
character(8),public::vday='07Jan21'
end module version
Loading