From 73037d1cdc3cfb87b4da0cd8bf5c2986d9a65869 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 7 Jun 2023 11:40:07 -0600 Subject: [PATCH 1/6] Modifying moder for MF7 MT451 --- src/moder.f90 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/moder.f90 b/src/moder.f90 index fb312a27..8a1b5296 100644 --- a/src/moder.f90 +++ b/src/moder.f90 @@ -1063,6 +1063,17 @@ subroutine file7(nin,nout,nscr,a) call error('file7',strng,' ') endif + !--general information (mt=451) + else if (mth.eq.451) then + + n=n1h + do i=1,n + call listio(nin,nout,nscr,a,nb,nw) + do while (nb.ne.0) + call moreio(nin,nout,nscr,a,nb,nw) + enddo + enddo + !--illegal mt else write(strng,'(''illegal mt='',i3)') mth From da6441286b6a9f1db6f914ed043b795af0bb938a Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 7 Jun 2023 11:42:29 -0600 Subject: [PATCH 2/6] Updating release notes --- ReleaseNotes.md | 3 +++ src/vers.f90 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 5dc319b0..f1bba4c4 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,9 @@ # 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.71](https://github.com/njoy/NJOY2016/pull/xxx) +This update adds the new MF7 MT451 (thermal scattering general information) ENDF format to MODER so that this module will be able to interpret the new MF7 section. No other capability in NJOY2016 currently uses the information in this section. + ## [NJOY2016.70](https://github.com/njoy/NJOY2016/pull/295) This update fixes a number of minor issues: - Fixed an issue in HEATR when reading evaluations with large multiplicity tables in MF6. diff --git a/src/vers.f90 b/src/vers.f90 index 99520701..d4d3f8b6 100644 --- a/src/vers.f90 +++ b/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.70' - character(8),public::vday='04Apr23' + character(8),public::vers='2016.71' + character(8),public::vday='xxJun23' end module version From 4c50fbfc4b835d987ff03a32b0927f0f5593bdf9 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 7 Jun 2023 12:13:33 -0600 Subject: [PATCH 3/6] Small correction - should use L1 not N1 for NA --- src/moder.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/moder.f90 b/src/moder.f90 index 8a1b5296..dea0c478 100644 --- a/src/moder.f90 +++ b/src/moder.f90 @@ -1066,7 +1066,7 @@ subroutine file7(nin,nout,nscr,a) !--general information (mt=451) else if (mth.eq.451) then - n=n1h + n=l1h do i=1,n call listio(nin,nout,nscr,a,nb,nw) do while (nb.ne.0) From b0c596d5c574f3eb495355743180e82eefbe47d0 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 12 Jul 2023 10:33:34 -0600 Subject: [PATCH 4/6] Correct writing a temporary file to resolve issue #293 --- src/acefc.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/acefc.f90 b/src/acefc.f90 index 870b3782..3ba36ab8 100644 --- a/src/acefc.f90 +++ b/src/acefc.f90 @@ -2311,7 +2311,7 @@ subroutine topfil(nin,nout,matd,newfor) else if (lf.eq.7.and.newfor.eq.1.and.no7.eq.1) then ! law=7 for newfor=1 -- convert the law7 ! data into law1 format. - call tab2io(nin,0,0,b,nb,nw) + call tab2io(nin,0,0,b,nb,nwb) ne=nint(b(6)) do ie=1,ne ! read in the data @@ -2334,7 +2334,7 @@ subroutine topfil(nin,nout,matd,newfor) if (ie.eq.1) then b(3)=10+intmu b(4)=intep - call tab2io(0,nout,0,b,nb,nw) + call tab2io(0,nout,0,b,nb,nwb) ncs(nxc)=ncs(nxc)+2 endif ! construct a union grid for eprime From 5415bb6333a5b1a92f4aeb957be67898d432726c Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 12 Jul 2023 10:35:47 -0600 Subject: [PATCH 5/6] Updating release notes and version number --- ReleaseNotes.md | 2 ++ src/vers.f90 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index f1bba4c4..2dd94c01 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -4,6 +4,8 @@ Given here are some release notes for NJOY2016. Each release is made through a f ## [NJOY2016.71](https://github.com/njoy/NJOY2016/pull/xxx) This update adds the new MF7 MT451 (thermal scattering general information) ENDF format to MODER so that this module will be able to interpret the new MF7 section. No other capability in NJOY2016 currently uses the information in this section. +This update also resolves an issue encountered when processing some JENDL5 evaluation that use LAW=7 (which ACER converts into LAW=1) due to errors in the temporary files. See issue #293 for more information. + ## [NJOY2016.70](https://github.com/njoy/NJOY2016/pull/295) This update fixes a number of minor issues: - Fixed an issue in HEATR when reading evaluations with large multiplicity tables in MF6. diff --git a/src/vers.f90 b/src/vers.f90 index d4d3f8b6..8f222095 100644 --- a/src/vers.f90 +++ b/src/vers.f90 @@ -4,5 +4,5 @@ module version implicit none private character(8),public::vers='2016.71' - character(8),public::vday='xxJun23' + character(8),public::vday='14Jul23' end module version From d993c899586d34f4fb5e31b49afd3e69c2d5a69b Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Mon, 24 Jul 2023 12:11:57 -0600 Subject: [PATCH 6/6] Set PR number on release notes --- ReleaseNotes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 2dd94c01..29f61344 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,7 +1,7 @@ # 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.71](https://github.com/njoy/NJOY2016/pull/xxx) +## [NJOY2016.71](https://github.com/njoy/NJOY2016/pull/301) This update adds the new MF7 MT451 (thermal scattering general information) ENDF format to MODER so that this module will be able to interpret the new MF7 section. No other capability in NJOY2016 currently uses the information in this section. This update also resolves an issue encountered when processing some JENDL5 evaluation that use LAW=7 (which ACER converts into LAW=1) due to errors in the temporary files. See issue #293 for more information.