Merge pull request #202 from njoy/fix/tendl-pn

Fix/tendl pn

.github/workflows/ContinuousIntegration.yml

@@ -2,7 +2,10 @@
 name: Continuous Integration
 
 # This workflow is triggered on pushes and pull requests to the repository.
+# This workflow will also run each Monday on the default branch (i.e. master)
 on:
+  schedule:
+    - cron: '0 0 * * 1'
   push:
     branches: '**'
   pull_request:

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.64](https://github.com/njoy/NJOY2016/pull/202)
+This fixes a bug in ACER when producing photonuclear ACE files using some TENDL2019 evaluations. The use of LAW=4 in MF6 of these evaluations lead to corrupted ACE files related to incorrect logic in counting secondary particle producing reactions.
+
+This release addresses issue [\#201](https://github.com/njoy/NJOY2016/issues/201).
+
 ## [NJOY2016.63](https://github.com/njoy/NJOY2016/pull/193)
 This fixes a bug in ERRORR when using the `999` option. When using this option, the input and output tapes are not closed in Fortran. This causes problems in NJOY21 as the output from ERRORR isn't completely written to disk before the next module starts. This update simply closes files `nitape` and `notape` which resolves the issue.
 

src/acepn.f90

@@ -531,6 +531,20 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,&
                        nr6(ii)=nr6(ii)+1
                   enddo
 
+                  ! read subsections until we're back at the right one
+                  ir=1
+                  do while (ir.lt.ik)
+                     ir=ir+1
+                     call tab1io(nin,0,0,scr,nb,nw)
+                     law=nint(scr(4))
+                     jscr=1+nw
+                     do while (nb.ne.0)
+                        call moreio(nin,0,0,scr(jscr),nb,nw)
+                        jscr=jscr+nw
+                     enddo
+                     call skip6(nin,0,0,scr,law)
+                  enddo
+
                !--this law is not currently handled
                else
                   call mess('acephn','file 6 law not coded',' ')
@@ -874,8 +888,8 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,&
 
                   !--special steps for two-body recoil
                   !--back up to the corresponding law=2 distr.
-                  izarec=0
-                  awprec=0
+                  izarec=-1
+                  awprec=-1
                   if (izap.eq.ip.and.law.eq.4) then
                      izarec=izap
                      awprec=awp
@@ -917,7 +931,7 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,&
                      scr(llht+5)=ne
                      scr(llht+6)=ne
                      scr(llht+7)=2
-                     if (izarec.eq.0) then
+                     if (izarec.eq.-1) then
                         awpp=awp
                      else
                         awpp=awprec
@@ -927,7 +941,7 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,&
                         call listio(nin,0,0,scr(ll),nb,nw)
                         lang=nint(scr(lld+2))
                         if (lang.eq.0) then
-                           if (izarec.ne.0) then
+                           if (izarec.ne.-1) then
                               nl=nint(scr(lld+5))
                               do iil=1,nl
                                  if (mod(iil,2).eq.1) then
@@ -3477,4 +3491,3 @@ subroutine ascll(amin,amax)
    end subroutine ascll
 
 end module acepn
-

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.63'
-   character(8),public::vday='12May21'
+   character(8),public::vers='2016.64'
+   character(8),public::vday='24May21'
 end module version

tests/64/CMakeLists.txt

@@ -0,0 +1,18 @@
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/input"
+               "${CMAKE_CURRENT_BINARY_DIR}/input" COPYONLY )
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape31"
+               "${CMAKE_CURRENT_BINARY_DIR}/referenceTape31" COPYONLY )
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape34"
+               "${CMAKE_CURRENT_BINARY_DIR}/referenceTape34" COPYONLY )
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/referenceTape37"
+               "${CMAKE_CURRENT_BINARY_DIR}/referenceTape37" COPYONLY )
+
+configure_file("${RESOURCES}/g-088_Ra226-tendl2019.endf"
+               "${CMAKE_CURRENT_BINARY_DIR}/tape20" COPYONLY )
+
+add_test( NAME "Test64"
+          COMMAND ${Python3_EXECUTABLE} "../execute.py"
+          WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )

tests/64/input

@@ -0,0 +1,33 @@
+-- moder
+moder
+20 -30
+-- reconr
+reconr
+-30 -21/
+'Ra226 from TENDL2019 photonuclear data' /
+8834 /
+0.001 /
+0/
+-- acer
+acer
+-30 -21 0 31 32                                                 / Card 1
+5 1 1 .31                                                       / Card 2
+'Ra226 from TENDL2019 photonuclear data'                        / Card 3
+8834                                                            / Card 12
+-- acer check/plot/correct
+acer
+0 31 33 34 35
+7 1 1 -1/
+'Ra226 from TENDL2019 photonuclear data - check tape 1'
+-- acer check/plot/correct
+acer
+0 34 36 37 38
+7 1 1 -1/
+'Ra226 from TENDL2019 photonuclear data - check tape 2'
+-- viewr plots from check tape 1
+viewr
+33 43
+-- viewr plots from check tape 2
+viewr
+36 46
+stop