From 376c76d07e7aac5821a6f4cf6ef73aea43735239 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Thu, 1 Aug 2024 11:07:55 -0600 Subject: [PATCH 1/4] Increasing array size --- ReleaseNotes.md | 1 + src/viewr.f90 | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index f7b90156..48ac223a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -4,6 +4,7 @@ Given here are some release notes for NJOY2016. Each release is made through a f ## [NJOY2016.77](https://github.com/njoy/NJOY2016/pull/xxx) This update fixes the following issues: - Background cross section values for reactions other than total, elastic, fission and capture were not handled properly in the unresolved resonance region. The background for total, elastic, fission and capture is integrated into the unresolved resonance cross section values in the genunr subroutine. In the emerge subroutine, the background in the unresolved resonance region was therefore zeroed out for any resonance reaction. This has never been an issue but now we have LRF=7 evaluations that can define reactions other than total, elastic, fission and capture. Test 82 was added to detect this issue in the future. + - Increased the size of internal arrays in VIEWR. ## [NJOY2016.76](https://github.com/njoy/NJOY2016/pull/340) This update fixes the following issues: diff --git a/src/viewr.f90 b/src/viewr.f90 index 19b948ee..ea1c9a5c 100644 --- a/src/viewr.f90 +++ b/src/viewr.f90 @@ -1272,7 +1272,7 @@ subroutine set3d(iplot,xyz,nxyz) integer::i,j,nn,k,ncurv,major,minor,itop,ibot,l,n real(kr)::wt,xlo,xhi,ylo,yhi,zlo,zhi,xn,yn,zn,yy real(kr)::top,bot,xop,yop,zop - integer::lll(400) + integer::lll(2000) real(kr)::x(2000),y(2000),z(2000) real(kr),parameter::big=1.e10_kr real(kr),parameter::d0=.001e0_kr @@ -1663,4 +1663,3 @@ subroutine ascalv(m,z1,z2,major,minor) end subroutine ascalv end module viewm - From bd694d0d6db1826c569b15f4e3f548c9d435b504 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Thu, 1 Aug 2024 12:05:38 -0600 Subject: [PATCH 2/4] Increasing the size of another internal array --- src/viewr.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewr.f90 b/src/viewr.f90 index ea1c9a5c..77d28f1b 100644 --- a/src/viewr.f90 +++ b/src/viewr.f90 @@ -340,7 +340,7 @@ subroutine viewr real(kr)::xx,yy,zz character(80)::text integer,parameter::mmax=20000 !same in plotr and viewr - integer,parameter::maxaa=200000 + integer,parameter::maxaa=500000 real(kr),dimension(15)::z real(kr),dimension(maxaa)::aa real(kr),dimension(mmax)::x,y,b,dxm,dxp,dym,dyp From 67a34ea077bdcc22cbc741aacbdf71744f84fa2a Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Mon, 12 Aug 2024 08:19:51 -0600 Subject: [PATCH 3/4] Changes following review --- src/viewr.f90 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/viewr.f90 b/src/viewr.f90 index 77d28f1b..c89c95b3 100644 --- a/src/viewr.f90 +++ b/src/viewr.f90 @@ -1269,10 +1269,11 @@ subroutine set3d(iplot,xyz,nxyz) integer::iplot,nxyz real(kr)::xyz(nxyz) ! internals + integer,parameter::length=2000 integer::i,j,nn,k,ncurv,major,minor,itop,ibot,l,n real(kr)::wt,xlo,xhi,ylo,yhi,zlo,zhi,xn,yn,zn,yy real(kr)::top,bot,xop,yop,zop - integer::lll(2000) + integer::lll(length) real(kr)::x(2000),y(2000),z(2000) real(kr),parameter::big=1.e10_kr real(kr),parameter::d0=.001e0_kr @@ -1322,6 +1323,9 @@ subroutine set3d(iplot,xyz,nxyz) enddo i=i+2+2*nn j=j+1 + if (j.lt.length) then + call error('set3d','array overflow, increase the length parameter',' ') + endif endif enddo ncurv=j-1 From 0ede4e2b671d3c277ded168b9875afe04028bf1b Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Mon, 12 Aug 2024 09:01:38 -0600 Subject: [PATCH 4/4] because it needs to be gt --- src/viewr.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewr.f90 b/src/viewr.f90 index c89c95b3..e2337b75 100644 --- a/src/viewr.f90 +++ b/src/viewr.f90 @@ -1323,7 +1323,7 @@ subroutine set3d(iplot,xyz,nxyz) enddo i=i+2+2*nn j=j+1 - if (j.lt.length) then + if (j.gt.length) then call error('set3d','array overflow, increase the length parameter',' ') endif endif