From 7596a5bebc93b4bf61a0b61f826f89c87276ffed Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Tue, 6 Feb 2024 16:02:12 -0700 Subject: [PATCH 1/3] Addign s, z, a values to nxs array for ce and pn --- src/acefc.f90 | 46 +++++++++++++++++++++++----------------- src/acepn.f90 | 36 ++++++++++++++++++------------- tests/07/referenceTape26 | 2 +- tests/08/referenceTape25 | 2 +- tests/10/referenceTape26 | 2 +- tests/13/referenceTape26 | 2 +- tests/14/referenceTape31 | 2 +- tests/19/referenceTape27 | 2 +- tests/24/referenceTape34 | 2 +- tests/28/referenceTape34 | 2 +- tests/28/referenceTape44 | 2 +- tests/28/referenceTape54 | 2 +- tests/35/referenceTape44 | 2 +- tests/36/referenceTape44 | 2 +- tests/37/referenceTape44 | 2 +- tests/38/referenceTape44 | 2 +- tests/39/referenceTape44 | 2 +- tests/40/referenceTape44 | 2 +- tests/41/referenceTape44 | 2 +- tests/42/referenceTape44 | 2 +- tests/50/referenceTape34 | 2 +- tests/51/referenceTape34 | 2 +- tests/52/referenceTape34 | 2 +- tests/53/referenceTape34 | 2 +- tests/54/referenceTape34 | 2 +- tests/55/referenceTape31 | 2 +- tests/55/referenceTape34 | 2 +- tests/55/referenceTape40 | 2 +- tests/56/referenceTape31 | 2 +- tests/56/referenceTape34 | 2 +- tests/56/referenceTape37 | 2 +- tests/57/referenceTape31 | 2 +- tests/57/referenceTape34 | 2 +- tests/57/referenceTape37 | 2 +- tests/58/referenceTape31 | 2 +- tests/58/referenceTape34 | 2 +- tests/58/referenceTape37 | 2 +- tests/62/referenceTape34 | 2 +- tests/63/referenceTape44 | 2 +- tests/64/referenceTape31 | 2 +- tests/64/referenceTape34 | 2 +- tests/64/referenceTape37 | 2 +- tests/66/referenceTape31 | 2 +- tests/66/referenceTape34 | 2 +- tests/66/referenceTape37 | 2 +- tests/71/referenceTape34 | 2 +- tests/72/referenceTape41 | 2 +- tests/72/referenceTape44 | 2 +- tests/75/referenceTape26 | 2 +- tests/78/referenceTape31 | 2 +- tests/78/referenceTape34 | 2 +- 51 files changed, 97 insertions(+), 83 deletions(-) diff --git a/src/acefc.f90 b/src/acefc.f90 index 3ba36ab8..1d53546c 100644 --- a/src/acefc.f90 +++ b/src/acefc.f90 @@ -17,7 +17,7 @@ module acefc real(kr)::aw0,tz ! parameters for continuous nxs block - integer::len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,nxsd(8) + integer::len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,nxsd(5) ! parameters for continuous jxs block integer::esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& @@ -286,17 +286,25 @@ subroutine first(nendf,npend,nout,nethr,itab,matd,tempd,newfor,iopp) call contio(npend,0,0,scr,nb,nw) if (math.ne.matd)& call error('first','desired temperature not found.',' ') - za=scr(1) - za=nint(za) + za=nint(scr(1)) awr=scr(2) nxp=n2h jscr=7 - if (iverf.ge.5) call contio(npend,0,0,scr(jscr),nb,nw) - if (iverf.ge.5) jscr=jscr+6 - if (iverf.eq.6) call contio(npend,0,0,scr(jscr),nb,nw) - if (iverf.eq.6) jscr=jscr+6 + is=0 + if (iverf.ge.5) then + call contio(npend,0,0,scr(jscr),nb,nw) + jscr=jscr+6 + is=nint(scr(10)) ! endf-5 and endf-6 both store liso + endif + if (iverf.eq.6) then + call contio(npend,0,0,scr(jscr),nb,nw) + jscr=jscr+6 + endif awi=1 izai=1 + izaid=nint(scr(1)) + ia=mod(izaid,1000) + iz=(izaid-ia)/1000 if (iverf.eq.6) then awi=scr(13) nlib=nint(scr(17)) @@ -4918,7 +4926,7 @@ subroutine acelod(nin,suff,matd,tempd,newfor,mcnpx,ismooth) nnex=0 nwscr=1000000 allocate(scr(nwscr)) - do i=1,8 + do i=1,5 nxsd(i)=0 enddo do i=1,2 @@ -4968,7 +4976,6 @@ subroutine acelod(nin,suff,matd,tempd,newfor,mcnpx,ismooth) endif endif ntrp=ntrpp - izaid=nint(za) call dater(hdt) hd=' '//hdt @@ -11076,9 +11083,10 @@ subroutine aceprt(hk) &6x,''* *'',9x,''ntrp'',i10/& &6x,''* processed by *'',8x,''ntype'',i10/& &6x,''* *'',9x,''ndnf'',i10/& - &6x,''* njoy *'',10x,''esz'',i10/& - &6x,''* *'',11x,''nu'',i10/& - &6x,''***********************'',10x,''mtr'',i10/& + &6x,''* njoy *'',12x,''z'',i10/& + &6x,''* *'',12x,''a'',i10/& + &6x,''***********************'',12x,''s'',i10/& + &39x,''esz'',i10/40x,''nu'',i10/39x,''mtr'',i10/& &39x,''lqr'',i10/39x,''tyr'',i10/38x,''lsig'',i10/& &39x,''sig'',i10/38x,''land'',i10/39x,''and'',i10/& &38x,''ldlw'',i10//39x,''dlw'',i10/39x,''gpd'',i10/& @@ -11089,7 +11097,7 @@ subroutine aceprt(hk) &37x,''dndat'',i10/38x,''ldnd'',i10/39x,''dnd'',i10/& &37x,''ptype'',i10/38x,''ntro'',i10/37x,''ploct'',i10///& &6x,''hk---'',a70)')& - hz,aw0,tz,hd,hm,len2,nes,ntr,nr,ntrp,ntype,ndnf,esz,& + hz,aw0,tz,hd,hm,len2,nes,ntr,nr,ntrp,ntype,ndnf,iz,ia,is,esz,& nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,gpd,mtrp,lsigp,& sigp,landp,andp,ldlwp,dlwp,yp,fis,end,iurpt,nud,dndat,ldnd,& dnd,ptype,ntro,ploct,hk @@ -12938,7 +12946,7 @@ subroutine aceout(itype,nace,ndir,hk,izn,awn,mcnpx) endif write(nout,'(4(i7,f11.0))') (izn(i),awn(i),i=1,16) write(nout,'(8i9)')& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct @@ -12956,14 +12964,14 @@ subroutine aceout(itype,nace,ndir,hk,izn,awn,mcnpx) if (mcnpx.eq.0) then write(nout) hz(1:10),aw0,tz,hd,hk,hm,& (izn(i),awn(i),i=1,16),& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct else write(nout) hz(1:13),aw0,tz,hd,hk,hm,& (izn(i),awn(i),i=1,16),& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct @@ -13926,7 +13934,7 @@ subroutine acefix(nin,itype,nout,ndir,iprint,nplot,suff,& endif read (nin,'(4(i7,f11.0))') (izo(i),awo(i),i=1,16) read (nin,'(8i9)')& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct @@ -14004,13 +14012,13 @@ subroutine acefix(nin,itype,nout,ndir,iprint,nplot,suff,& else if (itype.eq.2) then if (mcnpx.eq.0) then read(nin) hz(1:10),aw0,tz,hd,hko,hm,(izo(i),awo(i),i=1,16),& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct else read(nin) hz(1:13),aw0,tz,hd,hko,hm,(izo(i),awo(i),i=1,16),& - len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,(nxsd(i),i=1,8),& + len2,izaid,nes,ntr,nr,ntrp,ntype,ndnf,is,iz,ia,(nxsd(i),i=1,5),& esz,nu,mtr,lqr,tyr,lsig,sig,land,and,ldlw,dlw,& gpd,mtrp,lsigp,sigp,landp,andp,ldlwp,dlwp,yp,fis,end,& iurpt,nud,dndat,ldnd,dnd,(jxsd(i),i=1,2),ptype,ntro,ploct diff --git a/src/acepn.f90 b/src/acepn.f90 index f244d137..65942a53 100644 --- a/src/acepn.f90 +++ b/src/acepn.f90 @@ -17,7 +17,7 @@ module acepn real(kr)::aw0,tz ! parameters for photonuclear nxs block - integer::lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(8),tvn + integer::lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,nxsd(4),tvn ! parameters for photonuclear jxs block integer::esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(21) @@ -46,7 +46,7 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,& integer::mt103,mt104,mt105,mt106,mt107 integer::i,mfd,mtd,l,mttot,idis,nex,nexc,ir,j,idone,nnex,n integer::nneut,nphot,nprot,ndeut,ntrit,nhe3,nhe4 - integer::k,ia,iaa,nk,ik,lly,izai,izap,law,jscr,nrr,npp + integer::k,ib,iaa,nk,ik,lly,izai,izap,law,jscr,nrr,npp integer::ll,lll,lep,ne,llh,lld,ie,np,ip,mtt,lct,ii integer::icapt,jj,itype,it,jp,nr,il,llht,iie,lang integer::iint,nn,kk,m,intt,last,lf,jnt,ja,jb,ipp,irr @@ -114,9 +114,11 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,& call contio(nin,0,0,scr,nb,nw) nx=n2h izai=0 + is=0 if (iverf.ge.5) then i=i+6 call contio(nin,0,0,scr(i),nb,nw) + is=nint(scr(10)) ! endf-5 and endf-6 both store liso endif if (iverf.eq.6) then i=i+6 @@ -125,6 +127,10 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,& if (izai.ne.0) call error('acephn',& 'endf input tape is not a photonuclear tape',' ') endif + za=nint(scr(1)) + ia=mod(za,1000) + iz=(za-ia)/1000 + print*,iz,ia,is,za call hdatio(nin,0,0,scr,nb,nw) if (iverf.ge.5) nx=n2h do while (nb.ne.0) @@ -205,7 +211,6 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,& call findf(matd,3,0,nin) call contio(nin,0,0,scr,nb,nw) mttot=mth - za=nint(scr(1)) e=0 call gety1(e,enext,idis,s,nin,scr) do while (enext.lt.etop) @@ -1633,11 +1638,11 @@ subroutine acephn(nendf,npend,nace,ndir,matd,tempd,iprint,mcnpx,& scr(ll+3)=0 scr(ll+4)=na !P(l) order (zero is allowed) scr(ll+5)=0 - do ia=1,na + do ib=1,na lll=lld+7+ncyc*(ig-1) - scr(ll+5+ia)=0 + scr(ll+5+ib)=0 if (scr(lll).ne.zero) then - scr(ll+5+ia)=scr(lll+ia)/scr(lll) !P(n)/P(0) + scr(ll+5+ib)=scr(lll+ib)/scr(lll) !P(n)/P(0) endif enddo @@ -1874,8 +1879,8 @@ subroutine phnfix(itype,nin,nout,ndir,iprint,nplot,mcnpx,suff,& hz(1:13),aw0,tz,hd,hko,hm endif read (nin,'(4(i7,f11.0))') (izo(i),awo(i),i=1,16) - read (nin,'(8i9)') lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& - esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) + read (nin,'(8i9)') lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,& + nxsd(1:4),tvn,esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) n=(lxs+3)/4 l=0 do i=1,n @@ -1887,11 +1892,11 @@ subroutine phnfix(itype,nin,nout,ndir,iprint,nplot,mcnpx,suff,& else if (itype.eq.2) then if (mcnpx.eq.0) then read(nin) hz(1:10),aw0,tz,hd,hko,hm,(izo(i),awo(i),i=1,16),& - lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& + lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,nxsd(1:4),tvn,& esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) else read(nin) hz(1:13),aw0,tz,hd,hko,hm,(izo(i),awo(i),i=1,16),& - lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& + lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,nxsd(1:4),tvn,& esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) endif n=(lxs+ner-1)/ner @@ -1980,10 +1985,11 @@ subroutine phnprt(hk) &6x,''* njoy *'',8x,''ntype'',i10/& &6x,''* *'',8x,''npixs'',i10/& &6x,''***********************'',8x,''neixs'',i10/& + &41x,''z'',i10/41x,''a'',i10/41x,''s'',i10/& &39x,''tvn'',i10/39x,''esz'',i10/39x,''mtr'',i10/& &39x,''lqr'',i10/38x,''lsig'',i10/39x,''sig'',i10/& &//6x,''hk--- '',a70///)')& - hz,aw0,tz,hd,hm,lxs,za,nes,ntr,ntype,npixs,neixs,tvn,& + hz,aw0,tz,hd,hm,lxs,za,nes,ntr,ntype,npixs,neixs,iz,ia,is,tvn,& esz,mtr,lqr,lsig,sig,hk !--photonuclear reaction descriptions @@ -2481,8 +2487,8 @@ subroutine phnout(itype,nout,ndir,mcnpx,hk,izn,awn) hz,aw0,tz,hd,hk,hm endif write(nout,'(4(i7,f11.0))') (izn(i),awn(i),i=1,16) - write(nout,'(8i9)')lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& - esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) + write(nout,'(8i9)')lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,& + nxsd(1:4),tvn,esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) !--esz block l=1 @@ -2775,11 +2781,11 @@ subroutine phnout(itype,nout,ndir,mcnpx,hk,izn,awn) else if (mcnpx.eq.0) then write(nout) hz(1:10),aw0,tz,hd,hk,hm,(izn(i),awn(i),i=1,16),& - lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& + lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,nxsd(1:4),tvn,& esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) else write(nout) hz(1:13),aw0,tz,hd,hk,hm,(izn(i),awn(i),i=1,16),& - lxs,za,nes,ntr,ntype,npixs,neixs,nxsd(1:8),tvn,& + lxs,za,nes,ntr,ntype,npixs,neixs,ignored,is,iz,ia,nxsd(1:4),tvn,& esz,tot,non,els,thn,mtr,lqr,lsig,sig,ixsa,ixs,jxsd(1:21) endif ll=0 diff --git a/tests/07/referenceTape26 b/tests/07/referenceTape26 index c0510d3d..fa3043ba 100644 --- a/tests/07/referenceTape26 +++ b/tests/07/referenceTape26 @@ -5,7 +5,7 @@ njoy test problem 7 mat1395 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 56381 92235 5041 24 22 33 0 6 - 0 0 0 0 0 0 0 0 + 0 92 235 0 0 0 0 0 1 25206 25253 25277 25301 25325 25349 43014 43037 45207 45229 47124 52765 52798 52831 54305 54338 54338 54371 56378 0 56381 0 45937 diff --git a/tests/08/referenceTape25 b/tests/08/referenceTape25 index 992f4ca0..e7c6f729 100644 --- a/tests/08/referenceTape25 +++ b/tests/08/referenceTape25 @@ -5,7 +5,7 @@ 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 89227 28061 4447 16 11 36 0 0 - 0 0 0 0 0 0 0 0 + 0 28 61 0 0 0 0 0 1 0 22236 22252 22268 22284 22300 51893 51905 54848 54859 61682 66129 66165 66201 66711 66747 66747 66783 89213 0 89227 0 0 diff --git a/tests/10/referenceTape26 b/tests/10/referenceTape26 index 7c2ea44a..b469b71a 100755 --- a/tests/10/referenceTape26 +++ b/tests/10/referenceTape26 @@ -5,7 +5,7 @@ njoy test problem 10 mat1050 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 38713 94238 2925 14 13 0 0 0 - 0 0 0 0 0 0 0 0 + 0 94 238 0 0 0 0 0 1 14626 14630 14644 14658 14672 14686 22791 22805 35715 35728 0 0 0 0 0 0 0 0 0 14856 38713 35925 0 diff --git a/tests/13/referenceTape26 b/tests/13/referenceTape26 index 2130b2cf..77efb0b9 100755 --- a/tests/13/referenceTape26 +++ b/tests/13/referenceTape26 @@ -5,7 +5,7 @@ 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 130716 28061 4447 18 11 36 2 0 - 0 0 0 0 0 0 0 0 + 0 28 61 0 0 0 0 0 1 0 22236 22254 22272 22290 22308 57000 57012 72818 72829 88405 92852 92888 92924 93434 93470 93470 93506 115936 0 115950 0 0 diff --git a/tests/14/referenceTape31 b/tests/14/referenceTape31 index 52e66b3b..d216bc3c 100755 --- a/tests/14/referenceTape31 +++ b/tests/14/referenceTape31 @@ -5,7 +5,7 @@ proton + 7-n-14 apt la150 njoy mcnpx mat 725 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 71369 7014 172 1 1 1 3 0 - 0 0 0 0 0 0 0 0 + 0 7 14 0 0 0 0 0 1 0 861 862 863 864 865 1032 1034 10592 10593 24401 24573 24574 24575 24665 24666 24666 24667 35686 0 35687 0 0 diff --git a/tests/19/referenceTape27 b/tests/19/referenceTape27 index 179277dc..9ac84c1c 100644 --- a/tests/19/referenceTape27 +++ b/tests/19/referenceTape27 @@ -5,7 +5,7 @@ njoy test problem 19 mat9443 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 67740 94241 4356 20 19 3 0 6 - 0 0 0 0 0 0 0 0 + 0 94 241 0 0 0 0 0 1 21781 21808 21828 21848 21868 21888 32136 32156 39498 39517 59150 63506 63509 63512 63644 63647 63647 63650 67738 21954 67740 43747 48351 diff --git a/tests/24/referenceTape34 b/tests/24/referenceTape34 index 1313755a..cf952582 100644 --- a/tests/24/referenceTape34 +++ b/tests/24/referenceTape34 @@ -5,7 +5,7 @@ acer check/plot tape for material 9437 mat9437 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 1037922 94239 72095 47 45 155 0 6 - 0 0 0 0 0 0 0 0 + 0 94 239 0 0 0 0 0 1 360476 373151 373198 373245 373292 373339 600148 600194 727862 727907 916712 988807 988962 989117 990535 990690 990690 990845 1037898 373526 1037922 0 905913 diff --git a/tests/28/referenceTape34 b/tests/28/referenceTape34 index 261212dd..9ac8f492 100644 --- a/tests/28/referenceTape34 +++ b/tests/28/referenceTape34 @@ -5,7 +5,7 @@ acer check/plot tape for material 9443 mat9443 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 175728 94241 18430 20 19 3 0 6 - 0 0 0 0 0 0 0 0 + 0 94 241 0 0 0 0 0 1 92151 92178 92198 92218 92238 92258 130654 130674 138016 138035 153064 171494 171497 171500 171632 171635 171635 171638 175726 92324 175728 0 142265 diff --git a/tests/28/referenceTape44 b/tests/28/referenceTape44 index 261212dd..9ac8f492 100644 --- a/tests/28/referenceTape44 +++ b/tests/28/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 9443 mat9443 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 175728 94241 18430 20 19 3 0 6 - 0 0 0 0 0 0 0 0 + 0 94 241 0 0 0 0 0 1 92151 92178 92198 92218 92238 92258 130654 130674 138016 138035 153064 171494 171497 171500 171632 171635 171635 171638 175726 92324 175728 0 142265 diff --git a/tests/28/referenceTape54 b/tests/28/referenceTape54 index 01830cc5..70f06b9d 100644 --- a/tests/28/referenceTape54 +++ b/tests/28/referenceTape54 @@ -5,7 +5,7 @@ acer check/plot tape for material 9443 mat9443 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 145449 94241 18430 20 19 0 0 6 - 0 0 0 0 0 0 0 0 + 0 94 241 0 0 0 0 0 1 92151 92178 92198 92218 92238 92258 130654 130674 131554 131573 0 0 0 0 0 0 0 0 0 92324 145449 0 135803 diff --git a/tests/35/referenceTape44 b/tests/35/referenceTape44 index a7657d35..0862f4f9 100644 --- a/tests/35/referenceTape44 +++ b/tests/35/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 4731 mat4731 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 614984 47109 50726 63 25 242 2 0 - 0 0 0 0 0 0 0 0 + 0 47 109 0 0 0 0 0 1 0 253631 253694 253757 253820 253883 307374 307400 342427 342452 476115 526841 527083 527325 529603 529845 529845 530087 560917 0 560976 473689 0 diff --git a/tests/36/referenceTape44 b/tests/36/referenceTape44 index 35f6bbbd..478b8081 100644 --- a/tests/36/referenceTape44 +++ b/tests/36/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 5046 mat5046 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 121554 50119 7290 32 26 0 0 0 - 0 0 0 0 0 0 0 0 + 0 50 119 0 0 0 0 0 1 0 36451 36483 36515 36547 36579 92773 92800 114669 114695 0 0 0 0 0 0 0 0 0 0 121554 118403 0 diff --git a/tests/37/referenceTape44 b/tests/37/referenceTape44 index b82a7434..ff65b27a 100644 --- a/tests/37/referenceTape44 +++ b/tests/37/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 2722 mat2722 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 240418 27058 3492 135 47 644 5 0 - 0 0 0 0 0 0 0 0 + 0 27 58 0 0 0 0 0 1 0 17461 17596 17731 17866 18001 58200 58248 81583 81630 106126 109618 110262 110906 116494 117138 117138 117782 148045 0 148176 104184 0 diff --git a/tests/38/referenceTape44 b/tests/38/referenceTape44 index 9e042617..794c35d5 100644 --- a/tests/38/referenceTape44 +++ b/tests/38/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 3640 mat3640 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 100461 36083 1498 28 20 0 0 0 - 0 0 0 0 0 0 0 0 + 0 36 83 0 0 0 0 0 1 0 7491 7519 7547 7575 7603 12248 12269 91319 91339 0 0 0 0 0 0 0 0 0 0 100461 96100 0 diff --git a/tests/39/referenceTape44 b/tests/39/referenceTape44 index 927b8dde..a9cb5094 100644 --- a/tests/39/referenceTape44 +++ b/tests/39/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 2840 mat2840 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 186472 28063 1947 84 25 209 5 0 - 0 0 0 0 0 0 0 0 + 0 28 63 0 0 0 0 0 1 0 9736 9820 9904 9988 10072 21482 21508 54322 54347 95075 97022 97231 97440 99364 99573 99573 99782 128082 0 128162 91439 0 diff --git a/tests/40/referenceTape44 b/tests/40/referenceTape44 index 5090153e..cfa0bc30 100644 --- a/tests/40/referenceTape44 +++ b/tests/40/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 2525 mat2525 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 874032 25055 13802 113 44 571 5 0 - 0 0 0 0 0 0 0 0 + 0 25 55 0 0 0 0 0 1 0 69011 69124 69237 69350 69463 90703 90748 461510 461554 662410 676212 676783 677354 682496 683067 683067 683638 735660 0 735769 660710 0 diff --git a/tests/41/referenceTape44 b/tests/41/referenceTape44 index de314a31..a3c06263 100644 --- a/tests/41/referenceTape44 +++ b/tests/41/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 3228 mat3228 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 407645 32071 3253 110 42 937 5 0 - 0 0 0 0 0 0 0 0 + 0 32 71 0 0 0 0 0 1 0 16266 16376 16486 16596 16706 88842 88885 139809 139851 186825 190078 191015 191952 199808 200745 200745 201682 238620 0 238726 181132 0 diff --git a/tests/42/referenceTape44 b/tests/42/referenceTape44 index 3679c42e..7d7dd747 100644 --- a/tests/42/referenceTape44 +++ b/tests/42/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 3034 mat3034 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 490436 30067 34477 29 19 20 3 0 - 0 0 0 0 0 0 0 0 + 0 30 67 0 0 0 0 0 1 0 172386 172415 172444 172473 172502 246861 246881 265068 265087 350846 385323 385343 385363 385785 385805 385805 385825 458856 0 458876 349267 0 diff --git a/tests/50/referenceTape34 b/tests/50/referenceTape34 index 17681dfc..1667f477 100644 --- a/tests/50/referenceTape34 +++ b/tests/50/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 alpha + He4 mat 228 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 604 2004 37 0 0 0 0 0 - 0 0 0 0 0 0 0 0 + 0 2 4 0 0 0 0 0 1 0 186 186 186 186 186 186 187 605 605 0 0 0 0 0 0 0 0 0 0 604 0 0 diff --git a/tests/51/referenceTape34 b/tests/51/referenceTape34 index 3dc2544e..0cc58da8 100644 --- a/tests/51/referenceTape34 +++ b/tests/51/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 proton + H2 mat 128 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 5989 1002 149 2 1 1 2 0 - 0 0 0 0 0 0 0 0 + 0 1 2 0 0 0 0 0 1 0 746 748 750 752 754 1026 1028 4741 4742 4956 5105 5106 5107 5115 5116 5116 5117 5142 0 5143 0 0 diff --git a/tests/52/referenceTape34 b/tests/52/referenceTape34 index b1603213..39b38c89 100644 --- a/tests/52/referenceTape34 +++ b/tests/52/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 proton + H1 mat 125 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 15895 1001 150 0 0 0 0 0 - 0 0 0 0 0 0 0 0 + 0 1 1 0 0 0 0 0 1 0 751 751 751 751 751 751 752 15896 15896 0 0 0 0 0 0 0 0 0 0 15895 0 0 diff --git a/tests/53/referenceTape34 b/tests/53/referenceTape34 index 0fe4ff70..8c8f1094 100644 --- a/tests/53/referenceTape34 +++ b/tests/53/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 deuteron + H2 mat 128 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 48072 1002 101 2 0 0 4 0 - 0 0 0 0 0 0 0 0 + 0 1 2 0 0 0 0 0 1 0 506 508 510 512 514 720 721 10089 10089 0 0 0 0 0 0 0 0 0 0 10088 0 0 diff --git a/tests/54/referenceTape34 b/tests/54/referenceTape34 index 31afc650..3d4f28e5 100644 --- a/tests/54/referenceTape34 +++ b/tests/54/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 proton + H3 mat 131 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 29259 1003 140 2 0 0 4 0 - 0 0 0 0 0 0 0 0 + 0 1 3 0 0 0 0 0 1 0 701 703 705 707 709 816 817 5445 5445 0 0 0 0 0 0 0 0 0 0 5444 0 0 diff --git a/tests/55/referenceTape31 b/tests/55/referenceTape31 index a82e9857..409a996a 100644 --- a/tests/55/referenceTape31 +++ b/tests/55/referenceTape31 @@ -5,7 +5,7 @@ Ace Fe056 TENDL-19 mat2631 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 584426 26056 30233 58 46 239 5 0 - 0 0 0 0 0 0 0 0 + 0 26 56 0 0 0 0 0 1 0 151166 151224 151282 151340 151398 203157 203204 329434 329480 380291 410524 410763 411002 413484 413723 413723 413962 485211 0 485269 0 0 diff --git a/tests/55/referenceTape34 b/tests/55/referenceTape34 index bfef108b..96087d6e 100644 --- a/tests/55/referenceTape34 +++ b/tests/55/referenceTape34 @@ -5,7 +5,7 @@ Fe056 TENDL-2019 check tape1 mat2631 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 584426 26056 30233 58 46 239 5 0 - 0 0 0 0 0 0 0 0 + 0 26 56 0 0 0 0 0 1 0 151166 151224 151282 151340 151398 203157 203204 329434 329480 380291 410524 410763 411002 413484 413723 413723 413962 485211 0 485269 0 0 diff --git a/tests/55/referenceTape40 b/tests/55/referenceTape40 index da4cf45a..e9c68164 100644 --- a/tests/55/referenceTape40 +++ b/tests/55/referenceTape40 @@ -5,7 +5,7 @@ Fe056 TENDL-2019 check tape2 mat2631 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 584426 26056 30233 58 46 239 5 0 - 0 0 0 0 0 0 0 0 + 0 26 56 0 0 0 0 0 1 0 151166 151224 151282 151340 151398 203157 203204 329434 329480 380291 410524 410763 411002 413484 413723 413723 413962 485211 0 485269 0 0 diff --git a/tests/56/referenceTape31 b/tests/56/referenceTape31 index 0a590df5..47fe498b 100644 --- a/tests/56/referenceTape31 +++ b/tests/56/referenceTape31 @@ -5,7 +5,7 @@ U235 from ENDF/B-VIII.0 photonuclear data mat9228 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 146069 92235 366 3 2 2 12 0 - 0 0 0 0 0 0 0 1 + 0 92 235 0 0 0 0 1 1 367 367 0 733 1099 1102 1105 1108 2060 2084 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/56/referenceTape34 b/tests/56/referenceTape34 index 612ea888..a57ae4ef 100644 --- a/tests/56/referenceTape34 +++ b/tests/56/referenceTape34 @@ -5,7 +5,7 @@ U235 from ENDF/B-VIII.0 photonuclear data - check tape 1 mat9228 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 146069 92235 366 3 2 2 12 0 - 0 0 0 0 0 0 0 1 + 0 92 235 0 0 0 0 1 1 367 367 0 733 1099 1102 1105 1108 2060 2084 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/56/referenceTape37 b/tests/56/referenceTape37 index e5b5c2a1..2f994bed 100644 --- a/tests/56/referenceTape37 +++ b/tests/56/referenceTape37 @@ -5,7 +5,7 @@ U235 from ENDF/B-VIII.0 photonuclear data - check tape 2 mat9228 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 146069 92235 366 3 2 2 12 0 - 0 0 0 0 0 0 0 1 + 0 92 235 0 0 0 0 1 1 367 367 0 733 1099 1102 1105 1108 2060 2084 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/57/referenceTape31 b/tests/57/referenceTape31 index e5bac4ec..a34f9d4e 100644 --- a/tests/57/referenceTape31 +++ b/tests/57/referenceTape31 @@ -5,7 +5,7 @@ Bi209 from ENDF/B-VIII.0 photonuclear data mat8325 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 231164 83209 70 1 6 2 12 0 - 0 0 0 0 0 0 0 1 + 0 83 209 0 0 0 0 1 1 71 71 0 141 211 212 213 214 286 358 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/57/referenceTape34 b/tests/57/referenceTape34 index 1a860302..12df1525 100644 --- a/tests/57/referenceTape34 +++ b/tests/57/referenceTape34 @@ -5,7 +5,7 @@ Bi209 from ENDF/B-VIII.0 photonuclear data - check tape 1 mat8325 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 231164 83209 70 1 6 2 12 0 - 0 0 0 0 0 0 0 1 + 0 83 209 0 0 0 0 1 1 71 71 0 141 211 212 213 214 286 358 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/57/referenceTape37 b/tests/57/referenceTape37 index e36fc3c7..7ae7f5ff 100644 --- a/tests/57/referenceTape37 +++ b/tests/57/referenceTape37 @@ -5,7 +5,7 @@ Bi209 from ENDF/B-VIII.0 photonuclear data - check tape 2 mat8325 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 231164 83209 70 1 6 2 12 0 - 0 0 0 0 0 0 0 1 + 0 83 209 0 0 0 0 1 1 71 71 0 141 211 212 213 214 286 358 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/58/referenceTape31 b/tests/58/referenceTape31 index 9bc018a8..5f853ccb 100644 --- a/tests/58/referenceTape31 +++ b/tests/58/referenceTape31 @@ -5,7 +5,7 @@ Co59 IAEA photonuclear data mat2725 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 531831 27059 139 127 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 27 59 0 0 0 0 1 1 140 140 0 279 418 545 672 799 12167 12251 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/58/referenceTape34 b/tests/58/referenceTape34 index bed44def..8effc77b 100644 --- a/tests/58/referenceTape34 +++ b/tests/58/referenceTape34 @@ -5,7 +5,7 @@ Co59 IAEA photonuclear data - check tape 1 mat2725 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 531831 27059 139 127 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 27 59 0 0 0 0 1 1 140 140 0 279 418 545 672 799 12167 12251 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/58/referenceTape37 b/tests/58/referenceTape37 index e7fa03c8..a6c4a9fc 100644 --- a/tests/58/referenceTape37 +++ b/tests/58/referenceTape37 @@ -5,7 +5,7 @@ Co59 IAEA photonuclear data - check tape 2 mat2725 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 531831 27059 139 127 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 27 59 0 0 0 0 1 1 140 140 0 279 418 545 672 799 12167 12251 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/62/referenceTape34 b/tests/62/referenceTape34 index 6aa2649a..1773dde8 100644 --- a/tests/62/referenceTape34 +++ b/tests/62/referenceTape34 @@ -5,7 +5,7 @@ ENDF/B-VIII.0 deuteron + He3 mat 225 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 28836 2003 238 1 0 0 0 0 - 0 0 0 0 0 0 0 0 + 0 2 3 0 0 0 0 0 1 0 1191 1192 1193 1194 1195 1435 1436 28837 28837 0 0 0 0 0 0 0 0 0 0 28836 0 0 diff --git a/tests/63/referenceTape44 b/tests/63/referenceTape44 index 90628129..a6d1eed3 100644 --- a/tests/63/referenceTape44 +++ b/tests/63/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 4731 mat4731 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 612806 47109 50726 63 25 242 2 0 - 0 0 0 0 0 0 0 0 + 0 47 109 0 0 0 0 0 1 0 253631 253694 253757 253820 253883 307374 307400 342427 342452 473937 524663 524905 525147 527425 527667 527667 527909 558739 0 558798 473689 0 diff --git a/tests/64/referenceTape31 b/tests/64/referenceTape31 index b205951c..5d85f8f4 100644 --- a/tests/64/referenceTape31 +++ b/tests/64/referenceTape31 @@ -5,7 +5,7 @@ Ra226 from TENDL2019 photonuclear data mat8834 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 280364 88226 61 21 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 88 226 0 0 0 0 1 1 62 62 0 123 184 205 226 247 1074 1158 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/64/referenceTape34 b/tests/64/referenceTape34 index 0ac99f98..33cd2402 100644 --- a/tests/64/referenceTape34 +++ b/tests/64/referenceTape34 @@ -5,7 +5,7 @@ Ra226 from TENDL2019 photonuclear data - check tape 1 mat8834 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 280364 88226 61 21 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 88 226 0 0 0 0 1 1 62 62 0 123 184 205 226 247 1074 1158 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/64/referenceTape37 b/tests/64/referenceTape37 index 28eff7f6..49034207 100644 --- a/tests/64/referenceTape37 +++ b/tests/64/referenceTape37 @@ -5,7 +5,7 @@ Ra226 from TENDL2019 photonuclear data - check tape 2 mat8834 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 280364 88226 61 21 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 88 226 0 0 0 0 1 1 62 62 0 123 184 205 226 247 1074 1158 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/66/referenceTape31 b/tests/66/referenceTape31 index eb86d97c..b6efa85e 100644 --- a/tests/66/referenceTape31 +++ b/tests/66/referenceTape31 @@ -5,7 +5,7 @@ Pu239 IAEA photonuclear data mat9437 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 1038009 94239 90 2 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 94 239 0 0 0 0 1 1 91 91 0 181 271 273 275 277 459 543 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/66/referenceTape34 b/tests/66/referenceTape34 index ddd77d38..b411dffd 100644 --- a/tests/66/referenceTape34 +++ b/tests/66/referenceTape34 @@ -5,7 +5,7 @@ Pu239 IAEA photonuclear data - check tape 1 mat9437 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 1038009 94239 90 2 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 94 239 0 0 0 0 1 1 91 91 0 181 271 273 275 277 459 543 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/66/referenceTape37 b/tests/66/referenceTape37 index aa3ee21a..31a6e618 100644 --- a/tests/66/referenceTape37 +++ b/tests/66/referenceTape37 @@ -5,7 +5,7 @@ Pu239 IAEA photonuclear data - check tape 2 mat9437 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 1038009 94239 90 2 7 2 12 0 - 0 0 0 0 0 0 0 1 + 0 94 239 0 0 0 0 1 1 91 91 0 181 271 273 275 277 459 543 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/71/referenceTape34 b/tests/71/referenceTape34 index 1498390b..c93891ea 100644 --- a/tests/71/referenceTape34 +++ b/tests/71/referenceTape34 @@ -5,7 +5,7 @@ TENDL-2021 deuteron + Pt184 mat7807 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 290327 78184 79 31 6 31 5 0 - 0 0 0 0 0 0 0 0 + 0 78 184 0 0 0 0 0 1 0 396 427 458 489 520 2388 2395 12085 12091 32441 32520 32551 32582 33552 33583 33583 33614 129411 0 129442 0 0 diff --git a/tests/72/referenceTape41 b/tests/72/referenceTape41 index df801464..c4a860ea 100644 --- a/tests/72/referenceTape41 +++ b/tests/72/referenceTape41 @@ -5,7 +5,7 @@ fast acer tape for material 425 mat 425 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 202943 4009 644 16 1 12 4 0 - 0 0 0 0 0 0 0 0 + 0 4 9 0 0 0 0 0 1 0 3221 3237 3253 3269 3285 5478 5480 14089 14090 111211 111855 111867 111879 111997 112009 112009 112021 112167 0 112169 0 0 diff --git a/tests/72/referenceTape44 b/tests/72/referenceTape44 index 0c4cc410..5a4e6ee6 100644 --- a/tests/72/referenceTape44 +++ b/tests/72/referenceTape44 @@ -5,7 +5,7 @@ acer check/plot tape for material 425 mat 425 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 202943 4009 644 16 1 12 4 0 - 0 0 0 0 0 0 0 0 + 0 4 9 0 0 0 0 0 1 0 3221 3237 3253 3269 3285 5478 5480 14089 14090 111211 111855 111867 111879 111997 112009 112009 112021 112167 0 112169 0 0 diff --git a/tests/75/referenceTape26 b/tests/75/referenceTape26 index 619f941d..9bc7c092 100644 --- a/tests/75/referenceTape26 +++ b/tests/75/referenceTape26 @@ -5,7 +5,7 @@ ENDF/B-7.1: 47-Ag-109 at 293.6 mat4731 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 612558 47109 50726 63 25 242 2 0 - 0 0 0 0 0 0 0 0 + 0 47 109 0 0 0 0 0 1 0 253631 253694 253757 253820 253883 307374 307400 342427 342452 473689 524415 524657 524899 527177 527419 527419 527661 558491 0 558550 0 0 diff --git a/tests/78/referenceTape31 b/tests/78/referenceTape31 index 147765fc..b7179fec 100644 --- a/tests/78/referenceTape31 +++ b/tests/78/referenceTape31 @@ -5,7 +5,7 @@ He3 IAEA photonuclear data mat 225 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 13903 2003 42 1 3 2 12 0 - 0 0 0 0 0 0 0 1 + 0 2 3 0 0 0 0 1 1 43 43 0 85 127 128 129 130 174 210 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/tests/78/referenceTape34 b/tests/78/referenceTape34 index d80b9d37..fc43a62f 100644 --- a/tests/78/referenceTape34 +++ b/tests/78/referenceTape34 @@ -5,7 +5,7 @@ He3 IAEA photonuclear data - check tape mat 225 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 0 0. 13903 2003 42 1 3 2 12 0 - 0 0 0 0 0 0 0 1 + 0 2 3 0 0 0 0 1 1 43 43 0 85 127 128 129 130 174 210 0 0 0 0 0 0 0 0 0 0 0 0 0 From 33349c4b7b5e230bd58733fa6b8cc0104d7b4b44 Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 7 Feb 2024 10:07:29 -0700 Subject: [PATCH 2/3] Updating version number and release notes --- ReleaseNotes.md | 5 +++++ src/vers.f90 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 21f3ab49..c233ef89 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,11 @@ # 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.75](https://github.com/njoy/NJOY2016/pull/xxx) +This update fixes the following issues: + +In addition, this update made a small change to the NXS array for continuous energy and photonuclear ACE files (iopt = 1 and 5). In both cases, the isomeric state S, atom number Z and mass number A are now stored in NXS(9), NXS(10) and NXS(11) respectively. + ## [NJOY2016.74](https://github.com/njoy/NJOY2016/pull/327) This update fixes the following issues: - Correct the Euler-Mascheroni constant (this has an influence on the Coulomb wave functions and therefore influences LRF=7 evaluations that have charged particle channels) diff --git a/src/vers.f90 b/src/vers.f90 index 50f86fa6..7e6803a2 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.74' - character(8),public::vday='12Jan24' + character(8),public::vers='2016.75' + character(8),public::vday='xxMar24' end module version From a45a8be70864c5510225dfffe6afbd085e39788e Mon Sep 17 00:00:00 2001 From: Wim Haeck Date: Wed, 7 Feb 2024 10:13:39 -0700 Subject: [PATCH 3/3] Updating CI to remove deprecation warning --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 30ce72df..9b8c2a27 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -27,7 +27,7 @@ jobs: run: | which ${{matrix.vFortran}} ${{matrix.vFortran}} --version - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: mkdir bin run: mkdir bin - name: cmake