Merge pull request #196 from njoy/develop

Develop

.github/workflows/ContinuousIntegration.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         os: [ubuntu-18.04, macos-10.15]
         build_type: [ Debug, Release ]
-        vFortran: [ gfortran-8 ]
+        vFortran: [ gfortran-9 ]
 
     steps:
     - name: which gfortran

ReleaseNotes.md

@@ -1,6 +1,12 @@
 # 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.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.
+
+In addition, some logic statements in the GROUPR conver and ACER convr subroutines have been corrected to fix failures in the test
+suite when building in Debug mode.
+
 ## [NJOY2016.62](https://github.com/njoy/NJOY2016/pull/191)
 This adds a number of changes to NJOY2016 contributed by Toshihiko Kawano, Bob McFarlane, IAEA and CIEMAT. In particular, the following changes were made:
   - fixed an issue in PURR when nunx is not set to the default value (when nunx is set to anything else but 0 or the number of energy points in the unresolved energy region, purr will now properly calculate the probability tables for the given number of tables spread out over the entire unresolved resonance region)

src/acefc.f90

@@ -4204,7 +4204,9 @@ subroutine convr(nin,npend,nout,nscr,nedis,nethr,matd)
          i=ii
          ei=scr(6+(lg+1)*i-lg)
          if (ei.eq.zero.and.ee(k).eq.zero) idone=1
-         if (ei.ne.zero.and.abs(ei-ee(k))/ei.lt.0.0001) idone=1
+         if (ei.ne.zero) then
+            if (abs(ei-ee(k))/ei.lt.0.0001) idone=1
+         endif
       enddo
       if (idone.eq.0) then
          aa((k-1)*imax+j)=0

src/errorr.f90

@@ -432,6 +432,8 @@ subroutine errorr
          goto 1000
       else
          call covadd(iadd,iaddmt,5,nitape,notape)
+         call closz(nitape)
+         call closz(notape)
          return
       endif
       call error('errorr','errorr in 999 option',' ')

src/groupr.f90

@@ -242,7 +242,7 @@ subroutine groupr
    !     30           ukaea 1025-group structure  (30 MeV)
    !     31           ukaea 1067-group structure (200 MeV)
    !     32           ukaea 1102-group structure   (1 GeV)
-   !     33           ukaea  142-group structure (200 MeV)   
+   !     33           ukaea  142-group structure (200 MeV)
    !     34           lanl 618-group structure
    !
    !     igg          meaning
@@ -1592,8 +1592,8 @@ subroutine gengpn(ign,ngn,egn)
    !    30      UKAEA 1025-group structure
    !    31      UKAEA 1067-group structure
    !    32      UKAEA 1102-group structure
-   !    33      UKAEA  142-group structure   
-   !    34      LANL 618 group structure   
+   !    33      UKAEA  142-group structure
+   !    34      LANL 618 group structure
    !
    !-------------------------------------------------------------------
    use mainio ! provides nsyso
@@ -3537,7 +3537,7 @@ subroutine gengpn(ign,ngn,egn)
      1.202264e+08_kr,1.258925e+08_kr,1.318257e+08_kr,1.380384e+08_kr,&
      1.445440e+08_kr,1.513561e+08_kr,1.584893e+08_kr,1.659587e+08_kr,&
      1.737801e+08_kr,1.819701e+08_kr,1.905461e+08_kr,1.995262e+08_kr/)
-   real(kr),dimension(1103),parameter::eg32=(/& 
+   real(kr),dimension(1103),parameter::eg32=(/&
      1.000000e-05_kr,1.047129e-05_kr,1.096478e-05_kr,1.148154e-05_kr,&
      1.202264e-05_kr,1.258925e-05_kr,1.318257e-05_kr,1.380384e-05_kr,&
      1.445440e-05_kr,1.513561e-05_kr,1.584893e-05_kr,1.659587e-05_kr,&
@@ -3814,7 +3814,7 @@ subroutine gengpn(ign,ngn,egn)
      6.309573e+08_kr,6.606934e+08_kr,6.918310e+08_kr,7.244360e+08_kr,&
      7.585776e+08_kr,7.943282e+08_kr,8.317638e+08_kr,8.709636e+08_kr,&
      9.120108e+08_kr,9.549926e+08_kr,1.000000e+09_kr/)
-   real(kr),dimension(143),parameter::eg33=(/& 
+   real(kr),dimension(143),parameter::eg33=(/&
      5.000000e+03_kr,1.000000e+04_kr,1.500000e+04_kr,2.000000e+04_kr,&
      2.500000e+04_kr,3.000000e+04_kr,3.500000e+04_kr,4.000000e+04_kr,&
      4.500000e+04_kr,5.000000e+04_kr,5.500000e+04_kr,6.000000e+04_kr,&
@@ -3851,7 +3851,7 @@ subroutine gengpn(ign,ngn,egn)
      5.500000e+07_kr,6.000000e+07_kr,7.000000e+07_kr,8.000000e+07_kr,&
      9.000000e+07_kr,1.000000e+08_kr,1.200000e+08_kr,1.400000e+08_kr,&
      1.600000e+08_kr,1.800000e+08_kr,2.000000e+08_kr/)
-   real(kr),dimension(619),parameter::eg618=(/& 
+   real(kr),dimension(619),parameter::eg618=(/&
      1.00000000000000e-05_kr,2.56901129797510e-05_kr,4.23558357164050e-05_kr,&
      6.98329672839171e-05_kr,1.15135098557100e-04_kr,1.39000000000000e-04_kr,&
      1.89825685995247e-04_kr,2.43741005558083e-04_kr,3.12969646225607e-04_kr,&
@@ -11179,7 +11179,9 @@ subroutine conver(nin,nout,nscr)
          i=ii
          ei=scr(6+(lg+1)*i-lg)
          if (ei.eq.zero.and.e(k).eq.zero) idone=1
-         if (ei.ne.zero.and.abs(ei-e(k))/ei.lt.0.0001) idone=1
+         if (ei.ne.zero) then
+            if (abs(ei-e(k))/ei.lt.0.0001) idone=1
+         endif
       enddo
       if (idone.eq.0) then
          aa((k-1)*imax+j)=0
@@ -12524,4 +12526,3 @@ real(kr) function f6psp(ep,epnext,epmax,w,e,c)
    end function f6psp
 
 end module groupm
-

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.62'
-   character(8),public::vday='09Mar21'
+   character(8),public::vers='2016.63'
+   character(8),public::vday='12May21'
 end module version