Skip to content

Commit 6a4c54c

Browse files
authored
Merge pull request #73 from njoy/feature/purr-endf8
Feature/purr endf8
2 parents c88900d + dcf7b57 commit 6a4c54c

File tree

9 files changed

+679711
-4
lines changed

9 files changed

+679711
-4
lines changed

docs/testDescription.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,9 @@ title: NJOY2016 Test Descriptions
182182

183183
This test is an addition to test 3 using `MATXSR`. While test 3 only uses photons, test 30 uses both neutrons and photons.
184184

185+
## Test Problem 31
186+
187+
[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/31/input)]
188+
189+
This test runs `PURR` for Pu240 from ENDF/B-VIII.0. This evaluation is one of the few that still gave negative cross sections in the probability tables for ENDF/B-VIII.0. In most cases, this behaviour is due to the fact that the original evaluation has an LSSF flag of 0 (MF3 contains background cross sections) and those background cross sections in the unresolved resonance region are negative (an example would be Na22). In the case of Pu240 however, the LSSF flag is set to 1 (MF3 contains the actual cross sections and the unresolved resonances should only be used for self-shielding). The negative cross section values in the probability table for this nuclide were due to the fact that the total cross section was actually lower than its components.
190+

src/groupr.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ subroutine groupr
373373
&8x,f8.1,''s'')') time
374374
write(nsyse,'(/'' groupr...'',59x,f8.1,''s'')') time
375375
call ruinb(iaddmt)
376-
nwscr=10000
376+
nwscr=max(10000,nsigz+ngn+9,nsigz+ngg+8)
377377
allocate(scr(nwscr))
378378
if (nendf.lt.0) nend2=-nend2
379379
if (nendf.lt.0) nend3=-nend3

src/purr.f90

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,16 @@ subroutine purr
265265
do i=1,nunr
266266
loc=i
267267
sb(loc)=sb(loc)-sb(loc+nunr)-sb(loc+2*nunr)-sb(loc+3*nunr)
268-
if (abs(sb(loc)).lt.sigmin) sb(loc)=0
268+
if (sb(loc).lt.sigmin) then
269+
if (sb(loc).lt.-sigmin) then
270+
write(strng1,&
271+
'(''total xs less than its components at e=''&
272+
&,1p,e12.4)') eunr(loc)
273+
write(strng2,'(''check evaluation file'')')
274+
call mess('purr',strng1,strng2)
275+
endif
276+
sb(loc)=0
277+
endif
269278
sb(loc+nunr)=0
270279
sb(loc+2*nunr)=0
271280
sb(loc+3*nunr)=0

src/vers.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module version
33
! These values are updated during the NJOY revision-control process.
44
implicit none
55
private
6-
character(8),public::vers='2016.29'
7-
character(8),public::vday='01Mar18'
6+
character(8),public::vers='2016.30'
7+
character(8),public::vday='21Mar18'
88
end module version
99

tests/31/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
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}/referenceTape30"
5+
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape30" COPYONLY )
6+
7+
configure_file("${RESOURCES}/n-094_Pu_240-ENDF8.0.endf"
8+
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
9+
10+
add_test( NAME "Test31"
11+
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
12+
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/31/input

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
moder
2+
20 -21
3+
reconr
4+
-21 -22/
5+
'reconr/pendf tape for 9440'/
6+
9440 0/
7+
.001/
8+
0 /
9+
broadr
10+
-21 -22 -23/
11+
9440 1 0 0/
12+
.001/
13+
293.6/
14+
0/
15+
purr
16+
-21 -23 -24/
17+
9440 1 1 20 4/
18+
293.6 /
19+
1.e10 /
20+
0/
21+
moder
22+
-24 30
23+
stop
24+

tests/31/referenceTape30

Lines changed: 221737 additions & 0 deletions
Large diffs are not rendered by default.

tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ add_subdirectory( "27" )
4040
add_subdirectory( "28" )
4141
add_subdirectory( "29" )
4242
add_subdirectory( "30" )
43+
add_subdirectory( "31" )
4344

tests/resources/n-094_Pu_240-ENDF8.0.endf

Lines changed: 457918 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)