Skip to content

Commit 0b9da73

Browse files
authored
Merge pull request #342 from njoy/fix/urr-background
Fix/urr background
2 parents f656624 + 9c587e3 commit 0b9da73

File tree

9 files changed

+101507
-5
lines changed

9 files changed

+101507
-5
lines changed

ReleaseNotes.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Release Notes—NJOY2016
22
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.
33

4+
## [NJOY2016.77](https://github.com/njoy/NJOY2016/pull/xxx)
5+
This update fixes the following issues:
6+
- Background cross section values for reactions other than total, elastic, fission and capture were not handled properly in the unresolved resonance region. The background for total, elastic, fission and capture is integrated into the unresolved resonance cross section values in the genunr subroutine. In the emerge subroutine, the background in the unresolved resonance region was therefore zeroed out for any resonance reaction. This has never been an issue but now we have LRF=7 evaluations that can define reactions other than total, elastic, fission and capture. Test 82 was added to detect this issue in the future.
7+
48
## [NJOY2016.76](https://github.com/njoy/NJOY2016/pull/340)
59
This update fixes the following issues:
610
- Increase an array size to properly process Pt covariances in ENDF/B-VIII.1.

src/reconr.f90

+4-1
Original file line numberDiff line numberDiff line change
@@ -4776,7 +4776,10 @@ subroutine emerge(nin,ngrid,ngp,nres,nrtot,iold,inew,nscr)
47764776
if (thresh.gt.one.and.abs(thresh-eg).lt.test*thresh) sn=0
47774777
! backgrounds in a range of unresolved-smooth overlap
47784778
! are arbitrarily assigned to the unresolved component
4779-
if (eg.ge.eresr.and.eg.lt.eresh.and.itype.gt.0) sn=0
4779+
! this only applies to total, elastic, fission and capture.
4780+
! for lrf=7 evaluations that can have additional resonance reactions,
4781+
! we still need to add the background.
4782+
if (eg.ge.eresr.and.eg.lt.eresh.and.itype.gt.0.and.itype.lt.5) sn=0
47804783
345 continue
47814784
if (er-eg.gt.test*eg) go to 360
47824785
if (abs(eg-er).lt.test*eg) go to 355

src/vers.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module version
33
! These values are updated during the NJOY revision-control process.
44
implicit none
55
private
6-
character(8),public::vers='2016.76'
7-
character(8),public::vday='03Jul24'
6+
character(8),public::vers='2016.77'
7+
character(8),public::vday='xxSep24'
88
end module version

tests/50/input

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-- MF6 MT2 LAW=5 LTP=12 LIDP=1 (identical particles) s=0
1+
-- MF6 MT2 LAW=5 LTP=12 LIDP=1 (identical particles) s=0
22
moder
33
20 -21
44
moder
@@ -17,4 +17,3 @@ acer
1717
viewr
1818
33 43
1919
stop
20-

tests/83/CMakeLists.txt

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/input"
2+
"${CMAKE_CURRENT_BINARY_DIR}/input" COPYONLY )
3+
4+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape50"
5+
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape50" COPYONLY )
6+
7+
configure_file("${RESOURCES}/n-042_Mo_095-beta.endf"
8+
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
9+
10+
add_test( NAME "Test83"
11+
COMMAND ${Python3_EXECUTABLE} "../execute.py"
12+
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/83/input

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
-- read tape20 and transform to binary
2+
moder
3+
20 -30
4+
-- reconstruct, linearise and unionise
5+
reconr
6+
-30 -21
7+
'reconstructed data' /
8+
4234 /
9+
0.001 /
10+
0 /
11+
moder
12+
-21 50
13+
stop

tests/83/referenceTape50

+71,931
Large diffs are not rendered by default.

tests/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,4 @@ add_subdirectory( "79" )
8484
add_subdirectory( "80" )
8585
add_subdirectory( "81" )
8686
add_subdirectory( "82" )
87+
add_subdirectory( "83" )

tests/resources/n-042_Mo_095-beta.endf

+29,539
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)