Skip to content

Commit

Permalink
Merge pull request #107 from njoy/fix/hbar
Browse files Browse the repository at this point in the history 
Fix/hbar
  • Loading branch information
@whaeck
whaeck authored Oct 16, 2018
2 parents 69d0ae2 + 084cf8b commit 9e3f11b
Show file tree
Hide file tree
Showing 78 changed files with 948,483 additions and 948,466 deletions.
2 changes: 1 addition & 1 deletion src/phys.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module physics
real(kr),parameter,public::clight=2.99792458e10_kr !cm/s
real(kr),parameter,public::amu=931.4940954e6_kr*ev/&
(clight*clight) !g/amu
real(kr),parameter,public::hbar=6.58219514e-16_kr*ev !Planck/2pi, erg
real(kr),parameter,public::hbar=6.582119514e-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 Down
4 changes: 2 additions & 2 deletions src/vers.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module version
! These values are updated during the NJOY revision-control process.
implicit none
private
character(8),public::vers='2016.43'
character(8),public::vday='20Sep18'
character(8),public::vers='2016.44'
character(8),public::vday='11Oct18'
end module version

656 changes: 328 additions & 328 deletions tests/01/referenceTape25
View file

Large diffs are not rendered by default.

20,478 changes: 10,241 additions & 10,237 deletions tests/02/referenceTape28
100755 → 100644
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/04/referenceTape23
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
1395 1 099999
1395 0 0 0
9.223500+4 0.000000+0 0 0 9 01395 3 18 1
41.5840991 16.5989850 52.6606171 50.8727281 47.0763614 37.86836611395 3 18 2
21.6519770 17.1861828 11.5844223 1395 3 18 3
41.5829820 16.5985689 52.6593941 50.8715765 47.0752747 37.86750611395 3 18 2
21.6514806 17.1857912 11.5841586 1395 3 18 3
1395 3 099999
9.223500+4 0.000000+0 0 0 9 01395 3102 1
10.7363699 12.8531052 34.8034734 43.3227855 29.0165539 17.25604751395 3102 2
12.6847477 8.12759092 4.73733559 1395 3102 3
10.7361196 12.8528134 34.8026849 43.3218033 29.0158852 17.25564951395 3102 2
12.6844570 8.12740431 4.73722733 1395 3102 3
1395 3 099999
1395 0 0 0
9.223500+4 2.330250+2 0 0 0 2139533 18 1
Expand Down
22 changes: 11 additions & 11 deletions tests/04/referenceTape24
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@ u-235 multigroup nubar calculation 0 0 0 0
0.000000+0 0.000000+0 3 1 3 21395 3452 4
1.002001+0 2.436700+0 1.734030+2 1395 3452 5
0.000000+0 0.000000+0 3 1 3 31395 3452 6
1.004122+0 2.436700+0 7.225889+1 1395 3452 7
1.004122+0 2.436700+0 7.225866+1 1395 3452 7
0.000000+0 0.000000+0 3 1 3 41395 3452 8
9.962117-1 2.436700+0 2.109141+1 1395 3452 9
9.962117-1 2.436700+0 2.109079+1 1395 3452 9
0.000000+0 0.000000+0 3 1 3 51395 3452 10
1.000259+0 2.436700+0 2.028526+1 1395 3452 11
1.000259+0 2.436700+0 2.028476+1 1395 3452 11
0.000000+0 0.000000+0 3 1 3 61395 3452 12
9.992925-1 2.436700+0 6.497465+1 1395 3452 13
9.992925-1 2.436700+0 6.497318+1 1395 3452 13
0.000000+0 0.000000+0 3 1 3 71395 3452 14
9.994615-1 2.436700+0 4.865970+1 1395 3452 15
9.994615-1 2.436700+0 4.865859+1 1395 3452 15
0.000000+0 0.000000+0 3 1 3 81395 3452 16
1.000595+0 2.436700+0 2.241380+1 1395 3452 17
1.000595+0 2.436700+0 2.241329+1 1395 3452 17
0.000000+0 0.000000+0 3 1 3 91395 3452 18
1.000119+0 2.436700+0 1.722621+1 1395 3452 19
1.000119+0 2.436700+0 1.722582+1 1395 3452 19
0.000000+0 0.000000+0 3 1 3 101395 3452 20
1.000745+0 2.436699+0 1.066724+1 1395 3452 21
1.000745+0 2.436701+0 1.066699+1 1395 3452 21
0.000000+0 0.000000+0 3 1 3 111395 3452 22
9.979051-1 2.436700+0 6.027202+0 1395 3452 23
9.979051-1 2.436700+0 6.027068+0 1395 3452 23
0.000000+0 0.000000+0 3 1 3 121395 3452 24
1.001524+0 2.436700+0 3.795733+0 1395 3452 25
1.001524+0 2.436700+0 3.795653+0 1395 3452 25
0.000000+0 0.000000+0 3 1 3 131395 3452 26
1.000388+0 2.436700+0 2.486840+0 1395 3452 27
1.000388+0 2.436700+0 2.486794+0 1395 3452 27
0.000000+0 0.000000+0 3 1 3 141395 3452 28
1.002776+0 2.438349+0 1.898930+0 1395 3452 29
0.000000+0 0.000000+0 3 1 3 151395 3452 30
Expand Down
10 changes: 5 additions & 5 deletions tests/04/referenceTape25
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
1395 1 0 5
1395 0 0 6
9.223500+4 0.000000+0 0 0 9 01395 3 18 7
41.5840991 16.5989850 52.6606171 50.8727281 47.0763614 37.86836611395 3 18 8
21.6519770 17.1861828 11.5844223 1395 3 18 9
41.5829820 16.5985689 52.6593941 50.8715765 47.0752747 37.86750611395 3 18 8
21.6514806 17.1857912 11.5841586 1395 3 18 9
1395 3 0 10
9.223500+4 0.000000+0 0 0 9 01395 3102 11
10.7363699 12.8531052 34.8034734 43.3227855 29.0165539 17.25604751395 3102 12
12.6847477 8.12759092 4.73733559 1395 3102 13
10.7361196 12.8528134 34.8026849 43.3218033 29.0158852 17.25564951395 3102 12
12.6844570 8.12740431 4.73722733 1395 3102 13
1395 3 0 14
1395 0 0 15
9.223500+4 2.330250+2 0 0 0 2139533 18 16
Expand Down Expand Up @@ -86,7 +86,7 @@
1395 1 099999
1395 0 0 0
9.223500+4 0.000000+0 0 0 7 01395 3452 1
2.436700+0 2.436700+0 2.43669981 2.43669976 2.43816798 2.470697201395 3452 2
2.436700+0 2.436700+0 2.43670019 2.43670024 2.438168+0 2.470697201395 3452 2
2.91710175 1395 3452 3
1395 3 099999
1395 0 0 0
Expand Down
Loading

0 comments on commit 9e3f11b

Please sign in to comment.