Skip to content

Commit

Permalink
Merge pull request #319 from njoy/feature/kbk
Browse files Browse the repository at this point in the history
Feature/kbk
  • Loading branch information
whaeck authored Oct 31, 2023
2 parents 11dbf95 + 58422a8 commit 3354993
Show file tree
Hide file tree
Showing 8 changed files with 51,964 additions and 47 deletions.
2 changes: 2 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Given here are some release notes for NJOY2016. Each release is made through a f
This update fixes the following issues:
- Fix an issue in ACER for thermal scattering leading to energy values being out of order when plotting the coherent elastic scattering cross section (this issue only affects plots, the thermal scattering ACE files do not change).
- Increased allocation of an array in LEAPR to accommodate ENDF/B-VIII.1 thermal scattering evaluations and added a check to avoid an infinite loop when using a very fine beta grid. In addition, LEAPR will now warn the user about potential excessive calculation times and print out progression in the phonon expansion sum when the phonon expansion order is large.
- Added logic to MODER to read background R-matrix element information from LRF=7 resonance parameter data.
- Updated RECONR to use background R-matrix element information from LRF=7 and added test 81 using ENDF/B-VIII.1 Sr88.
- Fixing a few thing related to intel compiler warnings and errors.

## [NJOY2016.72](https://github.com/njoy/NJOY2016/pull/308)
Expand Down
31 changes: 19 additions & 12 deletions src/moder.f90
Original file line number Diff line number Diff line change
Expand Up @@ -693,18 +693,25 @@ subroutine file2a(nin,nout,nscr,a)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
if (kbk.gt.0) then
call listio(nin,nout,nscr,a,nb,nw)
lbk=n1h
if (lbk.eq.1) then
call tab1io(nin,nout,nscr,a,nb,nw)
do while (nb.ne.0)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
call tab1io(nin,nout,nscr,a,nb,nw)
do while (nb.ne.0)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
endif
do l=1,kbk
call contio(nin,nout,nscr,a,nb,nw)
lbk=l2h
if (lbk.eq.1) then
call tab1io(nin,nout,nscr,a,nb,nw)
do while (nb.ne.0)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
call tab1io(nin,nout,nscr,a,nb,nw)
do while (nb.ne.0)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
else if (lbk.eq.2.or.lbk.eq.3) then
call listio(nin,nout,nscr,a,nb,nw)
do while (nb.ne.0)
call moreio(nin,nout,nscr,a,nb,nw)
enddo
endif
enddo
endif
if (kps.eq.1)then
call listio(nin,nout,nscr,a,nb,nw)
Expand Down
Loading

0 comments on commit 3354993

Please sign in to comment.