Merge pull request #347 from njoy/develop

2016.77

ReleaseNotes.md

@@ -1,6 +1,11 @@
 # 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.77
+This update fixes the following issues:
+  - 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.
+  - Increased the size of internal arrays in VIEWR.
+
 ## [NJOY2016.76](https://github.com/njoy/NJOY2016/pull/340)
 This update fixes the following issues:
   - Increase an array size to properly process Pt covariances in ENDF/B-VIII.1.

src/reconr.f90

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

src/vers.f90

@@ -3,6 +3,6 @@ module version
    ! These values are updated during the NJOY revision-control process.
    implicit none
    private
-   character(8),public::vers='2016.76'
-   character(8),public::vday='03Jul24'
+   character(8),public::vers='2016.77'
+   character(8),public::vday='xxSep24'
 end module version

src/viewr.f90

@@ -340,7 +340,7 @@ subroutine viewr
    real(kr)::xx,yy,zz
    character(80)::text
    integer,parameter::mmax=20000   !same in plotr and viewr
-   integer,parameter::maxaa=200000
+   integer,parameter::maxaa=500000
    real(kr),dimension(15)::z
    real(kr),dimension(maxaa)::aa
    real(kr),dimension(mmax)::x,y,b,dxm,dxp,dym,dyp
@@ -1269,10 +1269,11 @@ subroutine set3d(iplot,xyz,nxyz)
    integer::iplot,nxyz
    real(kr)::xyz(nxyz)
    ! internals
+   integer,parameter::length=2000
    integer::i,j,nn,k,ncurv,major,minor,itop,ibot,l,n
    real(kr)::wt,xlo,xhi,ylo,yhi,zlo,zhi,xn,yn,zn,yy
    real(kr)::top,bot,xop,yop,zop
-   integer::lll(400)
+   integer::lll(length)
    real(kr)::x(2000),y(2000),z(2000)
    real(kr),parameter::big=1.e10_kr
    real(kr),parameter::d0=.001e0_kr
@@ -1322,6 +1323,9 @@ subroutine set3d(iplot,xyz,nxyz)
          enddo
          i=i+2+2*nn
          j=j+1
+         if (j.gt.length) then
+            call error('set3d','array overflow, increase the length parameter',' ')
+         endif
       endif
    enddo
    ncurv=j-1
@@ -1663,4 +1667,3 @@ subroutine ascalv(m,z1,z2,major,minor)
    end subroutine ascalv
 
 end module viewm
-

tests/50/input

@@ -1,4 +1,4 @@
--- MF6 MT2 LAW=5 LTP=12 LIDP=1 (identical particles) s=0 
+-- MF6 MT2 LAW=5 LTP=12 LIDP=1 (identical particles) s=0
 moder
  20 -21
 moder
@@ -17,4 +17,3 @@ acer
 viewr
  33 43
 stop
-

tests/83/CMakeLists.txt

@@ -0,0 +1,12 @@
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/input"
+               "${CMAKE_CURRENT_BINARY_DIR}/input" COPYONLY )
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape50"
+               "${CMAKE_CURRENT_BINARY_DIR}/referenceTape50" COPYONLY )
+
+configure_file("${RESOURCES}/n-042_Mo_095-beta.endf"
+               "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
+
+add_test( NAME "Test83"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
+          WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/83/input

@@ -0,0 +1,13 @@
+-- read tape20 and transform to binary
+moder
+20 -30
+-- reconstruct, linearise and unionise
+reconr
+-30 -21
+'reconstructed data' /
+4234 /
+0.001 /
+0 /
+moder
+-21 50
+stop

tests/CMakeLists.txt

@@ -84,3 +84,4 @@ add_subdirectory( "79" )
 add_subdirectory( "80" )
 add_subdirectory( "81" )
 add_subdirectory( "82" )
+add_subdirectory( "83" )