Skip to content

Commit

Permalink
Merge pull request #294 from njoy/fix/plots
Browse files Browse the repository at this point in the history
Fix/plots
  • Loading branch information
whaeck authored Apr 3, 2023
2 parents 017f8ba + 09a7bae commit b22b503
Show file tree
Hide file tree
Showing 5 changed files with 1,888 additions and 1,825 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ContinuousIntegration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
run: |
which ${{matrix.vFortran}}
${{matrix.vFortran}} --version
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: mkdir bin
run: mkdir bin
- name: cmake
Expand Down
2 changes: 2 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ This update fixes a number of minor issues:
- Fixed an issue in HEATR where the photon recoil needed to be multiplied by the photon multiplicity to obtain the photon recoil per interaction.
- Fixed a crash in THERMR when asking for S(a,b) processing (iinc=2) while no ENDF tape is given (nendf=0).
- Multiple ERRORR calls can now be made in the same input file without crashing. This is of interest to users that wish to process MF34 and MF35 (where ERRORR needs to be called for each sub-subsection and incident energy group). The issue was related to arrays being allocated but not unallocated in the previous ERRORR run in NJOY's Sammy routines (evaluations using MF2 LRF=7 had this issue).
- Fixed an issue in ACER where the number of photons given in the ENDF file was larger than the hardcoded limit. The new limit is now adaptive.
- Fixed an issue in ACER where NaN values were produced in the postscript file for the checking plots.

A few compiler warnings have been resolved as well (unused variables). For source files that were corrected in this way, the remaining warnings relate to equality comparisons for real values, unused dummy arguments in subroutines and potential 0 indices into arrays (in all cases, if statements prevented this from happening).

Expand Down
12 changes: 7 additions & 5 deletions src/acefc.f90
Original file line number Diff line number Diff line change
Expand Up @@ -18724,7 +18724,7 @@ subroutine aploxp(nout,iwcol,hk)
integer::ipt,mtrh,nmtr
integer hpd,lsigh,sigh,landh,andh,ldlwh,dlwh,yh
real(kr)::test,e,xs,xstep,ystep,xtag,ytag,thin,xlast
real(kr)::ep,pd,ylast,break,cc,pp,rat,stepm,elast
real(kr)::ep,pd,epl,pdl,ylast,break,cc,pp,rat,stepm,elast
real(kr)::xmin,xmax,ymin,ymax,zmin,zmax,zmax1,zmax2,heat
character(10)::name
character(1)::qu=''''
Expand Down Expand Up @@ -19141,13 +19141,15 @@ subroutine aploxp(nout,iwcol,hk)
intt=nint(xss(loci))
nn=nint(xss(loci+1))
loci=loci+1
epl = xss(loci+1)
pdl = xss(loci+nn+1)
do j=1,nn
ep=xss(loci+j)
pd=xss(loci+nn+j)
if (pd.ge.zmin.and.pd.le.zmax) then
if (ep.lt.xmin) xmin=ep
if (ep.gt.xmax) xmax=ep
endif
if(pd .ge. zmin .and. epl .lt. xmin) xmin = epl
if(pdl .ge. zmin .and. ep .gt. xmax) xmax = ep
epl = ep
pdl = pd
enddo
endif
enddo
Expand Down
Loading

0 comments on commit b22b503

Please sign in to comment.