Skip to content

Commit

Permalink
Merge pull request #73 from njoy/feature/purr-endf8
Browse files Browse the repository at this point in the history
Feature/purr endf8
  • Loading branch information
jlconlin authored Mar 22, 2018
2 parents c88900d + dcf7b57 commit 6a4c54c
Show file tree
Hide file tree
Showing 9 changed files with 679,711 additions and 4 deletions.
6 changes: 6 additions & 0 deletions docs/testDescription.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,9 @@ title: NJOY2016 Test Descriptions

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

## Test Problem 31

[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/31/input)]

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.

2 changes: 1 addition & 1 deletion src/groupr.f90
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ subroutine groupr
&8x,f8.1,''s'')') time
write(nsyse,'(/'' groupr...'',59x,f8.1,''s'')') time
call ruinb(iaddmt)
nwscr=10000
nwscr=max(10000,nsigz+ngn+9,nsigz+ngg+8)
allocate(scr(nwscr))
if (nendf.lt.0) nend2=-nend2
if (nendf.lt.0) nend3=-nend3
Expand Down
11 changes: 10 additions & 1 deletion src/purr.f90
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,16 @@ subroutine purr
do i=1,nunr
loc=i
sb(loc)=sb(loc)-sb(loc+nunr)-sb(loc+2*nunr)-sb(loc+3*nunr)
if (abs(sb(loc)).lt.sigmin) sb(loc)=0
if (sb(loc).lt.sigmin) then
if (sb(loc).lt.-sigmin) then
write(strng1,&
'(''total xs less than its components at e=''&
&,1p,e12.4)') eunr(loc)
write(strng2,'(''check evaluation file'')')
call mess('purr',strng1,strng2)
endif
sb(loc)=0
endif
sb(loc+nunr)=0
sb(loc+2*nunr)=0
sb(loc+3*nunr)=0
Expand Down
4 changes: 2 additions & 2 deletions src/vers.f90
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.29'
character(8),public::vday='01Mar18'
character(8),public::vers='2016.30'
character(8),public::vday='21Mar18'
end module version

12 changes: 12 additions & 0 deletions tests/31/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/input"
"${CMAKE_CURRENT_BINARY_DIR}/input" COPYONLY )

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape30"
"${CMAKE_CURRENT_BINARY_DIR}/referenceTape30" COPYONLY )

configure_file("${RESOURCES}/n-094_Pu_240-ENDF8.0.endf"
"${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )

add_test( NAME "Test31"
COMMAND ${PYTHON_EXECUTABLE} "../execute.py"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )
24 changes: 24 additions & 0 deletions tests/31/input
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
moder
20 -21
reconr
-21 -22/
'reconr/pendf tape for 9440'/
9440 0/
.001/
0 /
broadr
-21 -22 -23/
9440 1 0 0/
.001/
293.6/
0/
purr
-21 -23 -24/
9440 1 1 20 4/
293.6 /
1.e10 /
0/
moder
-24 30
stop

221,737 changes: 221,737 additions & 0 deletions tests/31/referenceTape30

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ add_subdirectory( "27" )
add_subdirectory( "28" )
add_subdirectory( "29" )
add_subdirectory( "30" )
add_subdirectory( "31" )

457,918 changes: 457,918 additions & 0 deletions tests/resources/n-094_Pu_240-ENDF8.0.endf

Large diffs are not rendered by default.

0 comments on commit 6a4c54c

Please sign in to comment.